You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2014/11/24 11:38:48 UTC

[01/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Repository: cloudstack
Updated Branches:
  refs/heads/noawsapi [created] 84042f2c3


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 7722a69..0000000
--- a/awsapi/src/com/amazon/ec2/CreateVolumeType.java
+++ /dev/null
@@ -1,807 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateVolumeType bean class
-*/
-
-public class CreateVolumeType 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/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 Size
-    */
-
-    protected java.lang.String localSize;
-
-    /*  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 localSizeTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getSize() {
-        return localSize;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Size
-       */
-    public void setSize(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localSizeTracker = true;
-        } else {
-            localSizeTracker = false;
-
-        }
-
-        this.localSize = param;
-
-    }
-
-    /**
-    * field for SnapshotId
-    */
-
-    protected java.lang.String localSnapshotId;
-
-    /*  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 localSnapshotIdTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getSnapshotId() {
-        return localSnapshotId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param SnapshotId
-       */
-    public void setSnapshotId(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localSnapshotIdTracker = true;
-        } else {
-            localSnapshotIdTracker = false;
-
-        }
-
-        this.localSnapshotId = param;
-
-    }
-
-    /**
-    * field for AvailabilityZone
-    */
-
-    protected java.lang.String localAvailabilityZone;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getAvailabilityZone() {
-        return localAvailabilityZone;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AvailabilityZone
-       */
-    public void setAvailabilityZone(java.lang.String param) {
-
-        this.localAvailabilityZone = param;
-
-    }
-
-    /**
-    * 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
-    */
-    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 {
-                CreateVolumeType.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 + ":CreateVolumeType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateVolumeType", xmlWriter);
-            }
-
-        }
-        if (localSizeTracker) {
-            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, "size", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "size");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("size");
-            }
-
-            if (localSize == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("size cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localSize);
-
-            }
-
-            xmlWriter.writeEndElement();
-        }
-        if (localSnapshotIdTracker) {
-            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, "snapshotId", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "snapshotId");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("snapshotId");
-            }
-
-            if (localSnapshotId == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("snapshotId cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localSnapshotId);
-
-            }
-
-            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, "availabilityZone", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "availabilityZone");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("availabilityZone");
-        }
-
-        if (localAvailabilityZone == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("availabilityZone cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localAvailabilityZone);
-
-        }
-
-        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();
-
-    }
-
-    /**
-     * 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 (localSizeTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "size"));
-
-            if (localSize != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSize));
-            } else {
-                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/2012-08-15/", "snapshotId"));
-
-            if (localSnapshotId != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSnapshotId));
-            } else {
-                throw new org.apache.axis2.databinding.ADBException("snapshotId cannot be null!!");
-            }
-        }
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZone"));
-
-        if (localAvailabilityZone != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAvailabilityZone));
-        } 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());
-
-    }
-
-    /**
-     *  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 CreateVolumeType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateVolumeType object = new CreateVolumeType();
-
-            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 (!"CreateVolumeType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateVolumeType)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/", "size").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setSize(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/", "snapshotId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setSnapshotId(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/", "availabilityZone").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setAvailabilityZone(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/", "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();
-
-                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
-
-}


[50/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/cloudbridge_index.sql
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/cloudbridge_index.sql b/awsapi-setup/db/mysql/cloudbridge_index.sql
deleted file mode 100644
index e099b65..0000000
--- a/awsapi-setup/db/mysql/cloudbridge_index.sql
+++ /dev/null
@@ -1,64 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
--- 
---   http://www.apache.org/licenses/LICENSE-2.0
--- 
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-USE cloudbridge;
-
-ALTER TABLE shost ADD UNIQUE shost_uq_host(Host, HostType, ExportRoot);
-ALTER TABLE shost ADD CONSTRAINT FOREIGN KEY shost_fk_mhost_id(MHostID) REFERENCES mhost(ID);
-ALTER TABLE shost ADD INDEX shost_idx_mhost_id(MHostID);
-
-ALTER TABLE sbucket ADD UNIQUE sbucket_uq_name(Name);
-ALTER TABLE sbucket ADD CONSTRAINT FOREIGN KEY sbucket_fk_shost_id(SHostID) REFERENCES shost(ID);
-ALTER TABLE sbucket ADD INDEX sbucket_idx_shost_id(SHostID);
-ALTER TABLE sbucket ADD INDEX sbucket_idx_owner_cid(OwnerCanonicalID);
-ALTER TABLE sbucket ADD INDEX sbucket_idx_create_time(CreateTime);
-
-ALTER TABLE sobject ADD CONSTRAINT FOREIGN KEY sobject_fk_sbuckt_id(SBucketID) REFERENCES sbucket(ID) ON DELETE CASCADE;
-ALTER TABLE sobject ADD INDEX sobject_idx_bucket_id(SBucketID);
-ALTER TABLE sobject ADD INDEX sobject_idx_owner_cid(OwnerCanonicalID);
-ALTER TABLE sobject ADD UNIQUE sobject_uq_sbucket_id_name_key(SBucketID, NameKey);
-ALTER TABLE sobject ADD INDEX sobject_idx_create_time(CreateTime);
-
-ALTER TABLE sobject_item ADD CONSTRAINT FOREIGN KEY sobject_item_fk_object_id(SObjectID) REFERENCES sobject(ID) ON DELETE CASCADE;
-ALTER TABLE sobject_item ADD INDEX sobject_item_idx_object_id(SObjectID);
-ALTER TABLE sobject_item ADD UNIQUE sobject_item_uq_sobject_id_version(SObjectID, Version);
-ALTER TABLE sobject_item ADD INDEX sobject_item_idx_create_time(CreateTime);
-ALTER TABLE sobject_item ADD INDEX sobject_item_idx_modify_time(LastModifiedTime);
-ALTER TABLE sobject_item ADD INDEX sobject_item_idx_access_time(LastAccessTime);
-ALTER TABLE sobject_item ADD INDEX sobject_item_idx_stored_size(StoredSize);
-
-ALTER TABLE meta ADD UNIQUE meta_uq_target_name(Target, TargetID, Name);
-ALTER TABLE meta ADD INDEX meta_idx_target(Target, TargetID);
-
-ALTER TABLE usercredentials ADD UNIQUE usercredentials_mappings1(AccessKey);
-ALTER TABLE usercredentials ADD UNIQUE usercredentials_mappings2(CertUniqueId);
-ALTER TABLE usercredentials ADD INDEX usercredentials_idx_access(AccessKey);
-ALTER TABLE usercredentials ADD INDEX usercredentials_idx_cert(CertUniqueId);
-
-ALTER TABLE acl ADD INDEX acl_idx_target(Target, TargetID);
-ALTER TABLE acl ADD INDEX acl_idx_modify_time(LastModifiedTime);
-
-ALTER TABLE mhost ADD UNIQUE mhost_uq_host(Host);
-ALTER TABLE mhost ADD INDEX mhost_idx_mhost_key(MHostKey);
-ALTER TABLE mhost ADD INDEX mhost_idx_heartbeat_time(LastHeartbeatTime);
-
-ALTER TABLE mhost_mount ADD UNIQUE mhost_mnt_uq_mhost_shost(MHostID, SHostID);
-ALTER TABLE mhost_mount ADD CONSTRAINT FOREIGN KEY mhost_mnt_fk_mhost_id(MHostID) REFERENCES mhost(ID) ON DELETE CASCADE;
-ALTER TABLE mhost_mount ADD CONSTRAINT FOREIGN KEY mhost_mnt_fk_shost_id(SHostID) REFERENCES shost(ID) ON DELETE CASCADE;
-ALTER TABLE mhost_mount ADD INDEX mhost_mnt_idx_mhost_id(MHostID);
-ALTER TABLE mhost_mount ADD INDEX mhost_mnt_idx_shost_id(SHostID);
-ALTER TABLE mhost_mount ADD INDEX mhost_mnt_idx_mount_time(LastMountTime);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/cloudbridge_multipart.sql
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/cloudbridge_multipart.sql b/awsapi-setup/db/mysql/cloudbridge_multipart.sql
deleted file mode 100644
index e30c0ce..0000000
--- a/awsapi-setup/db/mysql/cloudbridge_multipart.sql
+++ /dev/null
@@ -1,77 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
--- 
---   http://www.apache.org/licenses/LICENSE-2.0
--- 
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-USE cloudbridge;
-
--- This file can be applied to an existing cloudbridge database.   It is used
--- to keep track of in progress multipart file uploads.
---
-SET foreign_key_checks = 0;
-
-DROP TABLE IF EXISTS multipart_uploads;
-DROP TABLE IF EXISTS multipart_meta;
-DROP TABLE IF EXISTS multipart_parts;
-
--- We need to keep track of the multipart uploads and all the parts of each upload until they
--- are completed or aborted.
--- The AccessKey is where we store the AWS account id
---
-CREATE TABLE multipart_uploads (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	AccessKey  VARCHAR(150) NOT NULL,  -- this is the initiator of the request
-	BucketName VARCHAR(64)  NOT NULL,
-	NameKey    VARCHAR(255) NOT NULL,
-	x_amz_acl  VARCHAR(64)  NULL,
-	
-	CreateTime DATETIME,
-
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- We need to store all the meta data for an object being mutlipart uploaded 
--- UploadID is a foreign key to an entry in the mutipart_uploads table
---
-CREATE TABLE multipart_meta (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	UploadID BIGINT NOT NULL,  
-	Name  VARCHAR(64) NOT NULL,
-	Value VARCHAR(256),
-	
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- Each part of a multipart upload gets a row in this table
--- UploadId is a foreign key to an entry in the mutipart_uploads table
---
-CREATE TABLE multipart_parts (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	UploadID BIGINT NOT NULL,  
-	partNumber INT NOT NULL,
-	MD5 VARCHAR(128),
- 	StoredPath VARCHAR(256),					-- relative to mount point of the root
- 	StoredSize BIGINT NOT NULL DEFAULT 0,
-	
-	CreateTime DATETIME,
-	
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-SET foreign_key_checks = 1;
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/cloudbridge_multipart_alter.sql
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/cloudbridge_multipart_alter.sql b/awsapi-setup/db/mysql/cloudbridge_multipart_alter.sql
deleted file mode 100644
index 2614aaf..0000000
--- a/awsapi-setup/db/mysql/cloudbridge_multipart_alter.sql
+++ /dev/null
@@ -1,23 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
--- 
---   http://www.apache.org/licenses/LICENSE-2.0
--- 
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-
-USE cloudbridge;
-
-ALTER TABLE multipart_meta ADD CONSTRAINT FOREIGN KEY meta_uploads_id(UploadID) REFERENCES multipart_uploads(ID) ON DELETE CASCADE;
-ALTER TABLE multipart_parts ADD CONSTRAINT FOREIGN KEY part_uploads_id(UploadID) REFERENCES multipart_uploads(ID) ON DELETE CASCADE;
-ALTER TABLE multipart_parts ADD UNIQUE part_uploads_number(UploadId, partNumber);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/cloudbridge_offering.sql
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/cloudbridge_offering.sql b/awsapi-setup/db/mysql/cloudbridge_offering.sql
deleted file mode 100644
index f21af5a..0000000
--- a/awsapi-setup/db/mysql/cloudbridge_offering.sql
+++ /dev/null
@@ -1,40 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
--- 
---   http://www.apache.org/licenses/LICENSE-2.0
--- 
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-
-USE cloudbridge;
-
--- This file (and cloudbridge_offering_alter.sql) can be applied to an existing cloudbridge 
--- database.   It is used to manage the mappings from the Amazon EC2 offering strings to 
--- cloudstack service offering identifers.
---
-SET foreign_key_checks = 0;
-
-DROP TABLE IF EXISTS offering_bundle;
-
--- AmazonEC2Offering  - string name of an EC2 AMI capability (e.g. "m1.small")
--- CloudStackOffering - string name of the cloud stack service offering identifer (e.g. "1" )
---
-CREATE TABLE offering_bundle (
-	ID                 INTEGER NOT NULL AUTO_INCREMENT,
-	AmazonEC2Offering  VARCHAR(100) NOT NULL,
-	CloudStackOffering VARCHAR(20)  NOT NULL,
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-SET foreign_key_checks = 1;
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/cloudbridge_offering_alter.sql
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/cloudbridge_offering_alter.sql b/awsapi-setup/db/mysql/cloudbridge_offering_alter.sql
deleted file mode 100644
index bffb34d..0000000
--- a/awsapi-setup/db/mysql/cloudbridge_offering_alter.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
--- 
---   http://www.apache.org/licenses/LICENSE-2.0
--- 
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-
-USE cloudbridge;
-
-ALTER TABLE offering_bundle ADD UNIQUE one_offering (AmazonEC2Offering);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/cloudbridge_policy_alter.sql
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/cloudbridge_policy_alter.sql b/awsapi-setup/db/mysql/cloudbridge_policy_alter.sql
deleted file mode 100644
index 53ab40b..0000000
--- a/awsapi-setup/db/mysql/cloudbridge_policy_alter.sql
+++ /dev/null
@@ -1,21 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
--- 
---   http://www.apache.org/licenses/LICENSE-2.0
--- 
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-
-USE cloudbridge;
-
-ALTER TABLE bucket_policies ADD UNIQUE one_policy_per_bucket(BucketName);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/cloudbridge_schema.sql
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/cloudbridge_schema.sql b/awsapi-setup/db/mysql/cloudbridge_schema.sql
deleted file mode 100644
index de22f11..0000000
--- a/awsapi-setup/db/mysql/cloudbridge_schema.sql
+++ /dev/null
@@ -1,162 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
--- 
---   http://www.apache.org/licenses/LICENSE-2.0
--- 
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-
-USE cloudbridge;
-
-SET foreign_key_checks = 0;
-
-DROP TABLE IF EXISTS shost;
-DROP TABLE IF EXISTS mhost;
-DROP TABLE IF EXISTS mhost_mount;
-DROP TABLE IF EXISTS sbucket;
-DROP TABLE IF EXISTS sobject;
-DROP TABLE IF EXISTS sobject_item;
-DROP TABLE IF EXISTS meta;
-DROP TABLE IF EXISTS acl;
-DROP TABLE IF EXISTS usercredentials;
-
--- storage host
-CREATE TABLE shost (							
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	Host VARCHAR(128) NOT NULL,
-	HostType INT NOT NULL DEFAULT 0, 	-- 0 : local, 1 : nfs
-	ExportRoot VARCHAR(128) NOT NULL,
-	
-	MHostID BIGINT,						-- when host type is local, MHostID points to its owner management host												
-	
-	UserOnHost VARCHAR(64),
-	UserPassword VARCHAR(128),
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- management host
-CREATE TABLE mhost (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	MHostKey VARCHAR(128) NOT NULL, 	-- host key could be derived from MAC address or named configuration value
-	Host VARCHAR(128),					-- public host address for redirecting request from/to 
-	
-	Version VARCHAR(64),
-	LastHeartbeatTime DATETIME,
-	
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE mhost_mount (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	MHostID BIGINT NOT NULL,
-	SHostID BIGINT NOT NULL,
-
-	MountPath VARCHAR(256),				-- local mount path
-	LastMountTime DATETIME,				-- null : unmounted, otherwise the mount location
-	
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE sbucket (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	Name VARCHAR(64) NOT NULL,
-	OwnerCanonicalID VARCHAR(150) NOT NULL,
-	
-	SHostID BIGINT,
-	
-	CreateTime DATETIME,
-	
-	VersioningStatus INT NOT NULL DEFAULT 0,  -- 0 : initial not set, 1 : enabled, 2 : suspended 
-	
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE sobject (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	SBucketID BIGINT NOT NULL,
-	NameKey VARCHAR(255) NOT NULL,
-	
-	OwnerCanonicalID VARCHAR(150) NOT NULL,
-	NextSequence INT NOT NULL DEFAULT 1,
-	DeletionMark VARCHAR (150), 
- 	
- 	CreateTime DATETIME,
- 	
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE sobject_item (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	SObjectID BIGINT NOT NULL,
- 	Version VARCHAR(64),
- 	
- 	MD5 VARCHAR(128),
- 	StoredPath VARCHAR(256),					-- relative to mount point of the root
- 	StoredSize BIGINT NOT NULL DEFAULT 0,
- 	
- 	CreateTime DATETIME,
- 	LastModifiedTime DATETIME,
- 	LastAccessTime DATETIME,
- 	
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE meta (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	Target VARCHAR(64) NOT NULL,
-	TargetID BIGINT NOT NULL,
-
-	Name VARCHAR(64) NOT NULL,
-	Value VARCHAR(256),
-
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE acl (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	Target VARCHAR(64) NOT NULL,
-	TargetID BIGINT NOT NULL,
-	
-	GranteeType INT NOT NULL DEFAULT 0,			-- 0 : Cloud service user, 1 : Cloud user community, 2: Public user community
-	GranteeCanonicalID VARCHAR(150),            -- make it big enought to hold a Cloud API access key
-	
-	Permission INT NOT NULL DEFAULT 0,			-- 0 : no permission, 1 : read, 2 : write, 4 : read_acl, 8 : write_acl 
-	GrantOrder INT NOT NULL DEFAULT 0, 
-	
-	CreateTime DATETIME,
-	LastModifiedTime DATETIME,
-
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- each account has to have a separate <AccessKey,SecretKey>
--- each account has to have a separate <CertUniqueID,AccessKey> mappings
-CREATE TABLE usercredentials (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	AccessKey VARCHAR(150) NOT NULL,
-	SecretKey VARCHAR(150) NOT NULL,
-	CertUniqueId VARCHAR(200),
-
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-SET foreign_key_checks = 1;
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/deploy-db-bridge.sh
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/deploy-db-bridge.sh b/awsapi-setup/db/mysql/deploy-db-bridge.sh
deleted file mode 100644
index 2e8ceee..0000000
--- a/awsapi-setup/db/mysql/deploy-db-bridge.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-if [ ! -f cloudbridge_db.sql ]; then
-  printf "Error: Unable to find cloudbridge_db.sql\n"
-  exit 4
-fi
-
-if [ ! -f cloudbridge_schema.sql ]; then
-  printf "Error: Unable to find cloudbridge_schema.sql\n"
-  exit 5
-fi
-
-if [ ! -f cloudbridge_index.sql ]; then
-  printf "Error: Unable to find cloudbridge_index.sql\n"
-  exit 6;
-fi
-
-echo "Recreating Database."
-mysql --user=root --password=$1 < cloudbridge_db.sql > /dev/null 2>/dev/null
-mysqlout=$?
-if [ $mysqlout -eq 1 ]; then
-  printf "Please enter root password for MySQL.\n" 
-  mysql --user=root --password < cloudbridge_db.sql
-  if [ $? -ne 0 ]; then
-    printf "Error: Cannot execute cloudbridge_db.sql\n"
-    exit 10
-  fi
-elif [ $mysqlout -ne 0 ]; then
-  printf "Error: Cannot execute cloudbridge_db.sql\n"
-  exit 11
-fi
-
-mysql --user=cloud --password=cloud < cloudbridge_schema.sql
-if [ $? -ne 0 ]; then
-  printf "Error: Cannot execute cloudbridge_schema.sql\n"
-  exit 11
-fi
-
-mysql --user=cloud --password=cloud < cloudbridge_multipart.sql
-if [ $? -ne 0 ]
-then
-    exit 1
-fi
-
-echo "Creating Indice and Foreign Keys"
-mysql --user=cloud --password=cloud < cloudbridge_index.sql
-if [ $? -ne 0 ]; then
-  printf "Error: Cannot execute cloudbridge_index.sql\n"
-  exit 13
-fi
-
-mysql --user=cloud --password=cloud < cloudbridge_multipart_alter.sql
-mysql --user=cloud --password=cloud < cloudbridge_bucketpolicy.sql
-mysql --user=cloud --password=cloud < cloudbridge_policy_alter.sql
-mysql --user=cloud --password=cloud < cloudbridge_offering.sql
-mysql --user=cloud --password=cloud < cloudbridge_offering_alter.sql

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/init_db.bat
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/init_db.bat b/awsapi-setup/db/mysql/init_db.bat
deleted file mode 100644
index 6854ff3..0000000
--- a/awsapi-setup/db/mysql/init_db.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-rem  Licensed to the Apache Software Foundation (ASF) under one
-rem  or more contributor license agreements.  See the NOTICE file
-rem  distributed with this work for additional information
-rem  regarding copyright ownership.  The ASF licenses this file
-rem  to you under the Apache License, Version 2.0 (the
-rem  "License"); you may not use this file except in compliance
-rem  with the License.  You may obtain a copy of the License at
-rem  
-rem    http://www.apache.org/licenses/LICENSE-2.0
-rem  
-rem  Unless required by applicable law or agreed to in writing,
-rem  software distributed under the License is distributed on an
-rem  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem  KIND, either express or implied.  See the License for the
-rem  specific language governing permissions and limitations
-rem  under the License.
-
-mysql --user=root --password < cloudbridge_db.sql
-mysql --user=root --password < cloudbridge_schema.sql
-mysql --user=root --password < cloudbridge_multipart.sql
-mysql --user=root --password < cloudbridge_index.sql
-mysql --user=root --password < cloudbridge_multipart_alter.sql
-mysql --user=root --password < cloudbridge_bucketpolicy.sql
-mysql --user=root --password < cloudbridge_policy_alter.sql
-mysql --user=root --password < cloudbridge_offering.sql
-mysql --user=root --password < cloudbridge_offering_alter.sql

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/init/debian/cloud-bridge
----------------------------------------------------------------------
diff --git a/awsapi-setup/init/debian/cloud-bridge b/awsapi-setup/init/debian/cloud-bridge
deleted file mode 100644
index c1bf90b..0000000
--- a/awsapi-setup/init/debian/cloud-bridge
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# /etc/init.d/tomcat6 -- startup script for the Tomcat 6 servlet engine
-#
-# Written by Miquel van Smoorenburg <mi...@cistron.nl>.
-# Modified for Debian GNU/Linux	by Ian Murdock <im...@gnu.ai.mit.edu>.
-# Modified for Tomcat by Stefan Gybas <sg...@debian.org>.
-# Modified for Tomcat6 by Thierry Carrez <th...@ubuntu.com>.
-# Modified for VMOps by Manuel Amador (Rudd-O) <ma...@vmops.com>
-#
-### BEGIN INIT INFO
-# Provides:          tomcat-vmops
-# Required-Start:    $local_fs $remote_fs $network
-# Required-Stop:     $local_fs $remote_fs $network
-# Should-Start:      $named
-# Should-Stop:       $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start Tomcat (CloudStack).
-# Description:       Start the Tomcat servlet engine that runs the CloudStack Management Server.
-### END INIT INFO
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=cloud-bridge
-DESC="CloudStack-specific Tomcat servlet engine"
-DAEMON=/usr/bin/jsvc
-CATALINA_BASE=/usr/share/cloud/bridge
-CATALINA_HOME=/usr/share/tomcat6
-DEFAULT=$CATALINA_BASE/conf/tomcat6.conf
-JVM_TMP=/tmp/$NAME-temp
-
-if [ `id -u` -ne 0 ]; then
-	echo "You need root privileges to run this script"
-	exit 1
-fi
- 
-# Make sure tomcat is started with system locale
-if [ -r /etc/default/locale ]; then
-	. /etc/default/locale
-	export LANG
-fi
-
-. /lib/lsb/init-functions
-. /etc/default/rcS
-
-
-# The following variables can be overwritten in $DEFAULT
-
-# Run Tomcat 6 as this user ID
-TOMCAT6_USER=tomcat6
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
-# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
-
-# Look for the right JVM to use
-for jdir in $JDK_DIRS; do
-    if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
-	JAVA_HOME="$jdir"
-    fi
-done
-export JAVA_HOME
-
-
-# Use the Java security manager? (yes/no)
-TOMCAT6_SECURITY=no
-
-# Default Java options
-# Set java.awt.headless=true if JAVA_OPTS is not set so the
-# Xalan XSL transformer can work without X11 display on JDK 1.4+
-# It also looks like the default heap size of 64M is not enough for most cases
-# so the maximum heap size is set to 128M
-if [ -z "$JAVA_OPTS" ]; then
-	JAVA_OPTS="-Djava.awt.headless=true -Xmx128M"
-fi
-
-# End of variables that can be overwritten in $DEFAULT
-
-# overwrite settings from default file
-if [ -f "$DEFAULT" ]; then
-	. "$DEFAULT"
-fi
-
-if [ ! -f "$CATALINA_HOME/bin/bootstrap.jar" ]; then
-	log_failure_msg "$NAME is not installed"
-	exit 1
-fi
-
-[ -f "$DAEMON" ] || exit 0
-
-POLICY_CACHE="$CATALINA_BASE/work/catalina.policy"
-
-JAVA_OPTS="$JAVA_OPTS -Djava.endorsed.dirs=$CATALINA_HOME/endorsed -Dcatalina.base=$CATALINA_BASE -Dcatalina.home=$CATALINA_HOME -Djava.io.tmpdir=$JVM_TMP"
-
-# Set the JSP compiler if set in the tomcat6.default file
-if [ -n "$JSP_COMPILER" ]; then
-	JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER"
-fi
-
-if [ "$TOMCAT6_SECURITY" = "yes" ]; then
-	JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$POLICY_CACHE"
-fi
-
-# Set juli LogManager if logging.properties is provided
-if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
-  JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
-fi
-
-# Define other required variables
-CATALINA_PID="/var/run/$NAME.pid"
-BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap
-JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar"
-JSVC_CLASSPATH=$CLASSPATH:$JSVC_CLASSPATH
-
-# Look for Java Secure Sockets Extension (JSSE) JARs
-if [ -z "${JSSE_HOME}" -a -r "${JAVA_HOME}/jre/lib/jsse.jar" ]; then
-    JSSE_HOME="${JAVA_HOME}/jre/"
-fi
-export JSSE_HOME
-
-case "$1" in
-  start)
-	if [ -z "$JAVA_HOME" ]; then
-		log_failure_msg "no JDK found - please set JAVA_HOME"
-		exit 1
-	fi
-
-	if [ ! -d "$CATALINA_BASE/conf" ]; then
-		log_failure_msg "invalid CATALINA_BASE: $CATALINA_BASE"
-		exit 1
-	fi
-
-	log_daemon_msg "Starting $DESC" "$NAME"
-	if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
-		--user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \
-		>/dev/null; then
-
-		# Regenerate POLICY_CACHE file
-		umask 022
-		echo "// AUTO-GENERATED FILE from /etc/tomcat6/policy.d/" \
-			> "$POLICY_CACHE"
-		echo ""  >> "$POLICY_CACHE"
-		if ls $CATALINA_BASE/conf/policy.d/*.policy > /dev/null 2>&1 ; then
-		cat $CATALINA_BASE/conf/policy.d/*.policy \
-			>> "$POLICY_CACHE"
-		fi
-
-		# Remove / recreate JVM_TMP directory
-		rm -rf "$JVM_TMP"
-		mkdir "$JVM_TMP" || {
-			log_failure_msg "could not create JVM temporary directory"
-			exit 1
-		}
-		chown $TOMCAT6_USER "$JVM_TMP"
-		cd "$JVM_TMP"
-
-
-		# fix storage issues on nfs mounts
-		umask 000
-		$DAEMON -user "$TOMCAT6_USER" -cp "$JSVC_CLASSPATH" \
-		    -outfile SYSLOG -errfile SYSLOG \
-		    -pidfile "$CATALINA_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS"
-
-		sleep 5
-        	if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
-			--user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \
-			>/dev/null; then
-			log_end_msg 1
-		else
-			log_end_msg 0
-		fi
-	else
-	        log_progress_msg "(already running)"
-		log_end_msg 0
-	fi
-	;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-        if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
-		--user "$TOMCAT6_USER" --startas "$JAVA_HOME/bin/java" \
-		>/dev/null; then
-		log_progress_msg "(not running)"
-	else
-		$DAEMON -cp "$JSVC_CLASSPATH" -pidfile "$CATALINA_PID" \
-		     -stop "$BOOTSTRAP_CLASS"
-	fi
-	rm -rf "$JVM_TMP"
-	log_end_msg 0
-	;;
-   status)
-        if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
-		--user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \
-		>/dev/null; then
-
-		if [ -f "$CATALINA_PID" ]; then
-		    log_success_msg "$DESC is not running, but pid file exists."
-			exit 1
-		else
-		    log_success_msg "$DESC is not running."
-			exit 3
-		fi
-	else
-		log_success_msg "$DESC is running with pid `cat $CATALINA_PID`"
-	fi
-        ;;
-  restart|force-reload)
-        if start-stop-daemon --test --stop --pidfile "$CATALINA_PID" \
-		--user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \
-		>/dev/null; then
-		$0 stop
-		sleep 1
-	fi
-	$0 start
-	;;
-  try-restart)
-        if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
-		--user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \
-		>/dev/null; then
-		$0 start
-	fi
-        ;;
-  *)
-	log_success_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status}"
-	exit 1
-	;;
-esac
-
-exit 0

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/init/rpm/cloud-bridge
----------------------------------------------------------------------
diff --git a/awsapi-setup/init/rpm/cloud-bridge b/awsapi-setup/init/rpm/cloud-bridge
deleted file mode 100644
index 444b771..0000000
--- a/awsapi-setup/init/rpm/cloud-bridge
+++ /dev/null
@@ -1,300 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# tomcat6      This shell script takes care of starting and stopping Tomcat
-#
-# chkconfig: - 80 20
-#
-### BEGIN INIT INFO
-# Provides: tomcat6
-# Required-Start: $network $syslog
-# Required-Stop: $network $syslog
-# Default-Start:
-# Default-Stop:
-# Description: Release implementation for Servlet 2.5 and JSP 2.1
-# Short-Description: start and stop tomcat
-### END INIT INFO
-#
-# - originally written by Henri Gomez, Keith Irwin, and Nicolas Mailhot
-# - heavily rewritten by Deepak Bhole and Jason Corley
-#
-
-## Source function library.
-#. /etc/rc.d/init.d/functions
-# Source LSB function library.
-export NAME=cloud-bridge
-DESC="CloudStack-specific Tomcat servlet engine"
-export CATALINA_BASE=/usr/share/cloud/bridge
-DEFAULT=$CATALINA_BASE/conf/tomcat6.conf
-TOMCAT_USER="cloud"
-export TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat6/catalina.out}"
-export TOMCAT_CFG=$DEFAULT
-if [ -r "$TOMCAT_CFG" ]; then
-    . $TOMCAT_CFG
-fi
-
-if [ -r /lib/lsb/init-functions ]; then
-    . /lib/lsb/init-functions
-else
-    exit 1
-fi
-
-DISTRIB_ID=`lsb_release -i -s 2>/dev/null`
-
-# For SELinux we need to use 'runuser' not 'su'
-if [ -x "/sbin/runuser" ]; then
-    SU="/sbin/runuser -m"
-else
-    SU="/bin/su -m"
-fi
-
-
-# Get instance specific config file
-if [ -r "/etc/sysconfig/${NAME}" ]; then
-    . /etc/sysconfig/${NAME}
-fi
-
-
-# Path to the tomcat launch script
-TOMCAT_SCRIPT="/usr/sbin/tomcat6"
-
-# Tomcat program name
-TOMCAT_PROG="${NAME}"
-        
-
-RETVAL="0"
-
-# Look for open ports, as the function name might imply
-function findFreePorts() {
-    local isSet1="false"
-    local isSet2="false"
-    local isSet3="false"
-    local lower="8000"
-    randomPort1="0"
-    randomPort2="0"
-    randomPort3="0"
-    local -a listeners="( $(
-                        netstat -ntl | \
-                        awk '/^tcp/ {gsub("(.)*:", "", $4); print $4}'
-                    ) )"
-    while [ "$isSet1" = "false" ] || \
-          [ "$isSet2" = "false" ] || \
-          [ "$isSet3" = "false" ]; do
-        let port="${lower}+${RANDOM:0:4}"
-        if [ -z `expr " ${listeners[*]} " : ".*\( $port \).*"` ]; then
-            if [ "$isSet1" = "false" ]; then
-                export randomPort1="$port"
-                isSet1="true"
-            elif [ "$isSet2" = "false" ]; then
-                export randomPort2="$port"
-                isSet2="true"
-            elif [ "$isSet3" = "false" ]; then
-                export randomPort3="$port"
-                isSet3="true"
-            fi
-        fi
-    done
-}
-
-function makeHomeDir() {
-    if [ ! -d "$CATALINA_HOME" ]; then
-        echo "$CATALINA_HOME does not exist, creating"
-        if [ ! -d "/usr/share/${NAME}" ]; then
-            mkdir /usr/share/${NAME}
-            cp -pLR /usr/share/tomcat6/* /usr/share/${NAME}
-        fi
-        mkdir -p /var/log/${NAME} \
-                 /var/cache/${NAME} \
-                 /var/tmp/${NAME}
-        ln -fs /var/cache/${NAME} ${CATALINA_HOME}/work
-        ln -fs /var/tmp/${NAME} ${CATALINA_HOME}/temp
-        cp -pLR /usr/share/${NAME}/bin $CATALINA_HOME
-        cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME
-        ln -fs /usr/share/java/tomcat6 ${CATALINA_HOME}/lib
-        ln -fs /usr/share/tomcat6/webapps ${CATALINA_HOME}/webapps
-        chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME}
-    fi
-}
-
-function parseOptions() {
-    options=""
-    options="$options $(
-                 awk '!/^#/ && !/^$/ { ORS=" "; print "export ", $0, ";" }' \
-                 $TOMCAT_CFG
-             )"
-    if [ -r "/etc/sysconfig/${NAME}" ]; then
-        options="$options $(
-                     awk '!/^#/ && !/^$/ { ORS=" "; 
-                                           print "export ", $0, ";" }' \
-                     /etc/sysconfig/${NAME}
-                 )"
-    fi
-    TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}"
-}
-
-# See how we were called.
-function start() {
-    echo -n "Starting ${TOMCAT_PROG}: "
-    if [ -f "/var/lock/subsys/${NAME}" ] ; then
-        if [ -f "/var/run/${NAME}.pid" ]; then
-            read kpid < /var/run/${NAME}.pid
-#           if checkpid $kpid 2>&1; then
-            if [ -d "/proc/${kpid}" ]; then
-                log_success_msg
-                if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then
-                    echo
-                fi
-                return 0
-            fi
-        fi
-    fi
-    # fix permissions on the log and pid files
-    export CATALINA_PID="/var/run/${NAME}.pid"
-    touch $CATALINA_PID
-    chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
-    touch $TOMCAT_LOG
-    chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
-    if [ "$CATALINA_HOME" != "/usr/share/tomcat6" ]; then
-        # Create a tomcat directory if it doesn't exist
-        makeHomeDir
-        # If CATALINA_HOME doesn't exist modify port number so that
-        # multiple instances don't interfere with each other
-        findFreePorts
-        sed -i -e "s/8005/${randomPort1}/g" -e "s/8080/${CONNECTOR_PORT}/g" \
-            -e "s/8009/${randomPort2}/g" -e "s/8443/${randomPort3}/g" \
-            ${CATALINA_HOME}/conf/server.xml
-    fi
-    parseOptions
-    if [ "$SECURITY_MANAGER" = "true" ]; then
-        $SU $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \
-            >> $TOMCAT_LOG 2>&1
-    else
-        $SU $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1
-    fi
-    RETVAL="$?"
-    if [ "$RETVAL" -eq 0 ]; then 
-        log_success_msg
-        touch /var/lock/subsys/${NAME}
-    else
-        log_failure_msg
-    fi
-    if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then
-        echo
-    fi
-    return $RETVAL
-}
-
-function stop() {
-    RETVAL="0"
-    echo -n "Stopping ${TOMCAT_PROG}: "
-    if [ -f "/var/lock/subsys/${NAME}" ]; then
-        parseOptions
-        $SU $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1
-        RETVAL="$?"
-        if [ "$RETVAL" -eq "0" ]; then
-            count="0"
-            if [ -f "/var/run/${NAME}.pid" ]; then
-                read kpid < /var/run/${NAME}.pid
-                until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \
-                      [ "$count" -gt "$SHUTDOWN_WAIT" ]; do
-                    if [ "$SHUTDOWN_VERBOSE" = "true" ]; then
-                        echo "waiting for processes $kpid to exit"
-                    fi
-                    sleep 1
-                    let count="${count}+1"
-                done
-                if [ "$count" -gt "$SHUTDOWN_WAIT" ]; then
-                    if [ "$SHUTDOWN_VERBOSE" = "true" ]; then
-                        echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds"
-                    fi
-                    kill -9 $kpid
-                fi
-                log_success_msg
-            fi
-            rm -f /var/lock/subsys/${NAME} /var/run/${NAME}.pid
-        else
-            log_failure_msg
-        fi
-    else
-        log_success_msg
-    fi
-    if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then
-        echo
-    fi
-    return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart)
-        stop
-        start
-        ;;
-    condrestart|try-restart)
-        if [ -f "/var/run/${NAME}.pid" ]; then
-            stop
-            start
-        fi
-        ;;
-    reload)
-        RETVAL="3"
-        ;;
-    force-reload)
-        if [ -f "/var/run/${NAME}.pid" ]; then
-            stop
-            start
-        fi
-        ;;
-    status)
-        if [ -f "/var/run/${NAME}.pid" ]; then
-#           status ${NAME}
-#           RETVAL="$?"
-            read kpid < /var/run/${NAME}.pid
-            if [ -d "/proc/${kpid}" ]; then
-                echo "${NAME} (pid ${kpid}) is running..."
-                RETVAL="0"
-            fi
-        else
-            pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} java)"
-            if [ -z "$pid" ]; then
-#               status ${NAME}
-#               RETVAL="$?"
-                echo "${NAME} is stopped"
-                RETVAL="3"
-            else
-                echo "${NAME} (pid $pid) is running..."
-                RETVAL="0"
-            fi
-        fi
-        ;;
-    version)
-        ${TOMCAT_SCRIPT} version
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status|version}"
-        RETVAL="2"
-esac
-
-exit $RETVAL

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/setup/cloud-setup-bridge
----------------------------------------------------------------------
diff --git a/awsapi-setup/setup/cloud-setup-bridge b/awsapi-setup/setup/cloud-setup-bridge
deleted file mode 100644
index d456387..0000000
--- a/awsapi-setup/setup/cloud-setup-bridge
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# Cloud.com Bridge setup script.
-#
-
-settingsFile="/etc/cloudstack/management/ec2-service.properties"
-
-function readCurrentSettings () {
-	readVar managementServer
-	readVar cloudAPIPort
-    readVar cloudstackVersion
-	readVar WSDLVersion
-	readVar keystore
-	readVar keystorePass
-	readVar m1.small.serviceId
- 	readVar m1.large.serviceId
-	readVar m1.xlarge.serviceId
-	readVar c1.medium.serviceId
-	readVar c1.xlarge.serviceId
-	readVar m2.xlarge.serviceId
-	readVar m2.2xlarge.serviceId
-	readVar m2.4xlarge.serviceId
-	readVar cc1.4xlarge.serviceId
-	readVar dbHost
-	readVar dbName
-	readVar dbUser
-	readVar dbPassword
-}
-
-function readVar () {
-	local _pointer=$(sub "$1")
-	local _tmp="`cat $settingsFile|grep \"$1=\"|awk -F= '{print $2}'|tr -d '\r'`"
-	eval $_pointer="$_tmp"
-}
-
-function readValue () {
-	local _value
-	local _tmp
-	local _pointer=$(sub "$2")
-	eval _value="\$$_pointer"
-	printf "%s [%s]: " "$1" "$_value"
-	read -e _tmp
-
-	if [ "$_tmp" != "" ]
-	then
-		eval $_pointer="$_tmp"
-	fi
-}
-
-function getNewValues () {
-	readValue "Management server hostname or IP" managementServer
-	readValue "Management server port" cloudAPIPort 
-
-	readValue "Service offering ID for m1.small" m1.small.serviceId
-	readValue "Service offering ID for m1.large" m1.large.serviceId
-	readValue "Service offering ID for m1.xlarge" m1.xlarge.serviceId
-
-	readValue "Service offering ID for c1.medium" c1.medium.serviceId
-	readValue "Service offering ID for c1.xlarge" c1.xlarge.serviceId
-
-	readValue "Service offering ID for m2.xlarge" m2.xlarge.serviceId
-	readValue "Service offering ID for m2.2xlarge" m2.2xlarge.serviceId
-	readValue "Service offering ID for m2.4xlarge" m2.4xlarge.serviceId
-	readValue "Service offering ID for cc1.4xlarge" cc1.4xlarge.serviceId
-}
-
-function sub () {
-	echo "$1" | awk '{gsub(/\./, "_", $0); print $0}'	
-}
-
-function saveValue () {
-	local _pointer=$(sub "$1")
-	local _value
-	eval _value="\$$_pointer"
-	echo "$1=$_value" >> $settingsFile
-}
-
-function saveValues () {
-	cat /dev/null > $settingsFile
-	saveValue managementServer
-	saveValue cloudAPIPort
-	saveValue cloudstackVersion
-	saveValue WSDLVersion
-	saveValue keystore
-	saveValue keystorePass
-	saveValue m1.small.serviceId
- 	saveValue m1.large.serviceId
-	saveValue m1.xlarge.serviceId
-	saveValue c1.medium.serviceId
-	saveValue c1.xlarge.serviceId
-	saveValue m2.xlarge.serviceId
-	saveValue m2.2xlarge.serviceId
-	saveValue m2.4xlarge.serviceId
-	saveValue cc1.4xlarge.serviceId
-	saveValue dbHost
-	saveValue dbName
-	saveValue dbUser
-	saveValue dbPassword
-}
-
-echo "Welcome to the CloudBridge setup."
-
-
-if [ ! -e $settingsFile ]
-then 
-    settingsFile=$1
-    if [ ! -e $settingsFile ]
-    then
-	echo "Error: Settings file not found."
-	exit 1
-    fi
-fi
-if [ ! -w $settingsFile ]
-then 
-	echo "Error: Insufficient permissions. Run as super-user."
-	exit 1
-fi
-
-readCurrentSettings
-
-printf "Enter suitable values or press enter for default. \n\n"
-
-getNewValues
-saveValues
-
-printf "\nValues saved. Restart the cloud-bridge service for the changes to become active.\n\n"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 07eacf1..0000000
--- a/awsapi-setup/setup/cloudstack-aws-api-register
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/python
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-import base64
-import hmac
-import os
-import sys
-import urllib2
-import urllib
-import httplib
-from datetime import datetime
-from optparse import OptionParser
-from urlparse import urlparse
-
-try:
-    from hashlib import sha1 as sha
-except ImportError:
-    import sha
-
-def get_signature(key, url, query):    
-    netloc, path = urlparse(url)[1:3]
-    return urllib.quote_plus(base64.b64encode(
-            hmac.new(key, '\n'.join(['GET', netloc, path, query]), sha).digest()))
-
-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=2012-08-15'
-    query = amzn_string + '&' + query
-    url = url + '?' + query + '&Signature=' + get_signature(secret_key, url, query)
-    try:
-        urllib2.urlopen(url)
-	if action == 'SetCertificate':
-		print 'User registration is successful!'
-	return True
-    except urllib2.HTTPError, e:
-		print  'User registration failed with http error code:' , e.code
-		return False
-    except urllib2.URLError, e:    
-		print 'User registration failed with error: ' , e.reason
-		return False
-   
-
-def register(url, api_key, secret_key, cert):
-    # Register API keys
-    query = 'accesskey=' + api_key + '&secretkey=' + secret_key
-    result = get_url(url, api_key, secret_key, 'SetUserKeys', query)
-
-    if result == True:
-	    # Tie Certifcate to API keys
-	    query = 'cert=' + urllib.quote_plus(cert)
-	    get_url(url, api_key, secret_key, 'SetCertificate', query)
-
-
-def get_opts():
-    parser = OptionParser()
-    parser.add_option('-a', '--apikey') 
-    parser.add_option('-s', '--secretkey') 
-    parser.add_option('-c', '--cert', help='Name of a file containing an X.509 certificate') 
-    parser.add_option('-u', '--url', help='CloudStack AWSAPI URL, eg. http://cloudstack.host:8080/awsapi') 
-    (options, args) = parser.parse_args()
-    if None in [options.apikey, options.secretkey, options.cert, options.url]:
-        print 'Error: Missing argument\n'
-        parser.print_help()
-        sys.exit(1)
-    return options
-
-def validate_opts(options):
-    if not os.path.isfile(options.cert):
-        print 'Error reading file: ' + options.cert  
-        sys.exit(1)
-    f = open(options.cert) 
-    options.cert = f.read()
-    return options
-
-if __name__ == '__main__':
-    opts = validate_opts(get_opts())
-    register(opts.url, opts.apikey, opts.secretkey, opts.cert)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi/.pydevproject
----------------------------------------------------------------------
diff --git a/awsapi/.pydevproject b/awsapi/.pydevproject
deleted file mode 100644
index d4a984a..0000000
--- a/awsapi/.pydevproject
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-</pydev_project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi/conf/applicationContext.xml.in
----------------------------------------------------------------------
diff --git a/awsapi/conf/applicationContext.xml.in b/awsapi/conf/applicationContext.xml.in
deleted file mode 100644
index fd9c871..0000000
--- a/awsapi/conf/applicationContext.xml.in
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xmlns:context="http://www.springframework.org/schema/context"
-  xmlns:tx="http://www.springframework.org/schema/tx" 
-  xmlns:aop="http://www.springframework.org/schema/aop"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans
-                      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-                      http://www.springframework.org/schema/tx 
-                      http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
-                      http://www.springframework.org/schema/aop
-                      http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
-                      http://www.springframework.org/schema/context
-                      http://www.springframework.org/schema/context/spring-context-3.0.xsd">                     
-
-  <context:annotation-config />
-
-  <context:component-scan base-package="com.amazon, com.cloud.bridge, com.cloud.stack" />
-  
-  <!--
-    @DB support
-  -->
-  
-   <!--
-    @DB support
-  -->
-  <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
-  <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
- 
-  <bean id="instantiatePostProcessor" class="com.cloud.utils.component.ComponentInstantiationPostProcessor">
-    <property name="Interceptors">
-        <list>
-            <ref bean="transactionContextBuilder" />
-        </list>
-    </property>
-  </bean>
- 
-</beans>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi/conf/cloud-bridge.properties.in
----------------------------------------------------------------------
diff --git a/awsapi/conf/cloud-bridge.properties.in b/awsapi/conf/cloud-bridge.properties.in
deleted file mode 100644
index d0820e8..0000000
--- a/awsapi/conf/cloud-bridge.properties.in
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-host=http://localhost:7080/awsapi
-storage.root=/Users/john1/S3-Mount
-storage.multipartDir=__multipart__uploads__
-bucket.dns=false
-serviceEndpoint=localhost:7080
-
-
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi/conf/ec2-service.properties.in
----------------------------------------------------------------------
diff --git a/awsapi/conf/ec2-service.properties.in b/awsapi/conf/ec2-service.properties.in
deleted file mode 100644
index 82f5ad8..0000000
--- a/awsapi/conf/ec2-service.properties.in
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-managementServer=127.0.0.1
-cloudAPIPort=8080
-cloudstackVersion=2.2.0
-WSDLVersion=2012-08-15
-keystore=xes.keystore
-keystorePass=apache
-
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
deleted file mode 100644
index 1ace8df..0000000
--- a/awsapi/pom.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>cloud-awsapi</artifactId>
-  <name>Apache CloudStack AWS API Bridge</name>
-  <packaging>war</packaging>
-  <parent>
-    <groupId>org.apache.cloudstack</groupId>
-    <artifactId>cloudstack</artifactId>
-    <version>4.6.0-SNAPSHOT</version>
-  </parent>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.axis2</groupId>
-      <artifactId>axis2</artifactId>
-      <version>${cs.axis2.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.axis2</groupId>
-      <artifactId>axis2-adb</artifactId>
-      <version>${cs.axis2.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.axis2</groupId>
-      <artifactId>axis2-webapp</artifactId>
-      <type>war</type>
-      <version>${cs.axis2.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ws.commons.axiom</groupId>
-      <artifactId>axiom-api</artifactId>
-      <version>${cs.axiom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ws.commons.axiom</groupId>
-      <artifactId>axiom-impl</artifactId>
-      <version>${cs.axiom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-plugin-syslog-alerts</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-plugin-snmp-alerts</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.neethi</groupId>
-      <artifactId>neethi</artifactId>
-      <version>${cs.neethi.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.ws.commons.axiom</groupId>
-          <artifactId>axiom-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ws.commons.axiom</groupId>
-          <artifactId>axiom-impl</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jasypt</groupId>
-      <artifactId>jasypt</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.caringo.client</groupId>
-      <artifactId>CAStorSDK</artifactId>
-      <version>1.3.1-CS40</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <version>1.6.1</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ws.security</groupId>
-      <artifactId>wss4j</artifactId>
-      <version>1.6.1</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>1.5.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opensaml</groupId>
-      <artifactId>xmltooling</artifactId>
-      <version>1.3.1</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opensaml</groupId>
-      <artifactId>openws</artifactId>
-      <version>1.4.1</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>velocity</groupId>
-      <artifactId>velocity</artifactId>
-      <version>1.5</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opensaml</groupId>
-      <artifactId>opensaml</artifactId>
-      <version>2.5.1-1</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.santuario</groupId>
-      <artifactId>xmlsec</artifactId>
-      <version>1.4.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk16</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr-runtime</artifactId>
-      <version>3.4</version>
-    </dependency>
-    <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-      <version>1.6.1</version>
-    </dependency>
-    <dependency>
-      <groupId>javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <version>3.9.0.GA</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-framework-db</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <directory>../utils/conf/</directory>
-      </resource>
-      <resource>
-        <directory>${basedir}/resource/AmazonEC2</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>cloudstack-checkstyle</id>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>com/cloud/gate/util/UtilTestCase.java</exclude>
-            <exclude>com/cloud/gate/service/ServiceTestCase.java</exclude>
-            <exclude>com/cloud/gate/util/CloudStackClientTestCase.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <webXml>./web/web.xml</webXml>
-          <warSourceDirectory>./target/generated-webapp</warSourceDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.26</version>
-        <configuration>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>7080</port>
-              <maxIdleTime>60000</maxIdleTime>
-            </connector>
-          </connectors>
-          <contextPath>/awsapi</contextPath>
-          <webXml>${basedir}/web/web.xml</webXml>
-          <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-resource</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes">
-                  <fileset dir="${basedir}/conf">
-                    <include name="*.*"/>
-                  </fileset>
-                  <globmapper from="*.in" to="*"/>
-                  <filterchain>
-                    <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}"/>
-                    </filterreader>
-                  </filterchain>
-                </copy>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-aar-maven-plugin</artifactId>
-        <version>1.6.2</version>
-        <extensions>true</extensions>
-        <configuration>
-          <includeDependencies>false</includeDependencies>
-          <aarName>cloud-ec2</aarName>
-          <outputDirectory>${project.build.directory}/WEB-INF/services</outputDirectory>
-          <fileSets>
-            <fileSet>
-              <directory>resource/AmazonEC2</directory>
-              <outputDirectory>META-INF</outputDirectory>
-              <includes>
-                <include>services.xml</include>
-              </includes>
-            </fileSet>
-          </fileSets>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>aar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>downloadec2wsdl</id>
-      <activation>
-        <property>
-          <name>downloadec2wsdl</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <target name="download-2012-08-15.ec2-wsdl">
-                    <!-- Create the WSDL directory structure used by codegen -->
-                    <mkdir dir="wsdl"/>
-                    <echo message="Downloading 2012-08-15.ec2-wsdl..."/>
-                    <get src="http://s3.amazonaws.com/ec2-downloads/2012-08-15.ec2.wsdl"
-                      dest="${basedir}/wsdl/" verbose="true" usetimestamp="true"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>gencodefromwsdl</id>
-      <activation>
-        <property>
-          <name>gencodefromwsdl</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-wsdl2code-maven-plugin</artifactId>
-            <version>1.5.6</version>
-            <executions>
-              <execution>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>wsdl2code</goal>
-                </goals>
-                <configuration>
-                  <wsdlFile>${basedir}/wsdl/2012-08-15.ec2.wsdl</wsdlFile>
-                  <packageName>com.amazon.ec2</packageName>
-                  <generateServerSide>true</generateServerSide>
-                  <generateServicesXml>true</generateServicesXml>
-                  <generateServerSideInterface>true</generateServerSideInterface>
-                  <namespaceToPackages>http://ec2.amazonaws.com/doc/2012-08-15/=com.amazon.ec2</namespaceToPackages>
-                  <outputDirectory>${basedir}</outputDirectory>
-                </configuration>
-              </execution>
-              <execution>
-                <id>generate-aws-ec2-source-client</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>wsdl2code</goal>
-                </goals>
-                <configuration>
-                  <wsdlFile>${basedir}/wsdl/2012-08-15.ec2.wsdl</wsdlFile>
-                  <packageName>com.amazon.ec2.client</packageName>
-                  <namespaceToPackages>http://ec2.amazonaws.com/doc/2012-08-15/=com.amazon.ec2.client</namespaceToPackages>
-                  <outputDirectory>${basedir}</outputDirectory>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>removewsdl</id>
-      <activation>
-        <property>
-          <name>removewsdl</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.2.1</version>
-            <executions>
-              <execution>
-                <phase>clean</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <executable>rm</executable>
-                  <arguments>
-                    <argument>-rf</argument>
-                    <argument>${basedir}/wsdl/</argument>
-                    <argument>${basedir}/resources/AmazonEC2.wsdl</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi/resource/AmazonEC2/crypto.properties
----------------------------------------------------------------------
diff --git a/awsapi/resource/AmazonEC2/crypto.properties b/awsapi/resource/AmazonEC2/crypto.properties
deleted file mode 100644
index 77a9eed..0000000
--- a/awsapi/resource/AmazonEC2/crypto.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=apache
-org.apache.ws.security.crypto.merlin.keystore.alias=xeskey
-org.apache.ws.security.crypto.merlin.alias.password=apache
-org.apache.ws.security.crypto.merlin.file=xes.keystore


[30/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index fa0ba5f..0000000
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneSetType.java
+++ /dev/null
@@ -1,491 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AvailabilityZoneSetType bean class
-*/
-
-public class AvailabilityZoneSetType 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/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.AvailabilityZoneItemType[] 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.AvailabilityZoneItemType[]
-    */
-    public com.amazon.ec2.AvailabilityZoneItemType[] getItem() {
-        return localItem;
-    }
-
-    /**
-     * validate the array for Item
-     */
-    protected void validateItem(com.amazon.ec2.AvailabilityZoneItemType[] param) {
-
-    }
-
-    /**
-     * Auto generated setter method
-     * @param param Item
-     */
-    public void setItem(com.amazon.ec2.AvailabilityZoneItemType[] 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.AvailabilityZoneItemType
-    */
-    public void addItem(com.amazon.ec2.AvailabilityZoneItemType param) {
-        if (localItem == null) {
-            localItem = new com.amazon.ec2.AvailabilityZoneItemType[] {};
-        }
-
-        //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.AvailabilityZoneItemType[])list.toArray(new com.amazon.ec2.AvailabilityZoneItemType[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 {
-                AvailabilityZoneSetType.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 + ":AvailabilityZoneSetType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AvailabilityZoneSetType", 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 AvailabilityZoneSetType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AvailabilityZoneSetType object = new AvailabilityZoneSetType();
-
-            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 (!"AvailabilityZoneSetType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AvailabilityZoneSetType)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.AvailabilityZoneItemType.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.AvailabilityZoneItemType.Factory.parse(reader));
-
-                            } else {
-                                loopDone1 = true;
-                            }
-                        }
-                    }
-                    // call the converter utility  to convert and set the array
-
-                    object.setItem((com.amazon.ec2.AvailabilityZoneItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
-                        com.amazon.ec2.AvailabilityZoneItemType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index e9f6109..0000000
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemType.java
+++ /dev/null
@@ -1,470 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BlockDeviceMappingItemType bean class
-*/
-
-public class BlockDeviceMappingItemType 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/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 DeviceName
-    */
-
-    protected java.lang.String localDeviceName;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getDeviceName() {
-        return localDeviceName;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param DeviceName
-       */
-    public void setDeviceName(java.lang.String param) {
-
-        this.localDeviceName = param;
-
-    }
-
-    /**
-    * field for BlockDeviceMappingItemTypeChoice_type0
-    */
-
-    protected com.amazon.ec2.BlockDeviceMappingItemTypeChoice_type0 localBlockDeviceMappingItemTypeChoice_type0;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.BlockDeviceMappingItemTypeChoice_type0
-    */
-    public com.amazon.ec2.BlockDeviceMappingItemTypeChoice_type0 getBlockDeviceMappingItemTypeChoice_type0() {
-        return localBlockDeviceMappingItemTypeChoice_type0;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param BlockDeviceMappingItemTypeChoice_type0
-       */
-    public void setBlockDeviceMappingItemTypeChoice_type0(com.amazon.ec2.BlockDeviceMappingItemTypeChoice_type0 param) {
-
-        this.localBlockDeviceMappingItemTypeChoice_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 {
-                BlockDeviceMappingItemType.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 + ":BlockDeviceMappingItemType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "BlockDeviceMappingItemType", 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, "deviceName", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "deviceName");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("deviceName");
-        }
-
-        if (localDeviceName == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("deviceName cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localDeviceName);
-
-        }
-
-        xmlWriter.writeEndElement();
-
-        if (localBlockDeviceMappingItemTypeChoice_type0 == null) {
-            throw new org.apache.axis2.databinding.ADBException("BlockDeviceMappingItemTypeChoice_type0 cannot be null!!");
-        }
-        localBlockDeviceMappingItemTypeChoice_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/", "deviceName"));
-
-        if (localDeviceName != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDeviceName));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("deviceName cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "BlockDeviceMappingItemTypeChoice_type0"));
-
-        if (localBlockDeviceMappingItemTypeChoice_type0 == null) {
-            throw new org.apache.axis2.databinding.ADBException("BlockDeviceMappingItemTypeChoice_type0 cannot be null!!");
-        }
-        elementList.add(localBlockDeviceMappingItemTypeChoice_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 BlockDeviceMappingItemType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BlockDeviceMappingItemType object = new BlockDeviceMappingItemType();
-
-            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 (!"BlockDeviceMappingItemType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (BlockDeviceMappingItemType)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/", "deviceName").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setDeviceName(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.setBlockDeviceMappingItemTypeChoice_type0(com.amazon.ec2.BlockDeviceMappingItemTypeChoice_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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 0363031..0000000
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingItemTypeChoice_type0.java
+++ /dev/null
@@ -1,525 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BlockDeviceMappingItemTypeChoice_type0 bean class
-*/
-
-public class BlockDeviceMappingItemTypeChoice_type0 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/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() {
-
-        localVirtualNameTracker = false;
-
-        localEbsTracker = false;
-
-        localNoDeviceTracker = false;
-
-    }
-
-    /**
-    * field for VirtualName
-    */
-
-    protected java.lang.String localVirtualName;
-
-    /*  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 localVirtualNameTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getVirtualName() {
-        return localVirtualName;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param VirtualName
-       */
-    public void setVirtualName(java.lang.String param) {
-
-        clearAllSettingTrackers();
-
-        if (param != null) {
-            //update the setting tracker
-            localVirtualNameTracker = true;
-        } else {
-            localVirtualNameTracker = false;
-
-        }
-
-        this.localVirtualName = param;
-
-    }
-
-    /**
-    * field for Ebs
-    */
-
-    protected com.amazon.ec2.EbsBlockDeviceType localEbs;
-
-    /*  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 localEbsTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.EbsBlockDeviceType
-    */
-    public com.amazon.ec2.EbsBlockDeviceType getEbs() {
-        return localEbs;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Ebs
-       */
-    public void setEbs(com.amazon.ec2.EbsBlockDeviceType param) {
-
-        clearAllSettingTrackers();
-
-        if (param != null) {
-            //update the setting tracker
-            localEbsTracker = true;
-        } else {
-            localEbsTracker = false;
-
-        }
-
-        this.localEbs = param;
-
-    }
-
-    /**
-    * field for NoDevice
-    */
-
-    protected com.amazon.ec2.EmptyElementType localNoDevice;
-
-    /*  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 localNoDeviceTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.EmptyElementType
-    */
-    public com.amazon.ec2.EmptyElementType getNoDevice() {
-        return localNoDevice;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param NoDevice
-       */
-    public void setNoDevice(com.amazon.ec2.EmptyElementType param) {
-
-        clearAllSettingTrackers();
-
-        if (param != null) {
-            //update the setting tracker
-            localNoDeviceTracker = true;
-        } else {
-            localNoDeviceTracker = false;
-
-        }
-
-        this.localNoDevice = 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 {
-                BlockDeviceMappingItemTypeChoice_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 + ":BlockDeviceMappingItemTypeChoice_type0", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "BlockDeviceMappingItemTypeChoice_type0", xmlWriter);
-            }
-
-        }
-        if (localVirtualNameTracker) {
-            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, "virtualName", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "virtualName");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("virtualName");
-            }
-
-            if (localVirtualName == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("virtualName cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localVirtualName);
-
-            }
-
-            xmlWriter.writeEndElement();
-        }
-        if (localEbsTracker) {
-            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/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/2012-08-15/", "noDevice"), 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 (localVirtualNameTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "virtualName"));
-
-            if (localVirtualName != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVirtualName));
-            } else {
-                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/2012-08-15/", "ebs"));
-
-            if (localEbs == null) {
-                throw new org.apache.axis2.databinding.ADBException("ebs cannot be null!!");
-            }
-            elementList.add(localEbs);
-        }
-        if (localNoDeviceTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "noDevice"));
-
-            if (localNoDevice == null) {
-                throw new org.apache.axis2.databinding.ADBException("noDevice cannot be null!!");
-            }
-            elementList.add(localNoDevice);
-        }
-
-        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 BlockDeviceMappingItemTypeChoice_type0 parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BlockDeviceMappingItemTypeChoice_type0 object = new BlockDeviceMappingItemTypeChoice_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/", "virtualName").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setVirtualName(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/", "ebs").equals(reader.getName())) {
-
-                    object.setEbs(com.amazon.ec2.EbsBlockDeviceType.Factory.parse(reader));
-
-                    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/", "noDevice").equals(reader.getName())) {
-
-                    object.setNoDevice(com.amazon.ec2.EmptyElementType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 72b095d..0000000
--- a/awsapi/src/com/amazon/ec2/BlockDeviceMappingType.java
+++ /dev/null
@@ -1,491 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BlockDeviceMappingType bean class
-*/
-
-public class BlockDeviceMappingType 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/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.BlockDeviceMappingItemType[] 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.BlockDeviceMappingItemType[]
-    */
-    public com.amazon.ec2.BlockDeviceMappingItemType[] getItem() {
-        return localItem;
-    }
-
-    /**
-     * validate the array for Item
-     */
-    protected void validateItem(com.amazon.ec2.BlockDeviceMappingItemType[] param) {
-
-    }
-
-    /**
-     * Auto generated setter method
-     * @param param Item
-     */
-    public void setItem(com.amazon.ec2.BlockDeviceMappingItemType[] 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.BlockDeviceMappingItemType
-    */
-    public void addItem(com.amazon.ec2.BlockDeviceMappingItemType param) {
-        if (localItem == null) {
-            localItem = new com.amazon.ec2.BlockDeviceMappingItemType[] {};
-        }
-
-        //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.BlockDeviceMappingItemType[])list.toArray(new com.amazon.ec2.BlockDeviceMappingItemType[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 {
-                BlockDeviceMappingType.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 + ":BlockDeviceMappingType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "BlockDeviceMappingType", 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 BlockDeviceMappingType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BlockDeviceMappingType object = new BlockDeviceMappingType();
-
-            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 (!"BlockDeviceMappingType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (BlockDeviceMappingType)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.BlockDeviceMappingItemType.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.BlockDeviceMappingItemType.Factory.parse(reader));
-
-                            } else {
-                                loopDone1 = true;
-                            }
-                        }
-                    }
-                    // call the converter utility  to convert and set the array
-
-                    object.setItem((com.amazon.ec2.BlockDeviceMappingItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
-                        com.amazon.ec2.BlockDeviceMappingItemType.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
-
-}


[12/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 0e3449a..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterface.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 8445541..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 70a7162..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 784181f..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkInterfaceType.java
+++ /dev/null
@@ -1,847 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[29/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index e5faa4e..0000000
--- a/awsapi/src/com/amazon/ec2/BundleInstance.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BundleInstance bean class
-*/
-
-public class BundleInstance 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/", "BundleInstance", "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 BundleInstance
-    */
-
-    protected com.amazon.ec2.BundleInstanceType localBundleInstance;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.BundleInstanceType
-    */
-    public com.amazon.ec2.BundleInstanceType getBundleInstance() {
-        return localBundleInstance;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param BundleInstance
-       */
-    public void setBundleInstance(com.amazon.ec2.BundleInstanceType param) {
-
-        this.localBundleInstance = 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 {
-                BundleInstance.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 (localBundleInstance == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localBundleInstance.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 localBundleInstance.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 BundleInstance parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BundleInstance object = new BundleInstance();
-
-            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/", "BundleInstance").equals(reader.getName())) {
-
-                            object.setBundleInstance(com.amazon.ec2.BundleInstanceType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 002136a..0000000
--- a/awsapi/src/com/amazon/ec2/BundleInstanceResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BundleInstanceResponse bean class
-*/
-
-public class BundleInstanceResponse 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/", "BundleInstanceResponse", "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 BundleInstanceResponse
-    */
-
-    protected com.amazon.ec2.BundleInstanceResponseType localBundleInstanceResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.BundleInstanceResponseType
-    */
-    public com.amazon.ec2.BundleInstanceResponseType getBundleInstanceResponse() {
-        return localBundleInstanceResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param BundleInstanceResponse
-       */
-    public void setBundleInstanceResponse(com.amazon.ec2.BundleInstanceResponseType param) {
-
-        this.localBundleInstanceResponse = 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 {
-                BundleInstanceResponse.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 (localBundleInstanceResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localBundleInstanceResponse.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 localBundleInstanceResponse.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 BundleInstanceResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BundleInstanceResponse object = new BundleInstanceResponse();
-
-            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/", "BundleInstanceResponse").equals(reader.getName())) {
-
-                            object.setBundleInstanceResponse(com.amazon.ec2.BundleInstanceResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f44de80..0000000
--- a/awsapi/src/com/amazon/ec2/BundleInstanceResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BundleInstanceResponseType bean class
-*/
-
-public class BundleInstanceResponseType 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/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 BundleInstanceTask
-    */
-
-    protected com.amazon.ec2.BundleInstanceTaskType localBundleInstanceTask;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.BundleInstanceTaskType
-    */
-    public com.amazon.ec2.BundleInstanceTaskType getBundleInstanceTask() {
-        return localBundleInstanceTask;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param BundleInstanceTask
-       */
-    public void setBundleInstanceTask(com.amazon.ec2.BundleInstanceTaskType param) {
-
-        this.localBundleInstanceTask = 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 {
-                BundleInstanceResponseType.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 + ":BundleInstanceResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "BundleInstanceResponseType", 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 (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/2012-08-15/", "bundleInstanceTask"), 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/", "bundleInstanceTask"));
-
-        if (localBundleInstanceTask == null) {
-            throw new org.apache.axis2.databinding.ADBException("bundleInstanceTask cannot be null!!");
-        }
-        elementList.add(localBundleInstanceTask);
-
-        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 BundleInstanceResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BundleInstanceResponseType object = new BundleInstanceResponseType();
-
-            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 (!"BundleInstanceResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (BundleInstanceResponseType)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/", "bundleInstanceTask").equals(reader.getName())) {
-
-                    object.setBundleInstanceTask(com.amazon.ec2.BundleInstanceTaskType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 807dff5..0000000
--- a/awsapi/src/com/amazon/ec2/BundleInstanceS3StorageType.java
+++ /dev/null
@@ -1,798 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BundleInstanceS3StorageType bean class
-*/
-
-public class BundleInstanceS3StorageType 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/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 Bucket
-    */
-
-    protected java.lang.String localBucket;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getBucket() {
-        return localBucket;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Bucket
-       */
-    public void setBucket(java.lang.String param) {
-
-        this.localBucket = param;
-
-    }
-
-    /**
-    * field for Prefix
-    */
-
-    protected java.lang.String localPrefix;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getPrefix() {
-        return localPrefix;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Prefix
-       */
-    public void setPrefix(java.lang.String param) {
-
-        this.localPrefix = param;
-
-    }
-
-    /**
-    * field for AwsAccessKeyId
-    */
-
-    protected java.lang.String localAwsAccessKeyId;
-
-    /*  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 localAwsAccessKeyIdTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getAwsAccessKeyId() {
-        return localAwsAccessKeyId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AwsAccessKeyId
-       */
-    public void setAwsAccessKeyId(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localAwsAccessKeyIdTracker = true;
-        } else {
-            localAwsAccessKeyIdTracker = false;
-
-        }
-
-        this.localAwsAccessKeyId = param;
-
-    }
-
-    /**
-    * field for UploadPolicy
-    */
-
-    protected java.lang.String localUploadPolicy;
-
-    /*  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 localUploadPolicyTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getUploadPolicy() {
-        return localUploadPolicy;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param UploadPolicy
-       */
-    public void setUploadPolicy(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localUploadPolicyTracker = true;
-        } else {
-            localUploadPolicyTracker = false;
-
-        }
-
-        this.localUploadPolicy = param;
-
-    }
-
-    /**
-    * field for UploadPolicySignature
-    */
-
-    protected java.lang.String localUploadPolicySignature;
-
-    /*  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 localUploadPolicySignatureTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getUploadPolicySignature() {
-        return localUploadPolicySignature;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param UploadPolicySignature
-       */
-    public void setUploadPolicySignature(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localUploadPolicySignatureTracker = true;
-        } else {
-            localUploadPolicySignatureTracker = false;
-
-        }
-
-        this.localUploadPolicySignature = 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 {
-                BundleInstanceS3StorageType.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 + ":BundleInstanceS3StorageType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "BundleInstanceS3StorageType", 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, "bucket", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "bucket");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("bucket");
-        }
-
-        if (localBucket == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("bucket cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localBucket);
-
-        }
-
-        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, "prefix", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "prefix");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("prefix");
-        }
-
-        if (localPrefix == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("prefix cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localPrefix);
-
-        }
-
-        xmlWriter.writeEndElement();
-        if (localAwsAccessKeyIdTracker) {
-            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, "awsAccessKeyId", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "awsAccessKeyId");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("awsAccessKeyId");
-            }
-
-            if (localAwsAccessKeyId == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("awsAccessKeyId cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localAwsAccessKeyId);
-
-            }
-
-            xmlWriter.writeEndElement();
-        }
-        if (localUploadPolicyTracker) {
-            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, "uploadPolicy", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "uploadPolicy");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("uploadPolicy");
-            }
-
-            if (localUploadPolicy == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("uploadPolicy cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localUploadPolicy);
-
-            }
-
-            xmlWriter.writeEndElement();
-        }
-        if (localUploadPolicySignatureTracker) {
-            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, "uploadPolicySignature", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "uploadPolicySignature");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("uploadPolicySignature");
-            }
-
-            if (localUploadPolicySignature == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("uploadPolicySignature cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localUploadPolicySignature);
-
-            }
-
-            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/", "bucket"));
-
-        if (localBucket != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localBucket));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("bucket cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "prefix"));
-
-        if (localPrefix != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPrefix));
-        } else {
-            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/2012-08-15/", "awsAccessKeyId"));
-
-            if (localAwsAccessKeyId != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAwsAccessKeyId));
-            } else {
-                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/2012-08-15/", "uploadPolicy"));
-
-            if (localUploadPolicy != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localUploadPolicy));
-            } else {
-                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/2012-08-15/", "uploadPolicySignature"));
-
-            if (localUploadPolicySignature != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localUploadPolicySignature));
-            } else {
-                throw new org.apache.axis2.databinding.ADBException("uploadPolicySignature 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 BundleInstanceS3StorageType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BundleInstanceS3StorageType object = new BundleInstanceS3StorageType();
-
-            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 (!"BundleInstanceS3StorageType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (BundleInstanceS3StorageType)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/", "bucket").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setBucket(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/", "prefix").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setPrefix(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/", "awsAccessKeyId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setAwsAccessKeyId(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/", "uploadPolicy").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setUploadPolicy(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/", "uploadPolicySignature").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setUploadPolicySignature(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());
-
-            } catch (javax.xml.stream.XMLStreamException e) {
-                throw new java.lang.Exception(e);
-            }
-
-            return object;
-        }
-
-    }//end of factory class
-
-}


[23/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 63bc699..0000000
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetItemType.java
+++ /dev/null
@@ -1,508 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelSpotInstanceRequestsResponseSetItemType bean class
-*/
-
-public class CancelSpotInstanceRequestsResponseSetItemType 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/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 SpotInstanceRequestId
-    */
-
-    protected java.lang.String localSpotInstanceRequestId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getSpotInstanceRequestId() {
-        return localSpotInstanceRequestId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param SpotInstanceRequestId
-       */
-    public void setSpotInstanceRequestId(java.lang.String param) {
-
-        this.localSpotInstanceRequestId = param;
-
-    }
-
-    /**
-    * field for State
-    */
-
-    protected java.lang.String localState;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getState() {
-        return localState;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param State
-       */
-    public void setState(java.lang.String param) {
-
-        this.localState = 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 {
-                CancelSpotInstanceRequestsResponseSetItemType.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 + ":CancelSpotInstanceRequestsResponseSetItemType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CancelSpotInstanceRequestsResponseSetItemType", 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, "spotInstanceRequestId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "spotInstanceRequestId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("spotInstanceRequestId");
-        }
-
-        if (localSpotInstanceRequestId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("spotInstanceRequestId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localSpotInstanceRequestId);
-
-        }
-
-        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, "state", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "state");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("state");
-        }
-
-        if (localState == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("state cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localState);
-
-        }
-
-        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/", "spotInstanceRequestId"));
-
-        if (localSpotInstanceRequestId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSpotInstanceRequestId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("spotInstanceRequestId cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "state"));
-
-        if (localState != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localState));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("state 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 CancelSpotInstanceRequestsResponseSetItemType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelSpotInstanceRequestsResponseSetItemType object = new CancelSpotInstanceRequestsResponseSetItemType();
-
-            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 (!"CancelSpotInstanceRequestsResponseSetItemType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CancelSpotInstanceRequestsResponseSetItemType)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/", "spotInstanceRequestId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setSpotInstanceRequestId(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/", "state").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setState(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 24494dc..0000000
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseSetType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelSpotInstanceRequestsResponseSetType bean class
-*/
-
-public class CancelSpotInstanceRequestsResponseSetType 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/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.CancelSpotInstanceRequestsResponseSetItemType[] localItem;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[]
-    */
-    public com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[] getItem() {
-        return localItem;
-    }
-
-    /**
-     * validate the array for Item
-     */
-    protected void validateItem(com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[] 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.CancelSpotInstanceRequestsResponseSetItemType[] param) {
-
-        validateItem(param);
-
-        this.localItem = param;
-    }
-
-    /**
-    * Auto generated add method for the array for convenience
-    * @param param com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType
-    */
-    public void addItem(com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType param) {
-        if (localItem == null) {
-            localItem = new com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[] {};
-        }
-
-        java.util.List list = org.apache.axis2.databinding.utils.ConverterUtil.toList(localItem);
-        list.add(param);
-        this.localItem =
-            (com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[])list.toArray(new com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[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 {
-                CancelSpotInstanceRequestsResponseSetType.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 + ":CancelSpotInstanceRequestsResponseSetType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CancelSpotInstanceRequestsResponseSetType", 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 CancelSpotInstanceRequestsResponseSetType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelSpotInstanceRequestsResponseSetType object = new CancelSpotInstanceRequestsResponseSetType();
-
-            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 (!"CancelSpotInstanceRequestsResponseSetType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CancelSpotInstanceRequestsResponseSetType)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.CancelSpotInstanceRequestsResponseSetItemType.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.CancelSpotInstanceRequestsResponseSetItemType.Factory.parse(reader));
-
-                            } else {
-                                loopDone1 = true;
-                            }
-                        }
-                    }
-                    // call the converter utility  to convert and set the array
-
-                    object.setItem((com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
-                        com.amazon.ec2.CancelSpotInstanceRequestsResponseSetItemType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 6f6c3ca..0000000
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponseType.java
+++ /dev/null
@@ -1,478 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelSpotInstanceRequestsResponseType bean class
-*/
-
-public class CancelSpotInstanceRequestsResponseType 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/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 SpotInstanceRequestSet
-    */
-
-    protected com.amazon.ec2.CancelSpotInstanceRequestsResponseSetType localSpotInstanceRequestSet;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CancelSpotInstanceRequestsResponseSetType
-    */
-    public com.amazon.ec2.CancelSpotInstanceRequestsResponseSetType getSpotInstanceRequestSet() {
-        return localSpotInstanceRequestSet;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param SpotInstanceRequestSet
-       */
-    public void setSpotInstanceRequestSet(com.amazon.ec2.CancelSpotInstanceRequestsResponseSetType param) {
-
-        this.localSpotInstanceRequestSet = 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 {
-                CancelSpotInstanceRequestsResponseType.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 + ":CancelSpotInstanceRequestsResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CancelSpotInstanceRequestsResponseType", 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 (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/2012-08-15/", "spotInstanceRequestSet"), 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/", "spotInstanceRequestSet"));
-
-        if (localSpotInstanceRequestSet == null) {
-            throw new org.apache.axis2.databinding.ADBException("spotInstanceRequestSet cannot be null!!");
-        }
-        elementList.add(localSpotInstanceRequestSet);
-
-        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 CancelSpotInstanceRequestsResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelSpotInstanceRequestsResponseType object = new CancelSpotInstanceRequestsResponseType();
-
-            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 (!"CancelSpotInstanceRequestsResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CancelSpotInstanceRequestsResponseType)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/", "spotInstanceRequestSet").equals(reader.getName())) {
-
-                    object.setSpotInstanceRequestSet(com.amazon.ec2.CancelSpotInstanceRequestsResponseSetType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 06eaa29..0000000
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsType.java
+++ /dev/null
@@ -1,396 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelSpotInstanceRequestsType bean class
-*/
-
-public class CancelSpotInstanceRequestsType 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/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 SpotInstanceRequestIdSet
-    */
-
-    protected com.amazon.ec2.SpotInstanceRequestIdSetType localSpotInstanceRequestIdSet;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.SpotInstanceRequestIdSetType
-    */
-    public com.amazon.ec2.SpotInstanceRequestIdSetType getSpotInstanceRequestIdSet() {
-        return localSpotInstanceRequestIdSet;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param SpotInstanceRequestIdSet
-       */
-    public void setSpotInstanceRequestIdSet(com.amazon.ec2.SpotInstanceRequestIdSetType param) {
-
-        this.localSpotInstanceRequestIdSet = 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 {
-                CancelSpotInstanceRequestsType.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 + ":CancelSpotInstanceRequestsType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CancelSpotInstanceRequestsType", xmlWriter);
-            }
-
-        }
-
-        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/2012-08-15/", "spotInstanceRequestIdSet"), 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/", "spotInstanceRequestIdSet"));
-
-        if (localSpotInstanceRequestIdSet == null) {
-            throw new org.apache.axis2.databinding.ADBException("spotInstanceRequestIdSet cannot be null!!");
-        }
-        elementList.add(localSpotInstanceRequestIdSet);
-
-        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 CancelSpotInstanceRequestsType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelSpotInstanceRequestsType object = new CancelSpotInstanceRequestsType();
-
-            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 (!"CancelSpotInstanceRequestsType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CancelSpotInstanceRequestsType)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/", "spotInstanceRequestIdSet").equals(reader.getName())) {
-
-                    object.setSpotInstanceRequestIdSet(com.amazon.ec2.SpotInstanceRequestIdSetType.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
-
-}


[03/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index df47acf..0000000
--- a/awsapi/src/com/amazon/ec2/CreateTagsType.java
+++ /dev/null
@@ -1,447 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateTagsType bean class
-*/
-
-public class CreateTagsType 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/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 ResourcesSet
-    */
-
-    protected com.amazon.ec2.ResourceIdSetType localResourcesSet;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.ResourceIdSetType
-    */
-    public com.amazon.ec2.ResourceIdSetType getResourcesSet() {
-        return localResourcesSet;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ResourcesSet
-       */
-    public void setResourcesSet(com.amazon.ec2.ResourceIdSetType param) {
-
-        this.localResourcesSet = param;
-
-    }
-
-    /**
-    * field for TagSet
-    */
-
-    protected com.amazon.ec2.ResourceTagSetType localTagSet;
-
-    /**
-    * 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) {
-
-        this.localTagSet = 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 {
-                CreateTagsType.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 + ":CreateTagsType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateTagsType", xmlWriter);
-            }
-
-        }
-
-        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/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/2012-08-15/", "tagSet"), 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/", "resourcesSet"));
-
-        if (localResourcesSet == null) {
-            throw new org.apache.axis2.databinding.ADBException("resourcesSet cannot be null!!");
-        }
-        elementList.add(localResourcesSet);
-
-        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());
-
-    }
-
-    /**
-     *  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 CreateTagsType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateTagsType object = new CreateTagsType();
-
-            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 (!"CreateTagsType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateTagsType)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/", "resourcesSet").equals(reader.getName())) {
-
-                    object.setResourcesSet(com.amazon.ec2.ResourceIdSetType.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/", "tagSet").equals(reader.getName())) {
-
-                    object.setTagSet(com.amazon.ec2.ResourceTagSetType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index a1632f0..0000000
--- a/awsapi/src/com/amazon/ec2/CreateVolume.java
+++ /dev/null
@@ -1,322 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateVolume bean class
-*/
-
-public class CreateVolume 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/", "CreateVolume", "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 CreateVolume
-    */
-
-    protected com.amazon.ec2.CreateVolumeType localCreateVolume;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateVolumeType
-    */
-    public com.amazon.ec2.CreateVolumeType getCreateVolume() {
-        return localCreateVolume;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateVolume
-       */
-    public void setCreateVolume(com.amazon.ec2.CreateVolumeType param) {
-
-        this.localCreateVolume = 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 {
-                CreateVolume.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 (localCreateVolume == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateVolume.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 localCreateVolume.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 CreateVolume parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateVolume object = new CreateVolume();
-
-            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/", "CreateVolume").equals(reader.getName())) {
-
-                            object.setCreateVolume(com.amazon.ec2.CreateVolumeType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 6b634ed..0000000
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionItemType.java
+++ /dev/null
@@ -1,541 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateVolumePermissionItemType bean class
-*/
-
-public class CreateVolumePermissionItemType 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/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() {
-
-        localUserIdTracker = false;
-
-        localGroupTracker = false;
-
-    }
-
-    /**
-    * field for UserId
-    */
-
-    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
-    * @return java.lang.String
-    */
-    public java.lang.String getUserId() {
-        return localUserId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param UserId
-       */
-    public void setUserId(java.lang.String param) {
-
-        clearAllSettingTrackers();
-
-        if (param != null) {
-            //update the setting tracker
-            localUserIdTracker = true;
-        } else {
-            localUserIdTracker = false;
-
-        }
-
-        this.localUserId = param;
-
-    }
-
-    /**
-    * field for Group
-    */
-
-    protected java.lang.String localGroup;
-
-    /*  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 localGroupTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getGroup() {
-        return localGroup;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Group
-       */
-    public void setGroup(java.lang.String param) {
-
-        clearAllSettingTrackers();
-
-        if (param != null) {
-            //update the setting tracker
-            localGroupTracker = true;
-        } else {
-            localGroupTracker = false;
-
-        }
-
-        this.localGroup = 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 {
-                CreateVolumePermissionItemType.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 + ":CreateVolumePermissionItemType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateVolumePermissionItemType", xmlWriter);
-            }
-
-        }
-        if (localUserIdTracker) {
-            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, "userId", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "userId");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("userId");
-            }
-
-            if (localUserId == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("userId cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localUserId);
-
-            }
-
-            xmlWriter.writeEndElement();
-        }
-        if (localGroupTracker) {
-            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, "group", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "group");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("group");
-            }
-
-            if (localGroup == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("group cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localGroup);
-
-            }
-
-            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();
-
-        if (localUserIdTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "userId"));
-
-            if (localUserId != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localUserId));
-            } else {
-                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/2012-08-15/", "group"));
-
-            if (localGroup != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localGroup));
-            } else {
-                throw new org.apache.axis2.databinding.ADBException("group 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 CreateVolumePermissionItemType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateVolumePermissionItemType object = new CreateVolumePermissionItemType();
-
-            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 (!"CreateVolumePermissionItemType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateVolumePermissionItemType)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.isEndElement()) {
-                    if (reader.isStartElement()) {
-
-                        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();
-
-                            object.setUserId(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/", "group").equals(reader.getName())) {
-
-                            java.lang.String content = reader.getElementText();
-
-                            object.setGroup(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
-
-                            reader.next();
-
-                        }  // End of if for expected property start element
-
-                    } 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 0ad6fa3..0000000
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionListType.java
+++ /dev/null
@@ -1,491 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateVolumePermissionListType bean class
-*/
-
-public class CreateVolumePermissionListType 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/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.CreateVolumePermissionItemType[] 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.CreateVolumePermissionItemType[]
-    */
-    public com.amazon.ec2.CreateVolumePermissionItemType[] getItem() {
-        return localItem;
-    }
-
-    /**
-     * validate the array for Item
-     */
-    protected void validateItem(com.amazon.ec2.CreateVolumePermissionItemType[] param) {
-
-    }
-
-    /**
-     * Auto generated setter method
-     * @param param Item
-     */
-    public void setItem(com.amazon.ec2.CreateVolumePermissionItemType[] 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.CreateVolumePermissionItemType
-    */
-    public void addItem(com.amazon.ec2.CreateVolumePermissionItemType param) {
-        if (localItem == null) {
-            localItem = new com.amazon.ec2.CreateVolumePermissionItemType[] {};
-        }
-
-        //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.CreateVolumePermissionItemType[])list.toArray(new com.amazon.ec2.CreateVolumePermissionItemType[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 {
-                CreateVolumePermissionListType.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 + ":CreateVolumePermissionListType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateVolumePermissionListType", 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 CreateVolumePermissionListType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateVolumePermissionListType object = new CreateVolumePermissionListType();
-
-            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 (!"CreateVolumePermissionListType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateVolumePermissionListType)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.CreateVolumePermissionItemType.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.CreateVolumePermissionItemType.Factory.parse(reader));
-
-                            } else {
-                                loopDone1 = true;
-                            }
-                        }
-                    }
-                    // call the converter utility  to convert and set the array
-
-                    object.setItem((com.amazon.ec2.CreateVolumePermissionItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
-                        com.amazon.ec2.CreateVolumePermissionItemType.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
-
-}


[34/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index ffa7934..0000000
--- a/awsapi/src/com/amazon/ec2/AttachmentSetResponseType.java
+++ /dev/null
@@ -1,491 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachmentSetResponseType bean class
-*/
-
-public class AttachmentSetResponseType 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/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.AttachmentSetItemResponseType[] 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.AttachmentSetItemResponseType[]
-    */
-    public com.amazon.ec2.AttachmentSetItemResponseType[] getItem() {
-        return localItem;
-    }
-
-    /**
-     * validate the array for Item
-     */
-    protected void validateItem(com.amazon.ec2.AttachmentSetItemResponseType[] param) {
-
-    }
-
-    /**
-     * Auto generated setter method
-     * @param param Item
-     */
-    public void setItem(com.amazon.ec2.AttachmentSetItemResponseType[] 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.AttachmentSetItemResponseType
-    */
-    public void addItem(com.amazon.ec2.AttachmentSetItemResponseType param) {
-        if (localItem == null) {
-            localItem = new com.amazon.ec2.AttachmentSetItemResponseType[] {};
-        }
-
-        //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.AttachmentSetItemResponseType[])list.toArray(new com.amazon.ec2.AttachmentSetItemResponseType[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 {
-                AttachmentSetResponseType.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 + ":AttachmentSetResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AttachmentSetResponseType", 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 AttachmentSetResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachmentSetResponseType object = new AttachmentSetResponseType();
-
-            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 (!"AttachmentSetResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AttachmentSetResponseType)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.AttachmentSetItemResponseType.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.AttachmentSetItemResponseType.Factory.parse(reader));
-
-                            } else {
-                                loopDone1 = true;
-                            }
-                        }
-                    }
-                    // call the converter utility  to convert and set the array
-
-                    object.setItem((com.amazon.ec2.AttachmentSetItemResponseType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
-                        com.amazon.ec2.AttachmentSetItemResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 91cb959..0000000
--- a/awsapi/src/com/amazon/ec2/AttachmentSetType.java
+++ /dev/null
@@ -1,491 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachmentSetType bean class
-*/
-
-public class AttachmentSetType 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/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.AttachmentType[] 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.AttachmentType[]
-    */
-    public com.amazon.ec2.AttachmentType[] getItem() {
-        return localItem;
-    }
-
-    /**
-     * validate the array for Item
-     */
-    protected void validateItem(com.amazon.ec2.AttachmentType[] param) {
-
-    }
-
-    /**
-     * Auto generated setter method
-     * @param param Item
-     */
-    public void setItem(com.amazon.ec2.AttachmentType[] 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.AttachmentType
-    */
-    public void addItem(com.amazon.ec2.AttachmentType param) {
-        if (localItem == null) {
-            localItem = new com.amazon.ec2.AttachmentType[] {};
-        }
-
-        //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.AttachmentType[])list.toArray(new com.amazon.ec2.AttachmentType[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 {
-                AttachmentSetType.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 + ":AttachmentSetType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AttachmentSetType", 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 AttachmentSetType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachmentSetType object = new AttachmentSetType();
-
-            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 (!"AttachmentSetType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AttachmentSetType)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.AttachmentType.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.AttachmentType.Factory.parse(reader));
-
-                            } else {
-                                loopDone1 = true;
-                            }
-                        }
-                    }
-                    // call the converter utility  to convert and set the array
-
-                    object.setItem((com.amazon.ec2.AttachmentType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(com.amazon.ec2.AttachmentType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 77d4a75..0000000
--- a/awsapi/src/com/amazon/ec2/AttachmentType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachmentType bean class
-*/
-
-public class AttachmentType 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/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;
-
-    }
-
-    /**
-    * field for State
-    */
-
-    protected java.lang.String localState;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getState() {
-        return localState;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param State
-       */
-    public void setState(java.lang.String param) {
-
-        this.localState = 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 {
-                AttachmentType.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 + ":AttachmentType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AttachmentType", 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();
-
-        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, "state", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "state");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("state");
-        }
-
-        if (localState == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("state cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localState);
-
-        }
-
-        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!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "state"));
-
-        if (localState != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localState));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("state 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 AttachmentType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachmentType object = new AttachmentType();
-
-            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 (!"AttachmentType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AttachmentType)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() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "state").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setState(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 763f0f9..0000000
--- a/awsapi/src/com/amazon/ec2/AttributeBooleanValueType.java
+++ /dev/null
@@ -1,418 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttributeBooleanValueType bean class
-*/
-
-public class AttributeBooleanValueType 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/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 Value
-    */
-
-    protected boolean localValue;
-
-    /**
-    * Auto generated getter method
-    * @return boolean
-    */
-    public boolean getValue() {
-        return localValue;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Value
-       */
-    public void setValue(boolean param) {
-
-        this.localValue = 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 {
-                AttributeBooleanValueType.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 + ":AttributeBooleanValueType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AttributeBooleanValueType", 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, "value", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "value");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("value");
-        }
-
-        if (false) {
-
-            throw new org.apache.axis2.databinding.ADBException("value cannot be null!!");
-
-        } else {
-            xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localValue));
-        }
-
-        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/", "value"));
-
-        elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localValue));
-
-        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 AttributeBooleanValueType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttributeBooleanValueType object = new AttributeBooleanValueType();
-
-            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 (!"AttributeBooleanValueType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AttributeBooleanValueType)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/", "value").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setValue(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
-
-}


[40/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 4ac01fe..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type1.java
+++ /dev/null
@@ -1,489 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 28875cd..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptions.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AssociateDhcpOptions bean class
-*/
-
-public class AssociateDhcpOptions 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/", "AssociateDhcpOptions", "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 AssociateDhcpOptions
-    */
-
-    protected com.amazon.ec2.AssociateDhcpOptionsType localAssociateDhcpOptions;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AssociateDhcpOptionsType
-    */
-    public com.amazon.ec2.AssociateDhcpOptionsType getAssociateDhcpOptions() {
-        return localAssociateDhcpOptions;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AssociateDhcpOptions
-       */
-    public void setAssociateDhcpOptions(com.amazon.ec2.AssociateDhcpOptionsType param) {
-
-        this.localAssociateDhcpOptions = 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 {
-                AssociateDhcpOptions.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 (localAssociateDhcpOptions == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAssociateDhcpOptions.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 localAssociateDhcpOptions.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 AssociateDhcpOptions parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AssociateDhcpOptions object = new AssociateDhcpOptions();
-
-            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/", "AssociateDhcpOptions").equals(reader.getName())) {
-
-                            object.setAssociateDhcpOptions(com.amazon.ec2.AssociateDhcpOptionsType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 2bed734..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AssociateDhcpOptionsResponse bean class
-*/
-
-public class AssociateDhcpOptionsResponse 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/", "AssociateDhcpOptionsResponse",
-        "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 AssociateDhcpOptionsResponse
-    */
-
-    protected com.amazon.ec2.AssociateDhcpOptionsResponseType localAssociateDhcpOptionsResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AssociateDhcpOptionsResponseType
-    */
-    public com.amazon.ec2.AssociateDhcpOptionsResponseType getAssociateDhcpOptionsResponse() {
-        return localAssociateDhcpOptionsResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AssociateDhcpOptionsResponse
-       */
-    public void setAssociateDhcpOptionsResponse(com.amazon.ec2.AssociateDhcpOptionsResponseType param) {
-
-        this.localAssociateDhcpOptionsResponse = 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 {
-                AssociateDhcpOptionsResponse.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 (localAssociateDhcpOptionsResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAssociateDhcpOptionsResponse.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 localAssociateDhcpOptionsResponse.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 AssociateDhcpOptionsResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AssociateDhcpOptionsResponse object = new AssociateDhcpOptionsResponse();
-
-            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/", "AssociateDhcpOptionsResponse").equals(reader.getName())) {
-
-                            object.setAssociateDhcpOptionsResponse(com.amazon.ec2.AssociateDhcpOptionsResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 98692a7..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AssociateDhcpOptionsResponseType bean class
-*/
-
-public class AssociateDhcpOptionsResponseType 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/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 {
-                AssociateDhcpOptionsResponseType.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 + ":AssociateDhcpOptionsResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AssociateDhcpOptionsResponseType", 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 AssociateDhcpOptionsResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AssociateDhcpOptionsResponseType object = new AssociateDhcpOptionsResponseType();
-
-            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 (!"AssociateDhcpOptionsResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AssociateDhcpOptionsResponseType)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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 8190220..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateDhcpOptionsType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AssociateDhcpOptionsType bean class
-*/
-
-public class AssociateDhcpOptionsType 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/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 DhcpOptionsId
-    */
-
-    protected java.lang.String localDhcpOptionsId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getDhcpOptionsId() {
-        return localDhcpOptionsId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param DhcpOptionsId
-       */
-    public void setDhcpOptionsId(java.lang.String param) {
-
-        this.localDhcpOptionsId = 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 {
-                AssociateDhcpOptionsType.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 + ":AssociateDhcpOptionsType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AssociateDhcpOptionsType", 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, "dhcpOptionsId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "dhcpOptionsId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("dhcpOptionsId");
-        }
-
-        if (localDhcpOptionsId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("dhcpOptionsId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localDhcpOptionsId);
-
-        }
-
-        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/", "dhcpOptionsId"));
-
-        if (localDhcpOptionsId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDhcpOptionsId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("dhcpOptionsId 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 AssociateDhcpOptionsType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AssociateDhcpOptionsType object = new AssociateDhcpOptionsType();
-
-            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 (!"AssociateDhcpOptionsType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AssociateDhcpOptionsType)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/", "dhcpOptionsId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setDhcpOptionsId(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
-
-}


[49/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi/resource/AmazonEC2/services.xml
----------------------------------------------------------------------
diff --git a/awsapi/resource/AmazonEC2/services.xml b/awsapi/resource/AmazonEC2/services.xml
deleted file mode 100644
index 027aa18..0000000
--- a/awsapi/resource/AmazonEC2/services.xml
+++ /dev/null
@@ -1,605 +0,0 @@
-<?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.6  Built on : Aug 30, 2011 (10:00:16 CEST) -->
-<serviceGroup>
-    <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.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/">
-            <actionMapping>DescribePlacementGroups</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/DescribePlacementGroupsResponse</outputActionMapping>
-        </operation>
-        <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="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="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="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/2012-08-15/AmazonEC2PortType/RequestSpotInstancesResponse</outputActionMapping>
-        </operation>
-        <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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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/2012-08-15/AmazonEC2PortType/DescribeSpotInstanceRequestsResponse</outputActionMapping>
-        </operation>
-        <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="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="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/2012-08-15/">
-            <actionMapping>CreatePlacementGroup</actionMapping>
-            <outputActionMapping>http://ec2.amazonaws.com/doc/2012-08-15/AmazonEC2PortType/CreatePlacementGroupResponse</outputActionMapping>
-        </operation>
-        <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="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/2012-08-15/AmazonEC2PortType/DescribeAvailabilityZonesResponse</outputActionMapping>
-        </operation>
-        <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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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/2012-08-15/AmazonEC2PortType/DeletePlacementGroupResponse</outputActionMapping>
-        </operation>
-        <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="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="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/2012-08-15/AmazonEC2PortType/AttachVpnGatewayResponse</outputActionMapping>
-        </operation>
-        <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="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="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="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="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="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="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="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/2012-08-15/AmazonEC2PortType/DetachVolumeResponse</outputActionMapping>
-        </operation>
-        <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="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="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/2012-08-15/AmazonEC2PortType/DescribeCustomerGatewaysResponse</outputActionMapping>
-        </operation>
-        <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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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/84042f2c/awsapi/resource/AmazonEC2/xes.keystore
----------------------------------------------------------------------
diff --git a/awsapi/resource/AmazonEC2/xes.keystore b/awsapi/resource/AmazonEC2/xes.keystore
deleted file mode 100644
index aa7ae77..0000000
Binary files a/awsapi/resource/AmazonEC2/xes.keystore and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi/resource/Axis2/axis2.xml
----------------------------------------------------------------------
diff --git a/awsapi/resource/Axis2/axis2.xml b/awsapi/resource/Axis2/axis2.xml
deleted file mode 100644
index f5e9308..0000000
--- a/awsapi/resource/Axis2/axis2.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements. See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership. The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<axisconfig name="AxisJava2.0">
-    <!-- ================================================= -->
-    <!-- Parameters -->
-    <!-- ================================================= -->
-    <parameter name="hotdeployment">true</parameter>
-    <parameter name="hotupdate">false</parameter>
-    <parameter name="enableMTOM">false</parameter>
-    <parameter name="enableSwA">false</parameter>
-
-    <!--Uncomment if you want to enable file caching for attachments -->
-    <!--parameter name="cacheAttachments">true</parameter>
-    <parameter name="attachmentDIR"></parameter>
-    <parameter name="sizeThreshold">4000</parameter-->
-
-    <!--Uncomment if you want to plugin your own attachments lifecycle implementation -->
-    <!--<attachmentsLifecycleManager class="org.apache.axiom.attachments.lifecycle.impl.LifecycleManagerImpl"/>-->
-
-
-    <!--Uncomment if you want to enable the reduction of the in-memory cache of WSDL definitions -->
-    <!--In some server environments, the available memory heap is limited and can fill up under load -->
-    <!--Since in-memory copies of WSDL definitions can be large, some steps can be taken-->
-    <!--to reduce the memory needed for the cached WSDL definitions. -->
-    <!--parameter name="reduceWSDLMemoryCache">true</parameter-->
-
-    <!--This will give out the timout of the configuration contexts, in milliseconds-->
-    <parameter name="ConfigContextTimeoutInterval">30000</parameter>
-
-    <!--During a fault, stack trace can be sent with the fault message. The following flag will control -->
-    <!--that behavior.-->
-    <parameter name="sendStacktraceDetailsWithFaults">false</parameter>
-
-    <!--If there aren't any information available to find out the fault reason, we set the message of the exception-->
-    <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
-    <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
-    <!--is set, then Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
-    <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
-
-    <parameter name="userName">admin</parameter>
-    <parameter name="password">axis2</parameter>
-
-    <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
-    <!--ServicesDirectory only works on the following cases-->
-    <!---File based configurator and in that case the value should be a file URL (http:// not allowed)-->
-    <!---When creating URL Based configurator with URL file:// -->
-    <!--- War based configurator with expanded case , -->
-
-    <!--All the other scenarios it will be ignored.-->
-    <!--<parameter name="ServicesDirectory">service</parameter>-->
-    <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
-    <!--<parameter name="ModulesDirectory">modules</parameter>-->
-
-
-    <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
-    <!--root which can configured using the following contextRoot parameter-->
-    <!--<parameter name="contextRoot">axis2</parameter>-->
-
-    <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distinguiush those endpoints-->
-    <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
-    <!--context path to proper Axis2 servlets-->
-    <!--<parameter name="servicePath">services</parameter>-->
-    <!--<parameter name="restPath">rest</parameter>-->
-
-    <!-- Following parameter will completely disable REST handling in Axis2-->
-    <parameter name="disableREST" locked="false">false</parameter>
-
-    <!-- Following parameter will suppress generation of SOAP 1.2 bindings in auto-generated WSDL files -->
-    <parameter name="disableSOAP12" locked="true">false</parameter>
-
-    <!--POJO deployer , this will alow users to drop .class file and make that into a service-->
-    <deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/>
-    <deployer extension=".jar" directory="servicejars"
-              class="org.apache.axis2.jaxws.framework.JAXWSDeployer"/>
-    <deployer extension=".jar" directory="transports"
-              class="org.apache.axis2.deployment.TransportDeployer"/>
-
-    <!--CORBA deployer , this will alow users to invoke remote CORBA services through Axis2-->
-    <!--<deployer extension=".xml" directory="corba" class="org.apache.axis2.corba.deployer.CorbaDeployer"/>-->
-
-    <!--<deployer extension=".jsa" directory="rmiservices" class="org.apache.axis2.rmi.deploy.RMIServiceDeployer"/>-->
-
-
-    <!-- Following parameter will set the host name for the epr-->
-    <!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
-
-    <!-- If you have a front end host which exposes this webservice using a different public URL  -->
-    <!-- use this parameter to override autodetected url -->
-    <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
-
-
-    <!--    The way of adding listener to the system-->
-    <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-    <!--        <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
-    <!--    </listener>-->
-
-    <threadContextMigrators>
-        <threadContextMigrator listId="JAXWS-ThreadContextMigrator-List"
-                               class="org.apache.axis2.jaxws.addressing.migrator.EndpointContextMapMigrator"/>
-    </threadContextMigrators>
-
-    <!-- ================================================= -->
-    <!-- Message Receivers -->
-    <!-- ================================================= -->
-    <!--This is the default MessageReceiver for the system , if you want to have MessageReceivers for -->
-    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
-    <!--any operation -->
-    <!--Note : You can override this for a particular service by adding the same element with your requirement-->
-    <messageReceivers>
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-    </messageReceivers>
-
-    <!-- ================================================= -->
-    <!-- Message Formatter -->
-    <!-- ================================================= -->
-    <!--Following content type to message formatter mapping can be used to implement support for different message -->
-    <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
-    <messageFormatters>
-        <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
-        <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
-        <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
-        <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-        <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-    </messageFormatters>
-
-    <!-- ================================================= -->
-    <!-- Message Builders -->
-    <!-- ================================================= -->
-    <!--Following content type to builder mapping can be used to implement support for different message -->
-    <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
-    <messageBuilders>
-        <messageBuilder contentType="application/xml"
-                        class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
-        <messageBuilder contentType="application/x-www-form-urlencoded"
-                        class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
-        <messageBuilder contentType="multipart/form-data"
-                        class="org.apache.axis2.builder.MultipartFormDataBuilder"/>
-    </messageBuilders>
-
-    <!-- ================================================= -->
-    <!-- Transport Ins -->
-    <!-- ================================================= -->
-    <transportReceiver name="http"
-                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port">8080</parameter>
-        <!-- Here is the complete list of supported parameters (see example settings further below):
-            port: the port to listen on (default 6060)
-            hostname:  if non-null, url prefix used in reply-to endpoint references                                 (default null)
-            originServer:  value of http Server header in outgoing messages                                         (default "Simple-Server/1.1")
-            requestTimeout:  value in millis of time that requests can wait for data                                (default 20000)
-            requestTcpNoDelay:  true to maximize performance and minimize latency                                   (default true)
-                                false to minimize bandwidth consumption by combining segments
-            requestCoreThreadPoolSize:  number of threads available for request processing (unless queue fills up)  (default 25)
-            requestMaxThreadPoolSize:  number of threads available for request processing if queue fills up         (default 150)
-                                       note that default queue never fills up:  see HttpFactory
-            threadKeepAliveTime:  time to keep threads in excess of core size alive while inactive                  (default 180)
-                                  note that no such threads can exist with default unbounded request queue
-            threadKeepAliveTimeUnit:  TimeUnit of value in threadKeepAliveTime (default SECONDS)                    (default SECONDS)
-        -->
-        <!-- <parameter name="hostname">http://www.myApp.com/ws</parameter> -->
-        <!-- <parameter name="originServer">My-Server/1.1</parameter>           -->
-        <!-- <parameter name="requestTimeout">10000</parameter>                   -->
-        <!-- <parameter name="requestTcpNoDelay">false</parameter>                   -->
-        <!-- <parameter name="requestCoreThreadPoolSize">50</parameter>                      -->
-        <!-- <parameter name="requestMaxThreadPoolSize">100</parameter>                     -->
-        <!-- <parameter name="threadKeepAliveTime">240000</parameter>                  -->
-        <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter>            -->
-    </transportReceiver>
-
-    <!--Uncomment if you want to have TCP transport support-->
-    <!--transportReceiver name="tcp"
-                       class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port">6060</parameter-->>
-    <!--If you want to give your own host address for EPR generation-->
-    <!--uncomment the following paramter , and set it as you required.-->
-    <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
-    <!-- /transportReceiver -->
-
-    <!-- ================================================= -->
-    <!-- Transport Outs -->
-    <!-- ================================================= -->
-
-    <!--Uncomment if you want to have TCP transport support-->
-    <!--
-    <transportSender name="tcp"
-                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
-    -->
-    <transportSender name="local"
-                     class="org.apache.axis2.transport.local.LocalTransportSender"/>
-    <transportSender name="http"
-                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding">chunked</parameter>
-
-        <!-- If following is set to 'true', optional action part of the Content-Type will not be added to the SOAP 1.2 messages -->
-        <!--  <parameter name="OmitSOAP12Action">true</parameter>  -->
-    </transportSender>
-
-    <transportSender name="https"
-                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding">chunked</parameter>
-    </transportSender>
-
-    <!-- Please enable this if you need the java transport -->
-    <!-- <transportSender name="java"
-                     class="org.apache.axis2.transport.java.JavaTransportSender"/> -->
-
-    <!-- ================================================= -->
-    <!-- Global Modules  -->
-    <!-- ================================================= -->
-    <!-- Comment this to disable Addressing -->
-    <!-- <module ref="addressing"/> -->
-
-    <!--Configuring module , providing parameters for modules whether they refer or not-->
-    <!--<moduleConfig name="addressing">-->
-    <!--<parameter name="addressingPara">N/A</parameter>-->
-    <!--</moduleConfig>-->
-
-    <!-- ================================================= -->
-    <!-- Clustering  -->
-    <!-- ================================================= -->
-    <!--
-     To enable clustering for this node, set the value of "enable" attribute of the "cluster"
-     element to "true". The initilization of a node in the cluster is handled by the class
-     corresponding to the "class" attribute of the "cluster" element. It is also responsible for
-     getting this node to join the cluster.
-     -->
-    <cluster class="org.apache.axis2.clustering.tribes.TribesClusterManager" enable="false">
-
-        <!--
-           This parameter indicates whther the cluster has to be automatically initalized
-           when the AxisConfiguration is built. If set to "true" the initialization will not be
-           done at that stage, and some other party will have to explictly initialize the cluster.
-        -->
-        <parameter name="AvoidInitiation">true</parameter>
-
-        <!--
-           Indicates whether this member is active or not. This will be useful in a setup where
-           members are deployed in ACTIVE and/or PASSIVE configuration 
-        -->
-        <parameter name="isActive">true</parameter>
-
-        <!--
-           An implementation of org.apache.axis2.clustering.MembershipListener
-           which will be called on membership changes
-        -->
-        <!--
-        <parameter name="membershipListener">
-            <class>org.apache.axis2.clustering.MembershipListenerImpl</class>
-            <properties>
-                <property name="foo">bar</property>
-            </properties>
-        </parameter>
-        -->
-
-        <!--
-           The membership scheme used in this setup. The only values supported at the moment are
-           "multicast" and "wka"
-
-           1. multicast - membership is automatically discovered using multicasting
-           2. wka - Well-Known Address based multicasting. Membership is discovered with the help
-                    of one or more nodes running at a Well-Known Address. New members joining a
-                    cluster will first connect to a well-known node, register with the well-known node
-                    and get the membership list from it. When new members join, one of the well-known
-                    nodes will notify the others in the group. When a member leaves the cluster or
-                    is deemed to have left the cluster, it will be detected by the Group Membership
-                    Service (GMS) using a TCP ping mechanism.
-        -->
-        <parameter name="membershipScheme">multicast</parameter>
-
-        <!--
-         The clustering domain/group. Nodes in the same group will belong to the same multicast
-         domain. There will not be interference between nodes in different groups.
-        -->
-        <parameter name="domain">apache.axis2.domain</parameter>
-
-        <!--
-        This parameter is only valid when the "mode" parameter is set to application. This indicates
-        the domain in which the the applications being load balanced are deployed.
-        -->
-        <parameter name="applicationDomain">apache.axis2.application.domain</parameter>
-
-        <!--
-           When a Web service request is received, and processed, before the response is sent to the
-           client, should we update the states of all members in the cluster? If the value of
-           this parameter is set to "true", the response to the client will be sent only after
-           all the members have been updated. Obviously, this can be time consuming. In some cases,
-           such this overhead may not be acceptable, in which case the value of this parameter
-           should be set to "false"
-        -->
-        <parameter name="synchronizeAll">true</parameter>
-
-        <!--
-          The maximum number of times we need to retry to send a message to a particular node
-          before giving up and considering that node to be faulty
-        -->
-        <parameter name="maxRetries">10</parameter>
-
-        <!-- The multicast address to be used -->
-        <parameter name="mcastAddress">228.0.0.4</parameter>
-
-        <!-- The multicast port to be used -->
-        <parameter name="mcastPort">45564</parameter>
-
-        <!-- The frequency of sending membership multicast messages (in ms) -->
-        <parameter name="mcastFrequency">500</parameter>
-
-        <!-- The time interval within which if a member does not respond, the member will be
-         deemed to have left the group (in ms)
-         -->
-        <parameter name="memberDropTime">3000</parameter>
-
-        <!--
-           The IP address of the network interface to which the multicasting has to be bound to.
-           Multicasting would be done using this interface.
-        -->
-        <parameter name="mcastBindAddress">127.0.0.1</parameter>
-
-        <!-- The host name or IP address of this member -->
-        <parameter name="localMemberHost">127.0.0.1</parameter>
-
-        <!--
-        The TCP port used by this member. This is the port through which other nodes will
-        contact this member
-         -->
-        <parameter name="localMemberPort">4000</parameter>
-
-        <!--
-        Preserve message ordering. This will be done according to sender order.
-        -->
-        <parameter name="preserveMessageOrder">true</parameter>
-
-        <!--
-        Maintain atmost-once message processing semantics
-        -->
-        <parameter name="atmostOnceMessageSemantics">true</parameter>
-
-        <!--
-           The list of static or well-known members. These entries will only be valid if the
-           "membershipScheme" above is set to "wka"
-        -->
-        <members>
-            <member>
-                <hostName>127.0.0.1</hostName>
-                <port>4000</port>
-            </member>
-            <member>
-                <hostName>127.0.0.1</hostName>
-                <port>4001</port>
-            </member>
-        </members>
-
-        <!--
-        Enable the load balancer entry if you need to run this node as a load balancer.
-        Multiple application domains with different LoadBalanceEventHandler implementations
-        can be defined in this section.
-        -->
-        <loadBalancer enable="false">
-            <applicationDomain name="apache.axis2.application.domain"
-                               handler="org.apache.axis2.clustering.DefaultLoadBalanceEventHandler"/>
-        </loadBalancer>
-
-        <!--
-           This interface is responsible for handling configuration management.
-           Configuraion changes include:
-
-            1. Rebooting an entire cluster, in which case, all nodes have to load the new
-               Axis2 configuration in a consistent manner
-            2. Deploying a new service to a cluster or undeploying a service from a cluster
-            3. Changing the policies of a service deployed on the cluster
-
-            The "enable" attribute indicates whether Configuration management has been enabled
-        -->
-        <configurationManager
-                class="org.apache.axis2.clustering.configuration.DefaultConfigurationManager"
-                enable="true">
-            <listener
-                    class="org.apache.axis2.clustering.configuration.DefaultConfigurationManagerListener"/>
-        </configurationManager>
-
-        <!--
-           This interface is responsible for handling context replication. The property changes in
-           the Axis2 context hierarchy in this node, are propagated to all other nodes in the cluster.
-
-           The "excludes" patterns can be used to specify the prefixes (e.g. local_*) or
-           suffixes (e.g. *_local) of the properties to be excluded from replication. The pattern
-           "*" indicates that all properties in a particular context should not be replicated.
-
-            The "enable" attribute indicates whether context replication has been enabled
-        -->
-        <contextManager class="org.apache.axis2.clustering.context.DefaultContextManager"
-                        enable="true">
-            <listener class="org.apache.axis2.clustering.context.DefaultContextManagerListener"/>
-            <replication>
-                <defaults>
-                    <exclude name="local_*"/>
-                    <exclude name="LOCAL_*"/>
-                </defaults>
-                <context class="org.apache.axis2.context.ConfigurationContext">
-                    <exclude name="UseAsyncOperations"/>
-                    <exclude name="SequencePropertyBeanMap"/>
-                </context>
-                <context class="org.apache.axis2.context.ServiceGroupContext">
-                    <exclude name="my.sandesha.*"/>
-                </context>
-                <context class="org.apache.axis2.context.ServiceContext">
-                    <exclude name="my.sandesha.*"/>
-                </context>
-            </replication>
-        </contextManager>
-    </cluster>
-
-    <!-- ================================================= -->
-    <!-- Phases  -->
-    <!-- ================================================= -->
-    <phaseOrder type="InFlow">
-        <!--  System predefined phases       -->
-        <phase name="Transport">
-            <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
-                <order phase="Transport"/>
-            </handler>
-            <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
-                <order phase="Transport"/>
-            </handler>
-        </phase>
-        <phase name="Addressing">
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Addressing"/>
-            </handler>
-        </phase>
-        <!-- needs to be before the X509 cert is removed -->
-        <phase name="ec2authentication">
-		      <handler name="InFlowEC2Auth"
-                     class="com.cloud.bridge.auth.ec2.AuthenticationHandler">
-                    <order phase="ec2authentication"/>
-              </handler>
-        </phase>   
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
-            <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
-            <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
-            <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
-            <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
-            <handler name="HTTPLocationBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
-            <handler name="GenericProviderDispatcher"
-                     class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher"/>
-            <handler name="MustUnderstandValidationDispatcher"
-                     class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher"/>
-        </phase>
-        <phase name="RMPhase"/>
-        <!--  System predefined phases       -->
-        <!--   After Postdispatch phase module author or service author can add any phase he want      -->
-        <phase name="OperationInPhase">
-            <handler name="MustUnderstandChecker"
-                     class="org.apache.axis2.jaxws.dispatchers.MustUnderstandChecker">
-                <order phase="OperationInPhase"/>
-            </handler>
-        </phase>
-   	    <phase name="s3authentication">
-		      <handler name="InFlowS3Auth"
-                     class="com.cloud.bridge.auth.s3.AuthenticationHandler">
-                    <order phase="s3authentication"/>
-              </handler>
-        </phase>
-        <phase name="soapmonitorPhase"/>
-    </phaseOrder>
-    <phaseOrder type="OutFlow">
-        <!--      user can add his own phases to this area  -->
-        <phase name="soapmonitorPhase"/>
-        <phase name="OperationOutPhase"/>
-        <!--system predefined phase-->
-        <!--these phase will run irrespective of the service-->
-        <phase name="RMPhase"/>
-        <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-        <phase name="Security"/>
-    </phaseOrder>
-    <phaseOrder type="InFaultFlow">
-        <phase name="Addressing">
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Addressing"/>
-            </handler>
-        </phase>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
-            <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
-            <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
-            <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
-            <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
-            <handler name="HTTPLocationBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
-            <handler name="GenericProviderDispatcher"
-                     class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher"/>
-            <handler name="MustUnderstandValidationDispatcher"
-                     class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher"/>
-        </phase>
-        <phase name="RMPhase"/>
-        <!--      user can add his own phases to this area  -->
-        <phase name="OperationInFaultPhase"/>
-        <phase name="soapmonitorPhase"/>
-    </phaseOrder>
-    <phaseOrder type="OutFaultFlow">
-        <!--      user can add his own phases to this area  -->
-        <phase name="soapmonitorPhase"/>
-        <phase name="OperationOutFaultPhase"/>
-        <phase name="RMPhase"/>
-        <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-        <phase name="Security"/>
-    </phaseOrder>
-</axisconfig>
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi/scripts/run.bat
----------------------------------------------------------------------
diff --git a/awsapi/scripts/run.bat b/awsapi/scripts/run.bat
deleted file mode 100644
index 453e74f..0000000
--- a/awsapi/scripts/run.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-rem  Licensed to the Apache Software Foundation (ASF) under one
-rem  or more contributor license agreements.  See the NOTICE file
-rem  distributed with this work for additional information
-rem  regarding copyright ownership.  The ASF licenses this file
-rem  to you under the Apache License, Version 2.0 (the
-rem  "License"); you may not use this file except in compliance
-rem  with the License.  You may obtain a copy of the License at
-rem  
-rem    http://www.apache.org/licenses/LICENSE-2.0
-rem  
-rem  Unless required by applicable law or agreed to in writing,
-rem  software distributed under the License is distributed on an
-rem  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem  KIND, either express or implied.  See the License for the
-rem  specific language governing permissions and limitations
-rem  under the License.
-
-java -cp cloud-tool.jar;./lib/XmlSchema-1.4.3.jar;./lib/antlr-2.7.6.jar;./lib/apache-log4j-extras-1.0.jar;./lib/axiom-api-1.2.8.jar;./lib/axiom-impl-1.2.8.jar;./lib/axis2-adb-1.5.1.jar;./lib/axis2-ant-plugin-1.5.1.jar;./lib/axis2-jaxbri-1.5.1.jar;./lib/axis2-jaxws-1.5.1.jar;./lib/axis2-jibx-1.5.1.jar;./lib/axis2-json-1.5.1.jar;./lib/axis2-kernel-1.5.1.jar;./lib/axis2-transport-http-1.5.1.jar;./lib/axis2-transport-local-1.5.1.jar;./lib/commons-codec-1.3.jar;./lib/commons-collections-3.1.jar;./lib/commons-fileupload-1.2.jar;./lib/commons-httpclient-3.1.jar;./lib/commons-io-1.4.jar;./lib/commons-logging-1.1.1.jar;./lib/dom4j-1.6.1.jar;./lib/hibernate3.jar;./lib/httpcore-4.0.jar;./lib/javassist-3.9.0.GA.jar;./lib/jta-1.1.jar;./lib/junit-4.8.1.jar;./lib/log4j-1.2.15.jar;./lib/mail-1.4.jar;./lib/mysql-connector-java-5.1.7-bin.jar;./lib/neethi-2.0.4.jar;./lib/servlet-api.jar;./lib/slf4j-api-1.5.11.jar;./lib/slf4j-simple-1.5.11.jar;./lib/wsdl4j-1.6.2.jar com.cloud.gate.tool.CloudS3CmdTool %
 *

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi/scripts/run.sh
----------------------------------------------------------------------
diff --git a/awsapi/scripts/run.sh b/awsapi/scripts/run.sh
deleted file mode 100644
index cc7c84a..0000000
--- a/awsapi/scripts/run.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-CP=. 
-for file in lib/*.jar
-do
-  CP=${CP}:$file
-done
-
-java -cp $CP:./cloud-tool.jar com.cloud.gate.tool.CloudS3CmdTool $@


[46/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index d7bfad9..0000000
--- a/awsapi/src/com/amazon/ec2/AllocationIdSetType.java
+++ /dev/null
@@ -1,491 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[08/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 2e3f7e0..0000000
--- a/awsapi/src/com/amazon/ec2/CreateRouteType.java
+++ /dev/null
@@ -1,552 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index beb9245..0000000
--- a/awsapi/src/com/amazon/ec2/CreateRouteTypeChoice_type0.java
+++ /dev/null
@@ -1,585 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b2da751..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroup.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSecurityGroup bean class
-*/
-
-public class CreateSecurityGroup 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/", "CreateSecurityGroup", "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 CreateSecurityGroup
-    */
-
-    protected com.amazon.ec2.CreateSecurityGroupType localCreateSecurityGroup;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateSecurityGroupType
-    */
-    public com.amazon.ec2.CreateSecurityGroupType getCreateSecurityGroup() {
-        return localCreateSecurityGroup;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateSecurityGroup
-       */
-    public void setCreateSecurityGroup(com.amazon.ec2.CreateSecurityGroupType param) {
-
-        this.localCreateSecurityGroup = 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 {
-                CreateSecurityGroup.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 (localCreateSecurityGroup == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateSecurityGroup.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 localCreateSecurityGroup.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 CreateSecurityGroup parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSecurityGroup object = new CreateSecurityGroup();
-
-            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/", "CreateSecurityGroup").equals(reader.getName())) {
-
-                            object.setCreateSecurityGroup(com.amazon.ec2.CreateSecurityGroupType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index e739ae4..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSecurityGroupResponse bean class
-*/
-
-public class CreateSecurityGroupResponse 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/", "CreateSecurityGroupResponse",
-        "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 CreateSecurityGroupResponse
-    */
-
-    protected com.amazon.ec2.CreateSecurityGroupResponseType localCreateSecurityGroupResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateSecurityGroupResponseType
-    */
-    public com.amazon.ec2.CreateSecurityGroupResponseType getCreateSecurityGroupResponse() {
-        return localCreateSecurityGroupResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateSecurityGroupResponse
-       */
-    public void setCreateSecurityGroupResponse(com.amazon.ec2.CreateSecurityGroupResponseType param) {
-
-        this.localCreateSecurityGroupResponse = 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 {
-                CreateSecurityGroupResponse.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 (localCreateSecurityGroupResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateSecurityGroupResponse.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 localCreateSecurityGroupResponse.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 CreateSecurityGroupResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSecurityGroupResponse object = new CreateSecurityGroupResponse();
-
-            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/", "CreateSecurityGroupResponse").equals(reader.getName())) {
-
-                            object.setCreateSecurityGroupResponse(com.amazon.ec2.CreateSecurityGroupResponseType.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
-
-}


[05/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 3193fc3..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponseType.java
+++ /dev/null
@@ -1,478 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSpotDatafeedSubscriptionResponseType bean class
-*/
-
-public class CreateSpotDatafeedSubscriptionResponseType 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/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 SpotDatafeedSubscription
-    */
-
-    protected com.amazon.ec2.SpotDatafeedSubscriptionType localSpotDatafeedSubscription;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.SpotDatafeedSubscriptionType
-    */
-    public com.amazon.ec2.SpotDatafeedSubscriptionType getSpotDatafeedSubscription() {
-        return localSpotDatafeedSubscription;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param SpotDatafeedSubscription
-       */
-    public void setSpotDatafeedSubscription(com.amazon.ec2.SpotDatafeedSubscriptionType param) {
-
-        this.localSpotDatafeedSubscription = 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 {
-                CreateSpotDatafeedSubscriptionResponseType.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 + ":CreateSpotDatafeedSubscriptionResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateSpotDatafeedSubscriptionResponseType", 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 (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/2012-08-15/", "spotDatafeedSubscription"), 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/", "spotDatafeedSubscription"));
-
-        if (localSpotDatafeedSubscription == null) {
-            throw new org.apache.axis2.databinding.ADBException("spotDatafeedSubscription cannot be null!!");
-        }
-        elementList.add(localSpotDatafeedSubscription);
-
-        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 CreateSpotDatafeedSubscriptionResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSpotDatafeedSubscriptionResponseType object = new CreateSpotDatafeedSubscriptionResponseType();
-
-            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 (!"CreateSpotDatafeedSubscriptionResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateSpotDatafeedSubscriptionResponseType)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/", "spotDatafeedSubscription").equals(reader.getName())) {
-
-                    object.setSpotDatafeedSubscription(com.amazon.ec2.SpotDatafeedSubscriptionType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 0d5c540..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSpotDatafeedSubscriptionType bean class
-*/
-
-public class CreateSpotDatafeedSubscriptionType 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/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 Bucket
-    */
-
-    protected java.lang.String localBucket;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getBucket() {
-        return localBucket;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Bucket
-       */
-    public void setBucket(java.lang.String param) {
-
-        this.localBucket = param;
-
-    }
-
-    /**
-    * field for Prefix
-    */
-
-    protected java.lang.String localPrefix;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getPrefix() {
-        return localPrefix;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Prefix
-       */
-    public void setPrefix(java.lang.String param) {
-
-        this.localPrefix = 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 {
-                CreateSpotDatafeedSubscriptionType.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 + ":CreateSpotDatafeedSubscriptionType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateSpotDatafeedSubscriptionType", 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, "bucket", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "bucket");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("bucket");
-        }
-
-        if (localBucket == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("bucket cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localBucket);
-
-        }
-
-        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, "prefix", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "prefix");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("prefix");
-        }
-
-        if (localPrefix == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("prefix cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localPrefix);
-
-        }
-
-        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/", "bucket"));
-
-        if (localBucket != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localBucket));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("bucket cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "prefix"));
-
-        if (localPrefix != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localPrefix));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("prefix 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 CreateSpotDatafeedSubscriptionType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSpotDatafeedSubscriptionType object = new CreateSpotDatafeedSubscriptionType();
-
-            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 (!"CreateSpotDatafeedSubscriptionType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateSpotDatafeedSubscriptionType)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/", "bucket").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setBucket(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/", "prefix").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setPrefix(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 5023b6f..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSubnet.java
+++ /dev/null
@@ -1,322 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSubnet bean class
-*/
-
-public class CreateSubnet 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/", "CreateSubnet", "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 CreateSubnet
-    */
-
-    protected com.amazon.ec2.CreateSubnetType localCreateSubnet;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateSubnetType
-    */
-    public com.amazon.ec2.CreateSubnetType getCreateSubnet() {
-        return localCreateSubnet;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateSubnet
-       */
-    public void setCreateSubnet(com.amazon.ec2.CreateSubnetType param) {
-
-        this.localCreateSubnet = 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 {
-                CreateSubnet.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 (localCreateSubnet == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateSubnet.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 localCreateSubnet.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 CreateSubnet parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSubnet object = new CreateSubnet();
-
-            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/", "CreateSubnet").equals(reader.getName())) {
-
-                            object.setCreateSubnet(com.amazon.ec2.CreateSubnetType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 4bb8ac4..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSubnetResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSubnetResponse bean class
-*/
-
-public class CreateSubnetResponse 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/", "CreateSubnetResponse", "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 CreateSubnetResponse
-    */
-
-    protected com.amazon.ec2.CreateSubnetResponseType localCreateSubnetResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateSubnetResponseType
-    */
-    public com.amazon.ec2.CreateSubnetResponseType getCreateSubnetResponse() {
-        return localCreateSubnetResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateSubnetResponse
-       */
-    public void setCreateSubnetResponse(com.amazon.ec2.CreateSubnetResponseType param) {
-
-        this.localCreateSubnetResponse = 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 {
-                CreateSubnetResponse.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 (localCreateSubnetResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateSubnetResponse.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 localCreateSubnetResponse.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 CreateSubnetResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSubnetResponse object = new CreateSubnetResponse();
-
-            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/", "CreateSubnetResponse").equals(reader.getName())) {
-
-                            object.setCreateSubnetResponse(com.amazon.ec2.CreateSubnetResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b8f8ab0..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSubnetResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSubnetResponseType bean class
-*/
-
-public class CreateSubnetResponseType 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/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 Subnet
-    */
-
-    protected com.amazon.ec2.SubnetType localSubnet;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.SubnetType
-    */
-    public com.amazon.ec2.SubnetType getSubnet() {
-        return localSubnet;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Subnet
-       */
-    public void setSubnet(com.amazon.ec2.SubnetType param) {
-
-        this.localSubnet = 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 {
-                CreateSubnetResponseType.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 + ":CreateSubnetResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateSubnetResponseType", 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 (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/2012-08-15/", "subnet"), 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/", "subnet"));
-
-        if (localSubnet == null) {
-            throw new org.apache.axis2.databinding.ADBException("subnet cannot be null!!");
-        }
-        elementList.add(localSubnet);
-
-        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 CreateSubnetResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSubnetResponseType object = new CreateSubnetResponseType();
-
-            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 (!"CreateSubnetResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateSubnetResponseType)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/", "subnet").equals(reader.getName())) {
-
-                    object.setSubnet(com.amazon.ec2.SubnetType.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
-
-}


[14/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 7cbc8a3..0000000
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateKeyPairType bean class
-*/
-
-public class CreateKeyPairType 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/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 KeyName
-    */
-
-    protected java.lang.String localKeyName;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getKeyName() {
-        return localKeyName;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param KeyName
-       */
-    public void setKeyName(java.lang.String param) {
-
-        this.localKeyName = 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 {
-                CreateKeyPairType.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 + ":CreateKeyPairType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateKeyPairType", 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, "keyName", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "keyName");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("keyName");
-        }
-
-        if (localKeyName == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("keyName cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localKeyName);
-
-        }
-
-        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/", "keyName"));
-
-        if (localKeyName != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localKeyName));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("keyName 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 CreateKeyPairType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateKeyPairType object = new CreateKeyPairType();
-
-            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 (!"CreateKeyPairType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateKeyPairType)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/", "keyName").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setKeyName(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 5b2b5e8..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAcl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index cb84a69..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntry.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 1b325d1..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 815c44c..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[09/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 035ff90..0000000
--- a/awsapi/src/com/amazon/ec2/CreateRouteResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 8ecb753..0000000
--- a/awsapi/src/com/amazon/ec2/CreateRouteTable.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index bead6e8..0000000
--- a/awsapi/src/com/amazon/ec2/CreateRouteTableResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f08261f..0000000
--- a/awsapi/src/com/amazon/ec2/CreateRouteTableResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 3ac0769..0000000
--- a/awsapi/src/com/amazon/ec2/CreateRouteTableType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[39/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 6a753f1..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTable.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 8308945..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 7a8cde1..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTableResponseType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 00d85ee..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateRouteTableType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b39ef3b..0000000
--- a/awsapi/src/com/amazon/ec2/AttachInternetGateway.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[22/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 3f3ce43..0000000
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstance.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ConfirmProductInstance bean class
-*/
-
-public class ConfirmProductInstance 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/", "ConfirmProductInstance", "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 ConfirmProductInstance
-    */
-
-    protected com.amazon.ec2.ConfirmProductInstanceType localConfirmProductInstance;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.ConfirmProductInstanceType
-    */
-    public com.amazon.ec2.ConfirmProductInstanceType getConfirmProductInstance() {
-        return localConfirmProductInstance;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ConfirmProductInstance
-       */
-    public void setConfirmProductInstance(com.amazon.ec2.ConfirmProductInstanceType param) {
-
-        this.localConfirmProductInstance = 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 {
-                ConfirmProductInstance.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 (localConfirmProductInstance == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localConfirmProductInstance.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 localConfirmProductInstance.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 ConfirmProductInstance parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ConfirmProductInstance object = new ConfirmProductInstance();
-
-            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/", "ConfirmProductInstance").equals(reader.getName())) {
-
-                            object.setConfirmProductInstance(com.amazon.ec2.ConfirmProductInstanceType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 7073bcd..0000000
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ConfirmProductInstanceResponse bean class
-*/
-
-public class ConfirmProductInstanceResponse 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/", "ConfirmProductInstanceResponse",
-        "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 ConfirmProductInstanceResponse
-    */
-
-    protected com.amazon.ec2.ConfirmProductInstanceResponseType localConfirmProductInstanceResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.ConfirmProductInstanceResponseType
-    */
-    public com.amazon.ec2.ConfirmProductInstanceResponseType getConfirmProductInstanceResponse() {
-        return localConfirmProductInstanceResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ConfirmProductInstanceResponse
-       */
-    public void setConfirmProductInstanceResponse(com.amazon.ec2.ConfirmProductInstanceResponseType param) {
-
-        this.localConfirmProductInstanceResponse = 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 {
-                ConfirmProductInstanceResponse.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 (localConfirmProductInstanceResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localConfirmProductInstanceResponse.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 localConfirmProductInstanceResponse.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 ConfirmProductInstanceResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ConfirmProductInstanceResponse object = new ConfirmProductInstanceResponse();
-
-            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/", "ConfirmProductInstanceResponse").equals(reader.getName())) {
-
-                            object.setConfirmProductInstanceResponse(com.amazon.ec2.ConfirmProductInstanceResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 974daad..0000000
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceResponseType.java
+++ /dev/null
@@ -1,596 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ConfirmProductInstanceResponseType bean class
-*/
-
-public class ConfirmProductInstanceResponseType 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/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;
-
-    }
-
-    /**
-    * field for OwnerId
-    */
-
-    protected java.lang.String localOwnerId;
-
-    /*  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 localOwnerIdTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getOwnerId() {
-        return localOwnerId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param OwnerId
-       */
-    public void setOwnerId(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localOwnerIdTracker = true;
-        } else {
-            localOwnerIdTracker = false;
-
-        }
-
-        this.localOwnerId = 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 {
-                ConfirmProductInstanceResponseType.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 + ":ConfirmProductInstanceResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ConfirmProductInstanceResponseType", 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();
-        if (localOwnerIdTracker) {
-            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, "ownerId", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "ownerId");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("ownerId");
-            }
-
-            if (localOwnerId == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("ownerId cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localOwnerId);
-
-            }
-
-            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));
-        if (localOwnerIdTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ownerId"));
-
-            if (localOwnerId != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localOwnerId));
-            } else {
-                throw new org.apache.axis2.databinding.ADBException("ownerId 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 ConfirmProductInstanceResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ConfirmProductInstanceResponseType object = new ConfirmProductInstanceResponseType();
-
-            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 (!"ConfirmProductInstanceResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (ConfirmProductInstanceResponseType)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() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ownerId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setOwnerId(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());
-
-            } catch (javax.xml.stream.XMLStreamException e) {
-                throw new java.lang.Exception(e);
-            }
-
-            return object;
-        }
-
-    }//end of factory class
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f5bfcf7..0000000
--- a/awsapi/src/com/amazon/ec2/ConfirmProductInstanceType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ConfirmProductInstanceType bean class
-*/
-
-public class ConfirmProductInstanceType 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/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 ProductCode
-    */
-
-    protected java.lang.String localProductCode;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getProductCode() {
-        return localProductCode;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ProductCode
-       */
-    public void setProductCode(java.lang.String param) {
-
-        this.localProductCode = 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;
-
-    }
-
-    /**
-    * 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 {
-                ConfirmProductInstanceType.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 + ":ConfirmProductInstanceType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ConfirmProductInstanceType", 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, "productCode", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "productCode");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("productCode");
-        }
-
-        if (localProductCode == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("productCode cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localProductCode);
-
-        }
-
-        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();
-
-        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/", "productCode"));
-
-        if (localProductCode != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localProductCode));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("productCode 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!!");
-        }
-
-        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 ConfirmProductInstanceType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ConfirmProductInstanceType object = new ConfirmProductInstanceType();
-
-            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 (!"ConfirmProductInstanceType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (ConfirmProductInstanceType)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/", "productCode").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setProductCode(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())
-                    // 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
-
-}


[28/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b73bbc2..0000000
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskErrorType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BundleInstanceTaskErrorType bean class
-*/
-
-public class BundleInstanceTaskErrorType 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/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 Code
-    */
-
-    protected java.lang.String localCode;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getCode() {
-        return localCode;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Code
-       */
-    public void setCode(java.lang.String param) {
-
-        this.localCode = param;
-
-    }
-
-    /**
-    * field for Message
-    */
-
-    protected java.lang.String localMessage;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getMessage() {
-        return localMessage;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Message
-       */
-    public void setMessage(java.lang.String param) {
-
-        this.localMessage = 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 {
-                BundleInstanceTaskErrorType.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 + ":BundleInstanceTaskErrorType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "BundleInstanceTaskErrorType", 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, "code", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "code");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("code");
-        }
-
-        if (localCode == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("code cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localCode);
-
-        }
-
-        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, "message", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "message");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("message");
-        }
-
-        if (localMessage == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("message cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localMessage);
-
-        }
-
-        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/", "code"));
-
-        if (localCode != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localCode));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("code cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "message"));
-
-        if (localMessage != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMessage));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("message 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 BundleInstanceTaskErrorType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BundleInstanceTaskErrorType object = new BundleInstanceTaskErrorType();
-
-            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 (!"BundleInstanceTaskErrorType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (BundleInstanceTaskErrorType)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/", "code").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setCode(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/", "message").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setMessage(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 38d1f86..0000000
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskStorageType.java
+++ /dev/null
@@ -1,395 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BundleInstanceTaskStorageType bean class
-*/
-
-public class BundleInstanceTaskStorageType 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/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 S3
-    */
-
-    protected com.amazon.ec2.BundleInstanceS3StorageType localS3;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.BundleInstanceS3StorageType
-    */
-    public com.amazon.ec2.BundleInstanceS3StorageType getS3() {
-        return localS3;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param S3
-       */
-    public void setS3(com.amazon.ec2.BundleInstanceS3StorageType param) {
-
-        this.localS3 = 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 {
-                BundleInstanceTaskStorageType.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 + ":BundleInstanceTaskStorageType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "BundleInstanceTaskStorageType", xmlWriter);
-            }
-
-        }
-
-        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/2012-08-15/", "S3"), 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/", "S3"));
-
-        if (localS3 == null) {
-            throw new org.apache.axis2.databinding.ADBException("S3 cannot be null!!");
-        }
-        elementList.add(localS3);
-
-        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 BundleInstanceTaskStorageType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BundleInstanceTaskStorageType object = new BundleInstanceTaskStorageType();
-
-            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 (!"BundleInstanceTaskStorageType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (BundleInstanceTaskStorageType)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/", "S3").equals(reader.getName())) {
-
-                    object.setS3(com.amazon.ec2.BundleInstanceS3StorageType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index e717186..0000000
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTaskType.java
+++ /dev/null
@@ -1,968 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BundleInstanceTaskType bean class
-*/
-
-public class BundleInstanceTaskType 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/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 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 BundleId
-    */
-
-    protected java.lang.String localBundleId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getBundleId() {
-        return localBundleId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param BundleId
-       */
-    public void setBundleId(java.lang.String param) {
-
-        this.localBundleId = param;
-
-    }
-
-    /**
-    * field for State
-    */
-
-    protected java.lang.String localState;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getState() {
-        return localState;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param State
-       */
-    public void setState(java.lang.String param) {
-
-        this.localState = param;
-
-    }
-
-    /**
-    * field for StartTime
-    */
-
-    protected java.util.Calendar localStartTime;
-
-    /**
-    * Auto generated getter method
-    * @return java.util.Calendar
-    */
-    public java.util.Calendar getStartTime() {
-        return localStartTime;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param StartTime
-       */
-    public void setStartTime(java.util.Calendar param) {
-
-        this.localStartTime = param;
-
-    }
-
-    /**
-    * field for UpdateTime
-    */
-
-    protected java.util.Calendar localUpdateTime;
-
-    /**
-    * Auto generated getter method
-    * @return java.util.Calendar
-    */
-    public java.util.Calendar getUpdateTime() {
-        return localUpdateTime;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param UpdateTime
-       */
-    public void setUpdateTime(java.util.Calendar param) {
-
-        this.localUpdateTime = param;
-
-    }
-
-    /**
-    * field for Storage
-    */
-
-    protected com.amazon.ec2.BundleInstanceTaskStorageType localStorage;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.BundleInstanceTaskStorageType
-    */
-    public com.amazon.ec2.BundleInstanceTaskStorageType getStorage() {
-        return localStorage;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Storage
-       */
-    public void setStorage(com.amazon.ec2.BundleInstanceTaskStorageType param) {
-
-        this.localStorage = param;
-
-    }
-
-    /**
-    * field for Progress
-    */
-
-    protected java.lang.String localProgress;
-
-    /*  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 localProgressTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getProgress() {
-        return localProgress;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Progress
-       */
-    public void setProgress(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localProgressTracker = true;
-        } else {
-            localProgressTracker = false;
-
-        }
-
-        this.localProgress = param;
-
-    }
-
-    /**
-    * field for Error
-    */
-
-    protected com.amazon.ec2.BundleInstanceTaskErrorType localError;
-
-    /*  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 localErrorTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.BundleInstanceTaskErrorType
-    */
-    public com.amazon.ec2.BundleInstanceTaskErrorType getError() {
-        return localError;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Error
-       */
-    public void setError(com.amazon.ec2.BundleInstanceTaskErrorType param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localErrorTracker = true;
-        } else {
-            localErrorTracker = false;
-
-        }
-
-        this.localError = 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 {
-                BundleInstanceTaskType.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 + ":BundleInstanceTaskType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "BundleInstanceTaskType", 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, "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, "bundleId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "bundleId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("bundleId");
-        }
-
-        if (localBundleId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("bundleId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localBundleId);
-
-        }
-
-        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, "state", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "state");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("state");
-        }
-
-        if (localState == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("state cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localState);
-
-        }
-
-        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, "startTime", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "startTime");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("startTime");
-        }
-
-        if (localStartTime == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("startTime cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStartTime));
-
-        }
-
-        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, "updateTime", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "updateTime");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("updateTime");
-        }
-
-        if (localUpdateTime == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("updateTime cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localUpdateTime));
-
-        }
-
-        xmlWriter.writeEndElement();
-
-        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/2012-08-15/", "storage"), factory, xmlWriter);
-        if (localProgressTracker) {
-            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, "progress", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "progress");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("progress");
-            }
-
-            if (localProgress == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("progress cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localProgress);
-
-            }
-
-            xmlWriter.writeEndElement();
-        }
-        if (localErrorTracker) {
-            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/2012-08-15/", "error"), 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/", "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/", "bundleId"));
-
-        if (localBundleId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localBundleId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("bundleId cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "state"));
-
-        if (localState != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localState));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("state cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "startTime"));
-
-        if (localStartTime != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStartTime));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("startTime cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "updateTime"));
-
-        if (localUpdateTime != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localUpdateTime));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("updateTime cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "storage"));
-
-        if (localStorage == null) {
-            throw new org.apache.axis2.databinding.ADBException("storage cannot be null!!");
-        }
-        elementList.add(localStorage);
-        if (localProgressTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "progress"));
-
-            if (localProgress != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localProgress));
-            } else {
-                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/2012-08-15/", "error"));
-
-            if (localError == null) {
-                throw new org.apache.axis2.databinding.ADBException("error cannot be null!!");
-            }
-            elementList.add(localError);
-        }
-
-        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 BundleInstanceTaskType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BundleInstanceTaskType object = new BundleInstanceTaskType();
-
-            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 (!"BundleInstanceTaskType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (BundleInstanceTaskType)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/", "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/", "bundleId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setBundleId(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/", "state").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setState(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/", "startTime").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setStartTime(org.apache.axis2.databinding.utils.ConverterUtil.convertToDateTime(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/", "updateTime").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setUpdateTime(org.apache.axis2.databinding.utils.ConverterUtil.convertToDateTime(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/", "storage").equals(reader.getName())) {
-
-                    object.setStorage(com.amazon.ec2.BundleInstanceTaskStorageType.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/", "progress").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setProgress(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/", "error").equals(reader.getName())) {
-
-                    object.setError(com.amazon.ec2.BundleInstanceTaskErrorType.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
-
-}


[33/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index c306b59..0000000
--- a/awsapi/src/com/amazon/ec2/AttributeValueType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttributeValueType bean class
-*/
-
-public class AttributeValueType 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/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 Value
-    */
-
-    protected java.lang.String localValue;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getValue() {
-        return localValue;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Value
-       */
-    public void setValue(java.lang.String param) {
-
-        this.localValue = 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 {
-                AttributeValueType.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 + ":AttributeValueType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AttributeValueType", 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, "value", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "value");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("value");
-        }
-
-        if (localValue == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("value cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localValue);
-
-        }
-
-        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/", "value"));
-
-        if (localValue != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localValue));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("value 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 AttributeValueType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttributeValueType object = new AttributeValueType();
-
-            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 (!"AttributeValueType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AttributeValueType)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/", "value").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setValue(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 235eefc..0000000
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgress.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 869aaf5..0000000
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index fcb7435..0000000
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 2a2cdfd..0000000
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupEgressType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[36/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index fba5500..0000000
--- a/awsapi/src/com/amazon/ec2/AttachVolumeResponseType.java
+++ /dev/null
@@ -1,835 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachVolumeResponseType bean class
-*/
-
-public class AttachVolumeResponseType 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/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 VolumeId
-    */
-
-    protected java.lang.String localVolumeId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getVolumeId() {
-        return localVolumeId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param VolumeId
-       */
-    public void setVolumeId(java.lang.String param) {
-
-        this.localVolumeId = 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 Device
-    */
-
-    protected java.lang.String localDevice;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getDevice() {
-        return localDevice;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Device
-       */
-    public void setDevice(java.lang.String param) {
-
-        this.localDevice = param;
-
-    }
-
-    /**
-    * field for Status
-    */
-
-    protected java.lang.String localStatus;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getStatus() {
-        return localStatus;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Status
-       */
-    public void setStatus(java.lang.String param) {
-
-        this.localStatus = param;
-
-    }
-
-    /**
-    * field for AttachTime
-    */
-
-    protected java.util.Calendar localAttachTime;
-
-    /**
-    * Auto generated getter method
-    * @return java.util.Calendar
-    */
-    public java.util.Calendar getAttachTime() {
-        return localAttachTime;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AttachTime
-       */
-    public void setAttachTime(java.util.Calendar param) {
-
-        this.localAttachTime = 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 {
-                AttachVolumeResponseType.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 + ":AttachVolumeResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AttachVolumeResponseType", 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, "volumeId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "volumeId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("volumeId");
-        }
-
-        if (localVolumeId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localVolumeId);
-
-        }
-
-        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, "device", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "device");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("device");
-        }
-
-        if (localDevice == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("device cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localDevice);
-
-        }
-
-        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, "status", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "status");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("status");
-        }
-
-        if (localStatus == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localStatus);
-
-        }
-
-        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, "attachTime", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "attachTime");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("attachTime");
-        }
-
-        if (localAttachTime == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("attachTime cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAttachTime));
-
-        }
-
-        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/", "volumeId"));
-
-        if (localVolumeId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVolumeId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("volumeId 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/", "device"));
-
-        if (localDevice != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDevice));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("device cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "status"));
-
-        if (localStatus != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStatus));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "attachTime"));
-
-        if (localAttachTime != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAttachTime));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("attachTime 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 AttachVolumeResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachVolumeResponseType object = new AttachVolumeResponseType();
-
-            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 (!"AttachVolumeResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AttachVolumeResponseType)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/", "volumeId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setVolumeId(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/", "device").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setDevice(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/", "status").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setStatus(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/", "attachTime").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setAttachTime(org.apache.axis2.databinding.utils.ConverterUtil.convertToDateTime(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index cb94df1..0000000
--- a/awsapi/src/com/amazon/ec2/AttachVolumeType.java
+++ /dev/null
@@ -1,589 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachVolumeType bean class
-*/
-
-public class AttachVolumeType 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/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 VolumeId
-    */
-
-    protected java.lang.String localVolumeId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getVolumeId() {
-        return localVolumeId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param VolumeId
-       */
-    public void setVolumeId(java.lang.String param) {
-
-        this.localVolumeId = 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 Device
-    */
-
-    protected java.lang.String localDevice;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getDevice() {
-        return localDevice;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Device
-       */
-    public void setDevice(java.lang.String param) {
-
-        this.localDevice = 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 {
-                AttachVolumeType.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 + ":AttachVolumeType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AttachVolumeType", 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, "volumeId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "volumeId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("volumeId");
-        }
-
-        if (localVolumeId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localVolumeId);
-
-        }
-
-        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, "device", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "device");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("device");
-        }
-
-        if (localDevice == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("device cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localDevice);
-
-        }
-
-        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/", "volumeId"));
-
-        if (localVolumeId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVolumeId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("volumeId 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/", "device"));
-
-        if (localDevice != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDevice));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("device 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 AttachVolumeType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachVolumeType object = new AttachVolumeType();
-
-            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 (!"AttachVolumeType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AttachVolumeType)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/", "volumeId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setVolumeId(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/", "device").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setDevice(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 01c1d05..0000000
--- a/awsapi/src/com/amazon/ec2/AttachVpnGateway.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachVpnGateway bean class
-*/
-
-public class AttachVpnGateway 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/", "AttachVpnGateway", "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 AttachVpnGateway
-    */
-
-    protected com.amazon.ec2.AttachVpnGatewayType localAttachVpnGateway;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AttachVpnGatewayType
-    */
-    public com.amazon.ec2.AttachVpnGatewayType getAttachVpnGateway() {
-        return localAttachVpnGateway;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AttachVpnGateway
-       */
-    public void setAttachVpnGateway(com.amazon.ec2.AttachVpnGatewayType param) {
-
-        this.localAttachVpnGateway = 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 {
-                AttachVpnGateway.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 (localAttachVpnGateway == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAttachVpnGateway.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 localAttachVpnGateway.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 AttachVpnGateway parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachVpnGateway object = new AttachVpnGateway();
-
-            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/", "AttachVpnGateway").equals(reader.getName())) {
-
-                            object.setAttachVpnGateway(com.amazon.ec2.AttachVpnGatewayType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 8e098cb..0000000
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachVpnGatewayResponse bean class
-*/
-
-public class AttachVpnGatewayResponse 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/", "AttachVpnGatewayResponse", "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 AttachVpnGatewayResponse
-    */
-
-    protected com.amazon.ec2.AttachVpnGatewayResponseType localAttachVpnGatewayResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AttachVpnGatewayResponseType
-    */
-    public com.amazon.ec2.AttachVpnGatewayResponseType getAttachVpnGatewayResponse() {
-        return localAttachVpnGatewayResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AttachVpnGatewayResponse
-       */
-    public void setAttachVpnGatewayResponse(com.amazon.ec2.AttachVpnGatewayResponseType param) {
-
-        this.localAttachVpnGatewayResponse = 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 {
-                AttachVpnGatewayResponse.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 (localAttachVpnGatewayResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAttachVpnGatewayResponse.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 localAttachVpnGatewayResponse.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 AttachVpnGatewayResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachVpnGatewayResponse object = new AttachVpnGatewayResponse();
-
-            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/", "AttachVpnGatewayResponse").equals(reader.getName())) {
-
-                            object.setAttachVpnGatewayResponse(com.amazon.ec2.AttachVpnGatewayResponseType.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
-
-}


[25/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 777253c..0000000
--- a/awsapi/src/com/amazon/ec2/CancelExportTask.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 3d19c7e..0000000
--- a/awsapi/src/com/amazon/ec2/CancelExportTaskResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f32c4a5..0000000
--- a/awsapi/src/com/amazon/ec2/CancelExportTaskResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 71d70c0..0000000
--- a/awsapi/src/com/amazon/ec2/CancelExportTaskType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 3fc491b..0000000
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListing.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[10/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 2a69f8b..0000000
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 862e6df..0000000
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingResponseType.java
+++ /dev/null
@@ -1,479 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index d7304c5..0000000
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListingType.java
+++ /dev/null
@@ -1,650 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 72810cb..0000000
--- a/awsapi/src/com/amazon/ec2/CreateRoute.java
+++ /dev/null
@@ -1,322 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 8564fa6..0000000
--- a/awsapi/src/com/amazon/ec2/CreateRouteResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[27/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index c5bb82b..0000000
--- a/awsapi/src/com/amazon/ec2/BundleInstanceTasksSetType.java
+++ /dev/null
@@ -1,491 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BundleInstanceTasksSetType bean class
-*/
-
-public class BundleInstanceTasksSetType 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/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.BundleInstanceTaskType[] 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.BundleInstanceTaskType[]
-    */
-    public com.amazon.ec2.BundleInstanceTaskType[] getItem() {
-        return localItem;
-    }
-
-    /**
-     * validate the array for Item
-     */
-    protected void validateItem(com.amazon.ec2.BundleInstanceTaskType[] param) {
-
-    }
-
-    /**
-     * Auto generated setter method
-     * @param param Item
-     */
-    public void setItem(com.amazon.ec2.BundleInstanceTaskType[] 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.BundleInstanceTaskType
-    */
-    public void addItem(com.amazon.ec2.BundleInstanceTaskType param) {
-        if (localItem == null) {
-            localItem = new com.amazon.ec2.BundleInstanceTaskType[] {};
-        }
-
-        //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.BundleInstanceTaskType[])list.toArray(new com.amazon.ec2.BundleInstanceTaskType[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 {
-                BundleInstanceTasksSetType.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 + ":BundleInstanceTasksSetType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "BundleInstanceTasksSetType", 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 BundleInstanceTasksSetType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BundleInstanceTasksSetType object = new BundleInstanceTasksSetType();
-
-            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 (!"BundleInstanceTasksSetType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (BundleInstanceTasksSetType)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.BundleInstanceTaskType.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.BundleInstanceTaskType.Factory.parse(reader));
-
-                            } else {
-                                loopDone1 = true;
-                            }
-                        }
-                    }
-                    // call the converter utility  to convert and set the array
-
-                    object.setItem((com.amazon.ec2.BundleInstanceTaskType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
-                        com.amazon.ec2.BundleInstanceTaskType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 315c425..0000000
--- a/awsapi/src/com/amazon/ec2/BundleInstanceType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  BundleInstanceType bean class
-*/
-
-public class BundleInstanceType 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/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 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 Storage
-    */
-
-    protected com.amazon.ec2.BundleInstanceTaskStorageType localStorage;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.BundleInstanceTaskStorageType
-    */
-    public com.amazon.ec2.BundleInstanceTaskStorageType getStorage() {
-        return localStorage;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Storage
-       */
-    public void setStorage(com.amazon.ec2.BundleInstanceTaskStorageType param) {
-
-        this.localStorage = 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 {
-                BundleInstanceType.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 + ":BundleInstanceType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "BundleInstanceType", 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, "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 (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/2012-08-15/", "storage"), 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/", "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/", "storage"));
-
-        if (localStorage == null) {
-            throw new org.apache.axis2.databinding.ADBException("storage cannot be null!!");
-        }
-        elementList.add(localStorage);
-
-        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 BundleInstanceType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            BundleInstanceType object = new BundleInstanceType();
-
-            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 (!"BundleInstanceType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (BundleInstanceType)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/", "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/", "storage").equals(reader.getName())) {
-
-                    object.setStorage(com.amazon.ec2.BundleInstanceTaskStorageType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 81ce775..0000000
--- a/awsapi/src/com/amazon/ec2/CancelBundleTask.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelBundleTask bean class
-*/
-
-public class CancelBundleTask 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/", "CancelBundleTask", "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 CancelBundleTask
-    */
-
-    protected com.amazon.ec2.CancelBundleTaskType localCancelBundleTask;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CancelBundleTaskType
-    */
-    public com.amazon.ec2.CancelBundleTaskType getCancelBundleTask() {
-        return localCancelBundleTask;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CancelBundleTask
-       */
-    public void setCancelBundleTask(com.amazon.ec2.CancelBundleTaskType param) {
-
-        this.localCancelBundleTask = 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 {
-                CancelBundleTask.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 (localCancelBundleTask == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCancelBundleTask.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 localCancelBundleTask.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 CancelBundleTask parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelBundleTask object = new CancelBundleTask();
-
-            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/", "CancelBundleTask").equals(reader.getName())) {
-
-                            object.setCancelBundleTask(com.amazon.ec2.CancelBundleTaskType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 3b5e4e5..0000000
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelBundleTaskResponse bean class
-*/
-
-public class CancelBundleTaskResponse 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/", "CancelBundleTaskResponse", "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 CancelBundleTaskResponse
-    */
-
-    protected com.amazon.ec2.CancelBundleTaskResponseType localCancelBundleTaskResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CancelBundleTaskResponseType
-    */
-    public com.amazon.ec2.CancelBundleTaskResponseType getCancelBundleTaskResponse() {
-        return localCancelBundleTaskResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CancelBundleTaskResponse
-       */
-    public void setCancelBundleTaskResponse(com.amazon.ec2.CancelBundleTaskResponseType param) {
-
-        this.localCancelBundleTaskResponse = 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 {
-                CancelBundleTaskResponse.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 (localCancelBundleTaskResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCancelBundleTaskResponse.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 localCancelBundleTaskResponse.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 CancelBundleTaskResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelBundleTaskResponse object = new CancelBundleTaskResponse();
-
-            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/", "CancelBundleTaskResponse").equals(reader.getName())) {
-
-                            object.setCancelBundleTaskResponse(com.amazon.ec2.CancelBundleTaskResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 9da1589..0000000
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelBundleTaskResponseType bean class
-*/
-
-public class CancelBundleTaskResponseType 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/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 BundleInstanceTask
-    */
-
-    protected com.amazon.ec2.BundleInstanceTaskType localBundleInstanceTask;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.BundleInstanceTaskType
-    */
-    public com.amazon.ec2.BundleInstanceTaskType getBundleInstanceTask() {
-        return localBundleInstanceTask;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param BundleInstanceTask
-       */
-    public void setBundleInstanceTask(com.amazon.ec2.BundleInstanceTaskType param) {
-
-        this.localBundleInstanceTask = 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 {
-                CancelBundleTaskResponseType.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 + ":CancelBundleTaskResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CancelBundleTaskResponseType", 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 (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/2012-08-15/", "bundleInstanceTask"), 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/", "bundleInstanceTask"));
-
-        if (localBundleInstanceTask == null) {
-            throw new org.apache.axis2.databinding.ADBException("bundleInstanceTask cannot be null!!");
-        }
-        elementList.add(localBundleInstanceTask);
-
-        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 CancelBundleTaskResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelBundleTaskResponseType object = new CancelBundleTaskResponseType();
-
-            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 (!"CancelBundleTaskResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CancelBundleTaskResponseType)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/", "bundleInstanceTask").equals(reader.getName())) {
-
-                    object.setBundleInstanceTask(com.amazon.ec2.BundleInstanceTaskType.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
-
-}


[21/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index cf263b4..0000000
--- a/awsapi/src/com/amazon/ec2/ConversionTaskIdItemType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ConversionTaskIdItemType bean class
-*/
-
-public class ConversionTaskIdItemType 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/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 ConversionTaskId
-    */
-
-    protected java.lang.String localConversionTaskId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getConversionTaskId() {
-        return localConversionTaskId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ConversionTaskId
-       */
-    public void setConversionTaskId(java.lang.String param) {
-
-        this.localConversionTaskId = 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 {
-                ConversionTaskIdItemType.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 + ":ConversionTaskIdItemType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ConversionTaskIdItemType", 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, "conversionTaskId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "conversionTaskId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("conversionTaskId");
-        }
-
-        if (localConversionTaskId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("conversionTaskId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localConversionTaskId);
-
-        }
-
-        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/", "conversionTaskId"));
-
-        if (localConversionTaskId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localConversionTaskId));
-        } 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());
-
-    }
-
-    /**
-     *  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 ConversionTaskIdItemType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ConversionTaskIdItemType object = new ConversionTaskIdItemType();
-
-            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 (!"ConversionTaskIdItemType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (ConversionTaskIdItemType)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/", "conversionTaskId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setConversionTaskId(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b9e816b..0000000
--- a/awsapi/src/com/amazon/ec2/ConversionTaskIdSetType.java
+++ /dev/null
@@ -1,491 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ConversionTaskIdSetType bean class
-*/
-
-public class ConversionTaskIdSetType 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/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.ConversionTaskIdItemType[] 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.ConversionTaskIdItemType[]
-    */
-    public com.amazon.ec2.ConversionTaskIdItemType[] getItem() {
-        return localItem;
-    }
-
-    /**
-     * validate the array for Item
-     */
-    protected void validateItem(com.amazon.ec2.ConversionTaskIdItemType[] param) {
-
-    }
-
-    /**
-     * Auto generated setter method
-     * @param param Item
-     */
-    public void setItem(com.amazon.ec2.ConversionTaskIdItemType[] 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.ConversionTaskIdItemType
-    */
-    public void addItem(com.amazon.ec2.ConversionTaskIdItemType param) {
-        if (localItem == null) {
-            localItem = new com.amazon.ec2.ConversionTaskIdItemType[] {};
-        }
-
-        //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.ConversionTaskIdItemType[])list.toArray(new com.amazon.ec2.ConversionTaskIdItemType[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 {
-                ConversionTaskIdSetType.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 + ":ConversionTaskIdSetType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ConversionTaskIdSetType", 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 ConversionTaskIdSetType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ConversionTaskIdSetType object = new ConversionTaskIdSetType();
-
-            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 (!"ConversionTaskIdSetType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (ConversionTaskIdSetType)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.ConversionTaskIdItemType.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.ConversionTaskIdItemType.Factory.parse(reader));
-
-                            } else {
-                                loopDone1 = true;
-                            }
-                        }
-                    }
-                    // call the converter utility  to convert and set the array
-
-                    object.setItem((com.amazon.ec2.ConversionTaskIdItemType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
-                        com.amazon.ec2.ConversionTaskIdItemType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 21ad4e7..0000000
--- a/awsapi/src/com/amazon/ec2/ConversionTaskSetType.java
+++ /dev/null
@@ -1,491 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ConversionTaskSetType bean class
-*/
-
-public class ConversionTaskSetType 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/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.ConversionTaskType[] 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.ConversionTaskType[]
-    */
-    public com.amazon.ec2.ConversionTaskType[] getItem() {
-        return localItem;
-    }
-
-    /**
-     * validate the array for Item
-     */
-    protected void validateItem(com.amazon.ec2.ConversionTaskType[] param) {
-
-    }
-
-    /**
-     * Auto generated setter method
-     * @param param Item
-     */
-    public void setItem(com.amazon.ec2.ConversionTaskType[] 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.ConversionTaskType
-    */
-    public void addItem(com.amazon.ec2.ConversionTaskType param) {
-        if (localItem == null) {
-            localItem = new com.amazon.ec2.ConversionTaskType[] {};
-        }
-
-        //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.ConversionTaskType[])list.toArray(new com.amazon.ec2.ConversionTaskType[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 {
-                ConversionTaskSetType.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 + ":ConversionTaskSetType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ConversionTaskSetType", 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 ConversionTaskSetType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ConversionTaskSetType object = new ConversionTaskSetType();
-
-            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 (!"ConversionTaskSetType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (ConversionTaskSetType)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.ConversionTaskType.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.ConversionTaskType.Factory.parse(reader));
-
-                            } else {
-                                loopDone1 = true;
-                            }
-                        }
-                    }
-                    // call the converter utility  to convert and set the array
-
-                    object.setItem((com.amazon.ec2.ConversionTaskType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
-                        com.amazon.ec2.ConversionTaskType.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
-
-}


[24/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 72c0c55..0000000
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index bee242f..0000000
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingResponseType.java
+++ /dev/null
@@ -1,479 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f1cd0f3..0000000
--- a/awsapi/src/com/amazon/ec2/CancelReservedInstancesListingType.java
+++ /dev/null
@@ -1,426 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b2a0b7b..0000000
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequests.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelSpotInstanceRequests bean class
-*/
-
-public class CancelSpotInstanceRequests 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/", "CancelSpotInstanceRequests",
-        "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 CancelSpotInstanceRequests
-    */
-
-    protected com.amazon.ec2.CancelSpotInstanceRequestsType localCancelSpotInstanceRequests;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CancelSpotInstanceRequestsType
-    */
-    public com.amazon.ec2.CancelSpotInstanceRequestsType getCancelSpotInstanceRequests() {
-        return localCancelSpotInstanceRequests;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CancelSpotInstanceRequests
-       */
-    public void setCancelSpotInstanceRequests(com.amazon.ec2.CancelSpotInstanceRequestsType param) {
-
-        this.localCancelSpotInstanceRequests = 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 {
-                CancelSpotInstanceRequests.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 (localCancelSpotInstanceRequests == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCancelSpotInstanceRequests.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 localCancelSpotInstanceRequests.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 CancelSpotInstanceRequests parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelSpotInstanceRequests object = new CancelSpotInstanceRequests();
-
-            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/", "CancelSpotInstanceRequests").equals(reader.getName())) {
-
-                            object.setCancelSpotInstanceRequests(com.amazon.ec2.CancelSpotInstanceRequestsType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 8dd023a..0000000
--- a/awsapi/src/com/amazon/ec2/CancelSpotInstanceRequestsResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelSpotInstanceRequestsResponse bean class
-*/
-
-public class CancelSpotInstanceRequestsResponse 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/",
-        "CancelSpotInstanceRequestsResponse", "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 CancelSpotInstanceRequestsResponse
-    */
-
-    protected com.amazon.ec2.CancelSpotInstanceRequestsResponseType localCancelSpotInstanceRequestsResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CancelSpotInstanceRequestsResponseType
-    */
-    public com.amazon.ec2.CancelSpotInstanceRequestsResponseType getCancelSpotInstanceRequestsResponse() {
-        return localCancelSpotInstanceRequestsResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CancelSpotInstanceRequestsResponse
-       */
-    public void setCancelSpotInstanceRequestsResponse(com.amazon.ec2.CancelSpotInstanceRequestsResponseType param) {
-
-        this.localCancelSpotInstanceRequestsResponse = 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 {
-                CancelSpotInstanceRequestsResponse.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 (localCancelSpotInstanceRequestsResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCancelSpotInstanceRequestsResponse.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 localCancelSpotInstanceRequestsResponse.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 CancelSpotInstanceRequestsResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelSpotInstanceRequestsResponse object = new CancelSpotInstanceRequestsResponse();
-
-            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/", "CancelSpotInstanceRequestsResponse").equals(reader.getName())) {
-
-                            object.setCancelSpotInstanceRequestsResponse(com.amazon.ec2.CancelSpotInstanceRequestsResponseType.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
-
-}


[18/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 27d6dc6..0000000
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateDhcpOptionsResponseType bean class
-*/
-
-public class CreateDhcpOptionsResponseType 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/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 DhcpOptions
-    */
-
-    protected com.amazon.ec2.DhcpOptionsType localDhcpOptions;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.DhcpOptionsType
-    */
-    public com.amazon.ec2.DhcpOptionsType getDhcpOptions() {
-        return localDhcpOptions;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param DhcpOptions
-       */
-    public void setDhcpOptions(com.amazon.ec2.DhcpOptionsType param) {
-
-        this.localDhcpOptions = 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 {
-                CreateDhcpOptionsResponseType.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 + ":CreateDhcpOptionsResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateDhcpOptionsResponseType", 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 (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/2012-08-15/", "dhcpOptions"), 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/", "dhcpOptions"));
-
-        if (localDhcpOptions == null) {
-            throw new org.apache.axis2.databinding.ADBException("dhcpOptions cannot be null!!");
-        }
-        elementList.add(localDhcpOptions);
-
-        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 CreateDhcpOptionsResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateDhcpOptionsResponseType object = new CreateDhcpOptionsResponseType();
-
-            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 (!"CreateDhcpOptionsResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateDhcpOptionsResponseType)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/", "dhcpOptions").equals(reader.getName())) {
-
-                    object.setDhcpOptions(com.amazon.ec2.DhcpOptionsType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 8c0340e..0000000
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java
+++ /dev/null
@@ -1,395 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateDhcpOptionsType bean class
-*/
-
-public class CreateDhcpOptionsType 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/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 DhcpConfigurationSet
-    */
-
-    protected com.amazon.ec2.DhcpConfigurationItemSetType localDhcpConfigurationSet;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.DhcpConfigurationItemSetType
-    */
-    public com.amazon.ec2.DhcpConfigurationItemSetType getDhcpConfigurationSet() {
-        return localDhcpConfigurationSet;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param DhcpConfigurationSet
-       */
-    public void setDhcpConfigurationSet(com.amazon.ec2.DhcpConfigurationItemSetType param) {
-
-        this.localDhcpConfigurationSet = 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 {
-                CreateDhcpOptionsType.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 + ":CreateDhcpOptionsType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateDhcpOptionsType", xmlWriter);
-            }
-
-        }
-
-        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/2012-08-15/", "dhcpConfigurationSet"), 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/", "dhcpConfigurationSet"));
-
-        if (localDhcpConfigurationSet == null) {
-            throw new org.apache.axis2.databinding.ADBException("dhcpConfigurationSet cannot be null!!");
-        }
-        elementList.add(localDhcpConfigurationSet);
-
-        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 CreateDhcpOptionsType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateDhcpOptionsType object = new CreateDhcpOptionsType();
-
-            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 (!"CreateDhcpOptionsType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateDhcpOptionsType)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/", "dhcpConfigurationSet").equals(reader.getName())) {
-
-                    object.setDhcpConfigurationSet(com.amazon.ec2.DhcpConfigurationItemSetType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 4e96e68..0000000
--- a/awsapi/src/com/amazon/ec2/CreateImage.java
+++ /dev/null
@@ -1,322 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateImage bean class
-*/
-
-public class CreateImage 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/", "CreateImage", "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 CreateImage
-    */
-
-    protected com.amazon.ec2.CreateImageType localCreateImage;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateImageType
-    */
-    public com.amazon.ec2.CreateImageType getCreateImage() {
-        return localCreateImage;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateImage
-       */
-    public void setCreateImage(com.amazon.ec2.CreateImageType param) {
-
-        this.localCreateImage = 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 {
-                CreateImage.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 (localCreateImage == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateImage.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 localCreateImage.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 CreateImage parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateImage object = new CreateImage();
-
-            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/", "CreateImage").equals(reader.getName())) {
-
-                            object.setCreateImage(com.amazon.ec2.CreateImageType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 1029d4b..0000000
--- a/awsapi/src/com/amazon/ec2/CreateImageResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateImageResponse bean class
-*/
-
-public class CreateImageResponse 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/", "CreateImageResponse", "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 CreateImageResponse
-    */
-
-    protected com.amazon.ec2.CreateImageResponseType localCreateImageResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateImageResponseType
-    */
-    public com.amazon.ec2.CreateImageResponseType getCreateImageResponse() {
-        return localCreateImageResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateImageResponse
-       */
-    public void setCreateImageResponse(com.amazon.ec2.CreateImageResponseType param) {
-
-        this.localCreateImageResponse = 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 {
-                CreateImageResponse.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 (localCreateImageResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateImageResponse.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 localCreateImageResponse.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 CreateImageResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateImageResponse object = new CreateImageResponse();
-
-            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/", "CreateImageResponse").equals(reader.getName())) {
-
-                            object.setCreateImageResponse(com.amazon.ec2.CreateImageResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index c24d47d..0000000
--- a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateImageResponseType bean class
-*/
-
-public class CreateImageResponseType 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/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 ImageId
-    */
-
-    protected java.lang.String localImageId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getImageId() {
-        return localImageId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ImageId
-       */
-    public void setImageId(java.lang.String param) {
-
-        this.localImageId = 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 {
-                CreateImageResponseType.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 + ":CreateImageResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateImageResponseType", 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, "imageId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "imageId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("imageId");
-        }
-
-        if (localImageId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("imageId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localImageId);
-
-        }
-
-        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/", "imageId"));
-
-        if (localImageId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localImageId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("imageId 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 CreateImageResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateImageResponseType object = new CreateImageResponseType();
-
-            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 (!"CreateImageResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateImageResponseType)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/", "imageId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setImageId(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
-
-}


[31/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index be1703e..0000000
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressTypeChoice_type0.java
+++ /dev/null
@@ -1,489 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 9275d1a..0000000
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneItemType.java
+++ /dev/null
@@ -1,641 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AvailabilityZoneItemType bean class
-*/
-
-public class AvailabilityZoneItemType 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/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 ZoneName
-    */
-
-    protected java.lang.String localZoneName;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getZoneName() {
-        return localZoneName;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ZoneName
-       */
-    public void setZoneName(java.lang.String param) {
-
-        this.localZoneName = param;
-
-    }
-
-    /**
-    * field for ZoneState
-    */
-
-    protected java.lang.String localZoneState;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getZoneState() {
-        return localZoneState;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ZoneState
-       */
-    public void setZoneState(java.lang.String param) {
-
-        this.localZoneState = param;
-
-    }
-
-    /**
-    * field for RegionName
-    */
-
-    protected java.lang.String localRegionName;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getRegionName() {
-        return localRegionName;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param RegionName
-       */
-    public void setRegionName(java.lang.String param) {
-
-        this.localRegionName = param;
-
-    }
-
-    /**
-    * field for MessageSet
-    */
-
-    protected com.amazon.ec2.AvailabilityZoneMessageSetType localMessageSet;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AvailabilityZoneMessageSetType
-    */
-    public com.amazon.ec2.AvailabilityZoneMessageSetType getMessageSet() {
-        return localMessageSet;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param MessageSet
-       */
-    public void setMessageSet(com.amazon.ec2.AvailabilityZoneMessageSetType param) {
-
-        this.localMessageSet = 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 {
-                AvailabilityZoneItemType.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 + ":AvailabilityZoneItemType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AvailabilityZoneItemType", 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, "zoneName", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "zoneName");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("zoneName");
-        }
-
-        if (localZoneName == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("zoneName cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localZoneName);
-
-        }
-
-        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, "zoneState", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "zoneState");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("zoneState");
-        }
-
-        if (localZoneState == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("zoneState cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localZoneState);
-
-        }
-
-        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, "regionName", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "regionName");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("regionName");
-        }
-
-        if (localRegionName == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("regionName cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localRegionName);
-
-        }
-
-        xmlWriter.writeEndElement();
-
-        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/2012-08-15/", "messageSet"), 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/", "zoneName"));
-
-        if (localZoneName != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localZoneName));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("zoneName cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "zoneState"));
-
-        if (localZoneState != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localZoneState));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("zoneState cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "regionName"));
-
-        if (localRegionName != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localRegionName));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("regionName cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "messageSet"));
-
-        if (localMessageSet == null) {
-            throw new org.apache.axis2.databinding.ADBException("messageSet cannot be null!!");
-        }
-        elementList.add(localMessageSet);
-
-        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 AvailabilityZoneItemType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AvailabilityZoneItemType object = new AvailabilityZoneItemType();
-
-            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 (!"AvailabilityZoneItemType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AvailabilityZoneItemType)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/", "zoneName").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setZoneName(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/", "zoneState").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setZoneState(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/", "regionName").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setRegionName(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/", "messageSet").equals(reader.getName())) {
-
-                    object.setMessageSet(com.amazon.ec2.AvailabilityZoneMessageSetType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 78c72ca..0000000
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageSetType.java
+++ /dev/null
@@ -1,491 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AvailabilityZoneMessageSetType bean class
-*/
-
-public class AvailabilityZoneMessageSetType 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/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.AvailabilityZoneMessageType[] 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.AvailabilityZoneMessageType[]
-    */
-    public com.amazon.ec2.AvailabilityZoneMessageType[] getItem() {
-        return localItem;
-    }
-
-    /**
-     * validate the array for Item
-     */
-    protected void validateItem(com.amazon.ec2.AvailabilityZoneMessageType[] param) {
-
-    }
-
-    /**
-     * Auto generated setter method
-     * @param param Item
-     */
-    public void setItem(com.amazon.ec2.AvailabilityZoneMessageType[] 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.AvailabilityZoneMessageType
-    */
-    public void addItem(com.amazon.ec2.AvailabilityZoneMessageType param) {
-        if (localItem == null) {
-            localItem = new com.amazon.ec2.AvailabilityZoneMessageType[] {};
-        }
-
-        //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.AvailabilityZoneMessageType[])list.toArray(new com.amazon.ec2.AvailabilityZoneMessageType[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 {
-                AvailabilityZoneMessageSetType.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 + ":AvailabilityZoneMessageSetType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AvailabilityZoneMessageSetType", 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 AvailabilityZoneMessageSetType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AvailabilityZoneMessageSetType object = new AvailabilityZoneMessageSetType();
-
-            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 (!"AvailabilityZoneMessageSetType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AvailabilityZoneMessageSetType)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.AvailabilityZoneMessageType.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.AvailabilityZoneMessageType.Factory.parse(reader));
-
-                            } else {
-                                loopDone1 = true;
-                            }
-                        }
-                    }
-                    // call the converter utility  to convert and set the array
-
-                    object.setItem((com.amazon.ec2.AvailabilityZoneMessageType[])org.apache.axis2.databinding.utils.ConverterUtil.convertToArray(
-                        com.amazon.ec2.AvailabilityZoneMessageType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index a228275..0000000
--- a/awsapi/src/com/amazon/ec2/AvailabilityZoneMessageType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AvailabilityZoneMessageType bean class
-*/
-
-public class AvailabilityZoneMessageType 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/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 Message
-    */
-
-    protected java.lang.String localMessage;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getMessage() {
-        return localMessage;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Message
-       */
-    public void setMessage(java.lang.String param) {
-
-        this.localMessage = 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 {
-                AvailabilityZoneMessageType.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 + ":AvailabilityZoneMessageType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AvailabilityZoneMessageType", 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, "message", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "message");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("message");
-        }
-
-        if (localMessage == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("message cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localMessage);
-
-        }
-
-        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/", "message"));
-
-        if (localMessage != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localMessage));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("message 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 AvailabilityZoneMessageType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AvailabilityZoneMessageType object = new AvailabilityZoneMessageType();
-
-            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 (!"AvailabilityZoneMessageType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AvailabilityZoneMessageType)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/", "message").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setMessage(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
-
-}


[41/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index d372631..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateAddressResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AssociateAddressResponse bean class
-*/
-
-public class AssociateAddressResponse 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/", "AssociateAddressResponse", "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 AssociateAddressResponse
-    */
-
-    protected com.amazon.ec2.AssociateAddressResponseType localAssociateAddressResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AssociateAddressResponseType
-    */
-    public com.amazon.ec2.AssociateAddressResponseType getAssociateAddressResponse() {
-        return localAssociateAddressResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AssociateAddressResponse
-       */
-    public void setAssociateAddressResponse(com.amazon.ec2.AssociateAddressResponseType param) {
-
-        this.localAssociateAddressResponse = 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 {
-                AssociateAddressResponse.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 (localAssociateAddressResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAssociateAddressResponse.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 localAssociateAddressResponse.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 AssociateAddressResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AssociateAddressResponse object = new AssociateAddressResponse();
-
-            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/", "AssociateAddressResponse").equals(reader.getName())) {
-
-                            object.setAssociateAddressResponse(com.amazon.ec2.AssociateAddressResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 274bdb9..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateAddressResponseType.java
+++ /dev/null
@@ -1,596 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AssociateAddressResponseType bean class
-*/
-
-public class AssociateAddressResponseType 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/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;
-
-    }
-
-    /**
-    * 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
-    */
-    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 {
-                AssociateAddressResponseType.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 + ":AssociateAddressResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AssociateAddressResponseType", 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();
-        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();
-
-    }
-
-    /**
-     * 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));
-        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());
-
-    }
-
-    /**
-     *  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 AssociateAddressResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AssociateAddressResponseType object = new AssociateAddressResponseType();
-
-            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 (!"AssociateAddressResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AssociateAddressResponseType)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() && 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())
-                    // 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 6df9c9b..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateAddressType.java
+++ /dev/null
@@ -1,620 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AssociateAddressType bean class
-*/
-
-public class AssociateAddressType 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/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 AssociateAddressTypeChoice_type0
-    */
-
-    protected com.amazon.ec2.AssociateAddressTypeChoice_type0 localAssociateAddressTypeChoice_type0;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AssociateAddressTypeChoice_type0
-    */
-    public com.amazon.ec2.AssociateAddressTypeChoice_type0 getAssociateAddressTypeChoice_type0() {
-        return localAssociateAddressTypeChoice_type0;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AssociateAddressTypeChoice_type0
-       */
-    public void setAssociateAddressTypeChoice_type0(com.amazon.ec2.AssociateAddressTypeChoice_type0 param) {
-
-        this.localAssociateAddressTypeChoice_type0 = param;
-
-    }
-
-    /**
-    * field for AssociateAddressTypeChoice_type1
-    */
-
-    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 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 AllowReassociation
-       */
-    public void setAllowReassociation(boolean param) {
-
-        // setting primitive attribute tracker to true
-
-        if (false) {
-            localAllowReassociationTracker = false;
-
-        } else {
-            localAllowReassociationTracker = true;
-        }
-
-        this.localAllowReassociation = 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 {
-                AssociateAddressType.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 + ":AssociateAddressType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AssociateAddressType", xmlWriter);
-            }
-
-        }
-
-        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, "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 (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, "allowReassociation", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "allowReassociation");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("allowReassociation");
-            }
-
-            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();
-
-    }
-
-    /**
-     * 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/", "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 (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 (localAllowReassociationTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "allowReassociation"));
-
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAllowReassociation));
-        }
-
-        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 AssociateAddressType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AssociateAddressType object = new AssociateAddressType();
-
-            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 (!"AssociateAddressType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AssociateAddressType)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()) {
-
-                    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.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/", "allowReassociation").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setAllowReassociation(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 9a1cfba..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateAddressTypeChoice_type0.java
+++ /dev/null
@@ -1,489 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[04/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index a4a6846..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSubnetType.java
+++ /dev/null
@@ -1,603 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSubnetType bean class
-*/
-
-public class CreateSubnetType 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/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;
-
-    }
-
-    /**
-    * 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 AvailabilityZone
-    */
-
-    protected java.lang.String localAvailabilityZone;
-
-    /*  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 localAvailabilityZoneTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getAvailabilityZone() {
-        return localAvailabilityZone;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AvailabilityZone
-       */
-    public void setAvailabilityZone(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localAvailabilityZoneTracker = true;
-        } else {
-            localAvailabilityZoneTracker = false;
-
-        }
-
-        this.localAvailabilityZone = 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 {
-                CreateSubnetType.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 + ":CreateSubnetType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateSubnetType", 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();
-
-        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 (localAvailabilityZoneTracker) {
-            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, "availabilityZone", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "availabilityZone");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("availabilityZone");
-            }
-
-            if (localAvailabilityZone == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("availabilityZone cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localAvailabilityZone);
-
-            }
-
-            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!!");
-        }
-
-        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 (localAvailabilityZoneTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZone"));
-
-            if (localAvailabilityZone != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAvailabilityZone));
-            } else {
-                throw new org.apache.axis2.databinding.ADBException("availabilityZone 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 CreateSubnetType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSubnetType object = new CreateSubnetType();
-
-            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 (!"CreateSubnetType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateSubnetType)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() && 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/", "availabilityZone").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setAvailabilityZone(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());
-
-            } catch (javax.xml.stream.XMLStreamException e) {
-                throw new java.lang.Exception(e);
-            }
-
-            return object;
-        }
-
-    }//end of factory class
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b8a407d..0000000
--- a/awsapi/src/com/amazon/ec2/CreateTags.java
+++ /dev/null
@@ -1,322 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateTags bean class
-*/
-
-public class CreateTags 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/", "CreateTags", "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 CreateTags
-    */
-
-    protected com.amazon.ec2.CreateTagsType localCreateTags;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateTagsType
-    */
-    public com.amazon.ec2.CreateTagsType getCreateTags() {
-        return localCreateTags;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateTags
-       */
-    public void setCreateTags(com.amazon.ec2.CreateTagsType param) {
-
-        this.localCreateTags = 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 {
-                CreateTags.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 (localCreateTags == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateTags.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 localCreateTags.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 CreateTags parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateTags object = new CreateTags();
-
-            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/", "CreateTags").equals(reader.getName())) {
-
-                            object.setCreateTags(com.amazon.ec2.CreateTagsType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 401299f..0000000
--- a/awsapi/src/com/amazon/ec2/CreateTagsResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateTagsResponse bean class
-*/
-
-public class CreateTagsResponse 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/", "CreateTagsResponse", "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 CreateTagsResponse
-    */
-
-    protected com.amazon.ec2.CreateTagsResponseType localCreateTagsResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateTagsResponseType
-    */
-    public com.amazon.ec2.CreateTagsResponseType getCreateTagsResponse() {
-        return localCreateTagsResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateTagsResponse
-       */
-    public void setCreateTagsResponse(com.amazon.ec2.CreateTagsResponseType param) {
-
-        this.localCreateTagsResponse = 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 {
-                CreateTagsResponse.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 (localCreateTagsResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateTagsResponse.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 localCreateTagsResponse.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 CreateTagsResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateTagsResponse object = new CreateTagsResponse();
-
-            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/", "CreateTagsResponse").equals(reader.getName())) {
-
-                            object.setCreateTagsResponse(com.amazon.ec2.CreateTagsResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index d804840..0000000
--- a/awsapi/src/com/amazon/ec2/CreateTagsResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateTagsResponseType bean class
-*/
-
-public class CreateTagsResponseType 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/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 {
-                CreateTagsResponseType.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 + ":CreateTagsResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateTagsResponseType", 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 CreateTagsResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateTagsResponseType object = new CreateTagsResponseType();
-
-            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 (!"CreateTagsResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateTagsResponseType)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
-
-}


[20/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 8c5ccce..0000000
--- a/awsapi/src/com/amazon/ec2/ConversionTaskType.java
+++ /dev/null
@@ -1,810 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ConversionTaskType bean class
-*/
-
-public class ConversionTaskType 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/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 ConversionTaskId
-    */
-
-    protected java.lang.String localConversionTaskId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getConversionTaskId() {
-        return localConversionTaskId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ConversionTaskId
-       */
-    public void setConversionTaskId(java.lang.String param) {
-
-        this.localConversionTaskId = param;
-
-    }
-
-    /**
-    * field for ExpirationTime
-    */
-
-    protected java.lang.String localExpirationTime;
-
-    /*  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 localExpirationTimeTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getExpirationTime() {
-        return localExpirationTime;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ExpirationTime
-       */
-    public void setExpirationTime(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localExpirationTimeTracker = true;
-        } else {
-            localExpirationTimeTracker = false;
-
-        }
-
-        this.localExpirationTime = param;
-
-    }
-
-    /**
-    * field for ConversionTaskTypeChoice_type0
-    */
-
-    protected com.amazon.ec2.ConversionTaskTypeChoice_type0 localConversionTaskTypeChoice_type0;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.ConversionTaskTypeChoice_type0
-    */
-    public com.amazon.ec2.ConversionTaskTypeChoice_type0 getConversionTaskTypeChoice_type0() {
-        return localConversionTaskTypeChoice_type0;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ConversionTaskTypeChoice_type0
-       */
-    public void setConversionTaskTypeChoice_type0(com.amazon.ec2.ConversionTaskTypeChoice_type0 param) {
-
-        this.localConversionTaskTypeChoice_type0 = param;
-
-    }
-
-    /**
-    * field for State
-    */
-
-    protected java.lang.String localState;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getState() {
-        return localState;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param State
-       */
-    public void setState(java.lang.String param) {
-
-        this.localState = param;
-
-    }
-
-    /**
-    * field for StatusMessage
-    */
-
-    protected java.lang.String localStatusMessage;
-
-    /*  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 localStatusMessageTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getStatusMessage() {
-        return localStatusMessage;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param StatusMessage
-       */
-    public void setStatusMessage(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localStatusMessageTracker = true;
-        } else {
-            localStatusMessageTracker = false;
-
-        }
-
-        this.localStatusMessage = param;
-
-    }
-
-    /**
-    * 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
-    */
-    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 {
-                ConversionTaskType.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 + ":ConversionTaskType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ConversionTaskType", 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, "conversionTaskId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "conversionTaskId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("conversionTaskId");
-        }
-
-        if (localConversionTaskId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("conversionTaskId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localConversionTaskId);
-
-        }
-
-        xmlWriter.writeEndElement();
-        if (localExpirationTimeTracker) {
-            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, "expirationTime", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "expirationTime");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("expirationTime");
-            }
-
-            if (localExpirationTime == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("expirationTime cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localExpirationTime);
-
-            }
-
-            xmlWriter.writeEndElement();
-        }
-        if (localConversionTaskTypeChoice_type0 == null) {
-            throw new org.apache.axis2.databinding.ADBException("ConversionTaskTypeChoice_type0 cannot be null!!");
-        }
-        localConversionTaskTypeChoice_type0.serialize(null, 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, "state", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "state");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("state");
-        }
-
-        if (localState == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("state cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localState);
-
-        }
-
-        xmlWriter.writeEndElement();
-        if (localStatusMessageTracker) {
-            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, "statusMessage", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "statusMessage");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("statusMessage");
-            }
-
-            if (localStatusMessage == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("statusMessage cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localStatusMessage);
-
-            }
-
-            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();
-
-    }
-
-    /**
-     * 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/", "conversionTaskId"));
-
-        if (localConversionTaskId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localConversionTaskId));
-        } else {
-            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/2012-08-15/", "expirationTime"));
-
-            if (localExpirationTime != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localExpirationTime));
-            } else {
-                throw new org.apache.axis2.databinding.ADBException("expirationTime cannot be null!!");
-            }
-        }
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ConversionTaskTypeChoice_type0"));
-
-        if (localConversionTaskTypeChoice_type0 == null) {
-            throw new org.apache.axis2.databinding.ADBException("ConversionTaskTypeChoice_type0 cannot be null!!");
-        }
-        elementList.add(localConversionTaskTypeChoice_type0);
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "state"));
-
-        if (localState != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localState));
-        } else {
-            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/2012-08-15/", "statusMessage"));
-
-            if (localStatusMessage != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStatusMessage));
-            } 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());
-
-    }
-
-    /**
-     *  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 ConversionTaskType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ConversionTaskType object = new ConversionTaskType();
-
-            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 (!"ConversionTaskType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (ConversionTaskType)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/", "conversionTaskId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setConversionTaskId(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/", "expirationTime").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setExpirationTime(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()) {
-
-                    object.setConversionTaskTypeChoice_type0(com.amazon.ec2.ConversionTaskTypeChoice_type0.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/", "state").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setState(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/", "statusMessage").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setStatusMessage(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/", "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();
-
-                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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 6e84c37..0000000
--- a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java
+++ /dev/null
@@ -1,429 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ConversionTaskTypeChoice_type0 bean class
-*/
-
-public class ConversionTaskTypeChoice_type0 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/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() {
-
-        localImportVolumeTracker = false;
-
-        localImportInstanceTracker = false;
-
-    }
-
-    /**
-    * field for ImportVolume
-    */
-
-    protected com.amazon.ec2.ImportVolumeTaskDetailsType localImportVolume;
-
-    /*  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 localImportVolumeTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.ImportVolumeTaskDetailsType
-    */
-    public com.amazon.ec2.ImportVolumeTaskDetailsType getImportVolume() {
-        return localImportVolume;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ImportVolume
-       */
-    public void setImportVolume(com.amazon.ec2.ImportVolumeTaskDetailsType param) {
-
-        clearAllSettingTrackers();
-
-        if (param != null) {
-            //update the setting tracker
-            localImportVolumeTracker = true;
-        } else {
-            localImportVolumeTracker = false;
-
-        }
-
-        this.localImportVolume = param;
-
-    }
-
-    /**
-    * field for ImportInstance
-    */
-
-    protected com.amazon.ec2.ImportInstanceTaskDetailsType localImportInstance;
-
-    /*  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 localImportInstanceTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.ImportInstanceTaskDetailsType
-    */
-    public com.amazon.ec2.ImportInstanceTaskDetailsType getImportInstance() {
-        return localImportInstance;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ImportInstance
-       */
-    public void setImportInstance(com.amazon.ec2.ImportInstanceTaskDetailsType param) {
-
-        clearAllSettingTrackers();
-
-        if (param != null) {
-            //update the setting tracker
-            localImportInstanceTracker = true;
-        } else {
-            localImportInstanceTracker = false;
-
-        }
-
-        this.localImportInstance = 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 {
-                ConversionTaskTypeChoice_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 + ":ConversionTaskTypeChoice_type0", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ConversionTaskTypeChoice_type0", xmlWriter);
-            }
-
-        }
-        if (localImportVolumeTracker) {
-            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/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/2012-08-15/", "importInstance"), 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 (localImportVolumeTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "importVolume"));
-
-            if (localImportVolume == null) {
-                throw new org.apache.axis2.databinding.ADBException("importVolume cannot be null!!");
-            }
-            elementList.add(localImportVolume);
-        }
-        if (localImportInstanceTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "importInstance"));
-
-            if (localImportInstance == null) {
-                throw new org.apache.axis2.databinding.ADBException("importInstance cannot be null!!");
-            }
-            elementList.add(localImportInstance);
-        }
-
-        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 ConversionTaskTypeChoice_type0 parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ConversionTaskTypeChoice_type0 object = new ConversionTaskTypeChoice_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/", "importVolume").equals(reader.getName())) {
-
-                    object.setImportVolume(com.amazon.ec2.ImportVolumeTaskDetailsType.Factory.parse(reader));
-
-                    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/", "importInstance").equals(reader.getName())) {
-
-                    object.setImportInstance(com.amazon.ec2.ImportInstanceTaskDetailsType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index daf6bc0..0000000
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateCustomerGateway bean class
-*/
-
-public class CreateCustomerGateway 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/", "CreateCustomerGateway", "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 CreateCustomerGateway
-    */
-
-    protected com.amazon.ec2.CreateCustomerGatewayType localCreateCustomerGateway;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateCustomerGatewayType
-    */
-    public com.amazon.ec2.CreateCustomerGatewayType getCreateCustomerGateway() {
-        return localCreateCustomerGateway;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateCustomerGateway
-       */
-    public void setCreateCustomerGateway(com.amazon.ec2.CreateCustomerGatewayType param) {
-
-        this.localCreateCustomerGateway = 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 {
-                CreateCustomerGateway.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 (localCreateCustomerGateway == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateCustomerGateway.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 localCreateCustomerGateway.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 CreateCustomerGateway parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateCustomerGateway object = new CreateCustomerGateway();
-
-            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/", "CreateCustomerGateway").equals(reader.getName())) {
-
-                            object.setCreateCustomerGateway(com.amazon.ec2.CreateCustomerGatewayType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 04bafee..0000000
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateCustomerGatewayResponse bean class
-*/
-
-public class CreateCustomerGatewayResponse 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/", "CreateCustomerGatewayResponse",
-        "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 CreateCustomerGatewayResponse
-    */
-
-    protected com.amazon.ec2.CreateCustomerGatewayResponseType localCreateCustomerGatewayResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateCustomerGatewayResponseType
-    */
-    public com.amazon.ec2.CreateCustomerGatewayResponseType getCreateCustomerGatewayResponse() {
-        return localCreateCustomerGatewayResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateCustomerGatewayResponse
-       */
-    public void setCreateCustomerGatewayResponse(com.amazon.ec2.CreateCustomerGatewayResponseType param) {
-
-        this.localCreateCustomerGatewayResponse = 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 {
-                CreateCustomerGatewayResponse.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 (localCreateCustomerGatewayResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateCustomerGatewayResponse.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 localCreateCustomerGatewayResponse.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 CreateCustomerGatewayResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateCustomerGatewayResponse object = new CreateCustomerGatewayResponse();
-
-            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/", "CreateCustomerGatewayResponse").equals(reader.getName())) {
-
-                            object.setCreateCustomerGatewayResponse(com.amazon.ec2.CreateCustomerGatewayResponseType.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
-
-}


[17/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 9db1851..0000000
--- a/awsapi/src/com/amazon/ec2/CreateImageType.java
+++ /dev/null
@@ -1,761 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateImageType bean class
-*/
-
-public class CreateImageType 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/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 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 Name
-    */
-
-    protected java.lang.String localName;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getName() {
-        return localName;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Name
-       */
-    public void setName(java.lang.String param) {
-
-        this.localName = 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 NoReboot
-    */
-
-    protected boolean localNoReboot;
-
-    /*  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 localNoRebootTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return boolean
-    */
-    public boolean getNoReboot() {
-        return localNoReboot;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param NoReboot
-       */
-    public void setNoReboot(boolean param) {
-
-        // setting primitive attribute tracker to true
-
-        if (false) {
-            localNoRebootTracker = false;
-
-        } else {
-            localNoRebootTracker = true;
-        }
-
-        this.localNoReboot = param;
-
-    }
-
-    /**
-    * 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
-    */
-    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 {
-                CreateImageType.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 + ":CreateImageType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateImageType", 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, "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, "name", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "name");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("name");
-        }
-
-        if (localName == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("name cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localName);
-
-        }
-
-        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 (localNoRebootTracker) {
-            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, "noReboot", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "noReboot");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("noReboot");
-            }
-
-            if (false) {
-
-                throw new org.apache.axis2.databinding.ADBException("noReboot cannot be null!!");
-
-            } else {
-                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNoReboot));
-            }
-
-            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();
-
-    }
-
-    /**
-     * 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/", "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/", "name"));
-
-        if (localName != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localName));
-        } else {
-            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/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 (localNoRebootTracker) {
-            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());
-
-    }
-
-    /**
-     *  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 CreateImageType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateImageType object = new CreateImageType();
-
-            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 (!"CreateImageType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateImageType)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/", "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/", "name").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setName(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/", "noReboot").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setNoReboot(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() && 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();
-
-                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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 2a8cfb5..0000000
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTask.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 0d8a9d7..0000000
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index d6e2704..0000000
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[45/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 302644c..0000000
--- a/awsapi/src/com/amazon/ec2/AmazonEC2MessageReceiverInOut.java
+++ /dev/null
@@ -1,9323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:00:16 CEST)
- */
-package com.amazon.ec2;
-
-/**
-*  AmazonEC2MessageReceiverInOut message receiver
-*/
-
-public class AmazonEC2MessageReceiverInOut extends org.apache.axis2.receivers.AbstractInOutMessageReceiver {
-
-    public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext)
-        throws org.apache.axis2.AxisFault {
-
-        try {
-
-            // get the implementation class for the Web Service
-            Object obj = getTheImplementationObject(msgContext);
-
-            AmazonEC2SkeletonInterface skel = (AmazonEC2SkeletonInterface)obj;
-            //Out Envelop
-            org.apache.axiom.soap.SOAPEnvelope envelope = null;
-            //Find the axisOperation that has been set by the Dispatch phase.
-            org.apache.axis2.description.AxisOperation op = msgContext.getOperationContext().getAxisOperation();
-            if (op == null) {
-                throw new org.apache.axis2.AxisFault(
-                    "Operation is not located, if this is doclit style the SOAP-ACTION should specified via the SOAP Action to use the RawXMLProvider");
-            }
-
-            java.lang.String methodName;
-            if ((op.getName() != null) && ((methodName = org.apache.axis2.util.JavaUtils.xmlNameToJavaIdentifier(op.getName().getLocalPart())) != null)) {
-
-                if ("describePlacementGroups".equals(methodName)) {
-
-                    com.amazon.ec2.DescribePlacementGroupsResponse describePlacementGroupsResponse289 = null;
-                    com.amazon.ec2.DescribePlacementGroups wrappedParam =
-                        (com.amazon.ec2.DescribePlacementGroups)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribePlacementGroups.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describePlacementGroupsResponse289 =
-
-                        skel.describePlacementGroups(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describePlacementGroupsResponse289, false);
-                } else
-
-                if ("createSecurityGroup".equals(methodName)) {
-
-                    com.amazon.ec2.CreateSecurityGroupResponse createSecurityGroupResponse291 = null;
-                    com.amazon.ec2.CreateSecurityGroup wrappedParam =
-                        (com.amazon.ec2.CreateSecurityGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateSecurityGroup.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createSecurityGroupResponse291 =
-
-                        skel.createSecurityGroup(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createSecurityGroupResponse291, false);
-                } else
-
-                if ("resetNetworkInterfaceAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttributeResponse293 = null;
-                    com.amazon.ec2.ResetNetworkInterfaceAttribute wrappedParam =
-                        (com.amazon.ec2.ResetNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.ResetNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    resetNetworkInterfaceAttributeResponse293 =
-
-                        skel.resetNetworkInterfaceAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), resetNetworkInterfaceAttributeResponse293, false);
-                } else
-
-                if ("createDhcpOptions".equals(methodName)) {
-
-                    com.amazon.ec2.CreateDhcpOptionsResponse createDhcpOptionsResponse295 = null;
-                    com.amazon.ec2.CreateDhcpOptions wrappedParam =
-                        (com.amazon.ec2.CreateDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateDhcpOptions.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createDhcpOptionsResponse295 =
-
-                        skel.createDhcpOptions(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createDhcpOptionsResponse295, false);
-                } else
-
-                if ("createRouteTable".equals(methodName)) {
-
-                    com.amazon.ec2.CreateRouteTableResponse createRouteTableResponse297 = null;
-                    com.amazon.ec2.CreateRouteTable wrappedParam =
-                        (com.amazon.ec2.CreateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateRouteTable.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createRouteTableResponse297 =
-
-                        skel.createRouteTable(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createRouteTableResponse297, false);
-                } else
-
-                if ("describeSubnets".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeSubnetsResponse describeSubnetsResponse299 = null;
-                    com.amazon.ec2.DescribeSubnets wrappedParam =
-                        (com.amazon.ec2.DescribeSubnets)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeSubnets.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeSubnetsResponse299 =
-
-                        skel.describeSubnets(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeSubnetsResponse299, false);
-                } else
-
-                if ("deactivateLicense".equals(methodName)) {
-
-                    com.amazon.ec2.DeactivateLicenseResponse deactivateLicenseResponse301 = null;
-                    com.amazon.ec2.DeactivateLicense wrappedParam =
-                        (com.amazon.ec2.DeactivateLicense)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeactivateLicense.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deactivateLicenseResponse301 =
-
-                        skel.deactivateLicense(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deactivateLicenseResponse301, false);
-                } else
-
-                if ("deleteVpc".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteVpcResponse deleteVpcResponse303 = null;
-                    com.amazon.ec2.DeleteVpc wrappedParam =
-                        (com.amazon.ec2.DeleteVpc)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVpc.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteVpcResponse303 =
-
-                        skel.deleteVpc(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpcResponse303, false);
-                } else
-
-                if ("cancelSpotInstanceRequests".equals(methodName)) {
-
-                    com.amazon.ec2.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequestsResponse305 = null;
-                    com.amazon.ec2.CancelSpotInstanceRequests wrappedParam =
-                        (com.amazon.ec2.CancelSpotInstanceRequests)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.CancelSpotInstanceRequests.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    cancelSpotInstanceRequestsResponse305 =
-
-                        skel.cancelSpotInstanceRequests(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), cancelSpotInstanceRequestsResponse305, false);
-                } else
-
-                if ("createSubnet".equals(methodName)) {
-
-                    com.amazon.ec2.CreateSubnetResponse createSubnetResponse307 = null;
-                    com.amazon.ec2.CreateSubnet wrappedParam =
-                        (com.amazon.ec2.CreateSubnet)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateSubnet.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createSubnetResponse307 =
-
-                        skel.createSubnet(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createSubnetResponse307, false);
-                } else
-
-                if ("deleteVpnGateway".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteVpnGatewayResponse deleteVpnGatewayResponse309 = null;
-                    com.amazon.ec2.DeleteVpnGateway wrappedParam =
-                        (com.amazon.ec2.DeleteVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVpnGateway.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteVpnGatewayResponse309 =
-
-                        skel.deleteVpnGateway(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnGatewayResponse309, false);
-                } else
-
-                if ("createNetworkAclEntry".equals(methodName)) {
-
-                    com.amazon.ec2.CreateNetworkAclEntryResponse createNetworkAclEntryResponse311 = null;
-                    com.amazon.ec2.CreateNetworkAclEntry wrappedParam =
-                        (com.amazon.ec2.CreateNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateNetworkAclEntry.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createNetworkAclEntryResponse311 =
-
-                        skel.createNetworkAclEntry(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkAclEntryResponse311, false);
-                } else
-
-                if ("requestSpotInstances".equals(methodName)) {
-
-                    com.amazon.ec2.RequestSpotInstancesResponse requestSpotInstancesResponse313 = null;
-                    com.amazon.ec2.RequestSpotInstances wrappedParam =
-                        (com.amazon.ec2.RequestSpotInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RequestSpotInstances.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    requestSpotInstancesResponse313 =
-
-                        skel.requestSpotInstances(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), requestSpotInstancesResponse313, false);
-                } else
-
-                if ("describeVolumeAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeVolumeAttributeResponse describeVolumeAttributeResponse315 = null;
-                    com.amazon.ec2.DescribeVolumeAttribute wrappedParam =
-                        (com.amazon.ec2.DescribeVolumeAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeVolumeAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeVolumeAttributeResponse315 =
-
-                        skel.describeVolumeAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumeAttributeResponse315, false);
-                } else
-
-                if ("associateDhcpOptions".equals(methodName)) {
-
-                    com.amazon.ec2.AssociateDhcpOptionsResponse associateDhcpOptionsResponse317 = null;
-                    com.amazon.ec2.AssociateDhcpOptions wrappedParam =
-                        (com.amazon.ec2.AssociateDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AssociateDhcpOptions.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    associateDhcpOptionsResponse317 =
-
-                        skel.associateDhcpOptions(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), associateDhcpOptionsResponse317, false);
-                } else
-
-                if ("describeTags".equals(methodName)) {
-
-                    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()));
-
-                    describeTagsResponse319 =
-
-                        skel.describeTags(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeTagsResponse319, false);
-                } else
-
-                if ("importKeyPair".equals(methodName)) {
-
-                    com.amazon.ec2.ImportKeyPairResponse importKeyPairResponse321 = null;
-                    com.amazon.ec2.ImportKeyPair wrappedParam =
-                        (com.amazon.ec2.ImportKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ImportKeyPair.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    importKeyPairResponse321 =
-
-                        skel.importKeyPair(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), importKeyPairResponse321, false);
-                } else
-
-                if ("deleteNetworkInterface".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteNetworkInterfaceResponse deleteNetworkInterfaceResponse323 = null;
-                    com.amazon.ec2.DeleteNetworkInterface wrappedParam =
-                        (com.amazon.ec2.DeleteNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteNetworkInterface.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteNetworkInterfaceResponse323 =
-
-                        skel.deleteNetworkInterface(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkInterfaceResponse323, false);
-                } else
-
-                if ("describeVpcs".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeVpcsResponse describeVpcsResponse325 = null;
-                    com.amazon.ec2.DescribeVpcs wrappedParam =
-                        (com.amazon.ec2.DescribeVpcs)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVpcs.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeVpcsResponse325 =
-
-                        skel.describeVpcs(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeVpcsResponse325, false);
-                } else
-
-                if ("describeLicenses".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeLicensesResponse describeLicensesResponse327 = null;
-                    com.amazon.ec2.DescribeLicenses wrappedParam =
-                        (com.amazon.ec2.DescribeLicenses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeLicenses.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeLicensesResponse327 =
-
-                        skel.describeLicenses(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeLicensesResponse327, false);
-                } else
-
-                if ("bundleInstance".equals(methodName)) {
-
-                    com.amazon.ec2.BundleInstanceResponse bundleInstanceResponse329 = null;
-                    com.amazon.ec2.BundleInstance wrappedParam =
-                        (com.amazon.ec2.BundleInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.BundleInstance.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    bundleInstanceResponse329 =
-
-                        skel.bundleInstance(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), bundleInstanceResponse329, false);
-                } else
-
-                if ("describeVpnConnections".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeVpnConnectionsResponse describeVpnConnectionsResponse331 = null;
-                    com.amazon.ec2.DescribeVpnConnections wrappedParam =
-                        (com.amazon.ec2.DescribeVpnConnections)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVpnConnections.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeVpnConnectionsResponse331 =
-
-                        skel.describeVpnConnections(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeVpnConnectionsResponse331, false);
-                } else
-
-                if ("describeImages".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeImagesResponse describeImagesResponse333 = null;
-                    com.amazon.ec2.DescribeImages wrappedParam =
-                        (com.amazon.ec2.DescribeImages)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeImages.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeImagesResponse333 =
-
-                        skel.describeImages(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeImagesResponse333, false);
-                } else
-
-                if ("createInternetGateway".equals(methodName)) {
-
-                    com.amazon.ec2.CreateInternetGatewayResponse createInternetGatewayResponse335 = null;
-                    com.amazon.ec2.CreateInternetGateway wrappedParam =
-                        (com.amazon.ec2.CreateInternetGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateInternetGateway.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createInternetGatewayResponse335 =
-
-                        skel.createInternetGateway(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createInternetGatewayResponse335, false);
-                } else
-
-                if ("disassociateRouteTable".equals(methodName)) {
-
-                    com.amazon.ec2.DisassociateRouteTableResponse disassociateRouteTableResponse337 = null;
-                    com.amazon.ec2.DisassociateRouteTable wrappedParam =
-                        (com.amazon.ec2.DisassociateRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DisassociateRouteTable.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    disassociateRouteTableResponse337 =
-
-                        skel.disassociateRouteTable(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), disassociateRouteTableResponse337, false);
-                } else
-
-                if ("replaceNetworkAclEntry".equals(methodName)) {
-
-                    com.amazon.ec2.ReplaceNetworkAclEntryResponse replaceNetworkAclEntryResponse339 = null;
-                    com.amazon.ec2.ReplaceNetworkAclEntry wrappedParam =
-                        (com.amazon.ec2.ReplaceNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ReplaceNetworkAclEntry.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    replaceNetworkAclEntryResponse339 =
-
-                        skel.replaceNetworkAclEntry(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), replaceNetworkAclEntryResponse339, false);
-                } else
-
-                if ("authorizeSecurityGroupIngress".equals(methodName)) {
-
-                    com.amazon.ec2.AuthorizeSecurityGroupIngressResponse authorizeSecurityGroupIngressResponse341 = null;
-                    com.amazon.ec2.AuthorizeSecurityGroupIngress wrappedParam =
-                        (com.amazon.ec2.AuthorizeSecurityGroupIngress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.AuthorizeSecurityGroupIngress.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    authorizeSecurityGroupIngressResponse341 =
-
-                        skel.authorizeSecurityGroupIngress(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), authorizeSecurityGroupIngressResponse341, false);
-                } else
-
-                if ("describeSnapshotAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeSnapshotAttributeResponse describeSnapshotAttributeResponse343 = null;
-                    com.amazon.ec2.DescribeSnapshotAttribute wrappedParam =
-                        (com.amazon.ec2.DescribeSnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeSnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeSnapshotAttributeResponse343 =
-
-                        skel.describeSnapshotAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeSnapshotAttributeResponse343, false);
-                } else
-
-                if ("createVpnGateway".equals(methodName)) {
-
-                    com.amazon.ec2.CreateVpnGatewayResponse createVpnGatewayResponse345 = null;
-                    com.amazon.ec2.CreateVpnGateway wrappedParam =
-                        (com.amazon.ec2.CreateVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateVpnGateway.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createVpnGatewayResponse345 =
-
-                        skel.createVpnGateway(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createVpnGatewayResponse345, false);
-                } else
-
-                if ("resetInstanceAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.ResetInstanceAttributeResponse resetInstanceAttributeResponse347 = null;
-                    com.amazon.ec2.ResetInstanceAttribute wrappedParam =
-                        (com.amazon.ec2.ResetInstanceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ResetInstanceAttribute.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    resetInstanceAttributeResponse347 =
-
-                        skel.resetInstanceAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), resetInstanceAttributeResponse347, false);
-                } else
-
-                if ("createTags".equals(methodName)) {
-
-                    com.amazon.ec2.CreateTagsResponse createTagsResponse349 = null;
-                    com.amazon.ec2.CreateTags wrappedParam =
-                        (com.amazon.ec2.CreateTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateTags.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createTagsResponse349 =
-
-                        skel.createTags(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createTagsResponse349, false);
-                } else
-
-                if ("authorizeSecurityGroupEgress".equals(methodName)) {
-
-                    com.amazon.ec2.AuthorizeSecurityGroupEgressResponse authorizeSecurityGroupEgressResponse351 = null;
-                    com.amazon.ec2.AuthorizeSecurityGroupEgress wrappedParam =
-                        (com.amazon.ec2.AuthorizeSecurityGroupEgress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.AuthorizeSecurityGroupEgress.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    authorizeSecurityGroupEgressResponse351 =
-
-                        skel.authorizeSecurityGroupEgress(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), authorizeSecurityGroupEgressResponse351, false);
-                } else
-
-                if ("associateAddress".equals(methodName)) {
-
-                    com.amazon.ec2.AssociateAddressResponse associateAddressResponse353 = null;
-                    com.amazon.ec2.AssociateAddress wrappedParam =
-                        (com.amazon.ec2.AssociateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AssociateAddress.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    associateAddressResponse353 =
-
-                        skel.associateAddress(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), associateAddressResponse353, false);
-                } else
-
-                if ("describeImageAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeImageAttributeResponse describeImageAttributeResponse355 = null;
-                    com.amazon.ec2.DescribeImageAttribute wrappedParam =
-                        (com.amazon.ec2.DescribeImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeImageAttribute.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeImageAttributeResponse355 =
-
-                        skel.describeImageAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeImageAttributeResponse355, false);
-                } else
-
-                if ("describeSpotPriceHistory".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeSpotPriceHistoryResponse describeSpotPriceHistoryResponse357 = null;
-                    com.amazon.ec2.DescribeSpotPriceHistory wrappedParam =
-                        (com.amazon.ec2.DescribeSpotPriceHistory)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeSpotPriceHistory.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeSpotPriceHistoryResponse357 =
-
-                        skel.describeSpotPriceHistory(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotPriceHistoryResponse357, false);
-                } else
-
-                if ("modifySnapshotAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.ModifySnapshotAttributeResponse modifySnapshotAttributeResponse359 = null;
-                    com.amazon.ec2.ModifySnapshotAttribute wrappedParam =
-                        (com.amazon.ec2.ModifySnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.ModifySnapshotAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    modifySnapshotAttributeResponse359 =
-
-                        skel.modifySnapshotAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), modifySnapshotAttributeResponse359, false);
-                } else
-
-                if ("describeSpotInstanceRequests".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeSpotInstanceRequestsResponse describeSpotInstanceRequestsResponse361 = null;
-                    com.amazon.ec2.DescribeSpotInstanceRequests wrappedParam =
-                        (com.amazon.ec2.DescribeSpotInstanceRequests)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeSpotInstanceRequests.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeSpotInstanceRequestsResponse361 =
-
-                        skel.describeSpotInstanceRequests(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotInstanceRequestsResponse361, false);
-                } else
-
-                if ("importInstance".equals(methodName)) {
-
-                    com.amazon.ec2.ImportInstanceResponse importInstanceResponse363 = null;
-                    com.amazon.ec2.ImportInstance wrappedParam =
-                        (com.amazon.ec2.ImportInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ImportInstance.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    importInstanceResponse363 =
-
-                        skel.importInstance(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), importInstanceResponse363, false);
-                } else
-
-                if ("describeKeyPairs".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeKeyPairsResponse describeKeyPairsResponse365 = null;
-                    com.amazon.ec2.DescribeKeyPairs wrappedParam =
-                        (com.amazon.ec2.DescribeKeyPairs)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeKeyPairs.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeKeyPairsResponse365 =
-
-                        skel.describeKeyPairs(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeKeyPairsResponse365, false);
-                } else
-
-                if ("revokeSecurityGroupIngress".equals(methodName)) {
-
-                    com.amazon.ec2.RevokeSecurityGroupIngressResponse revokeSecurityGroupIngressResponse367 = null;
-                    com.amazon.ec2.RevokeSecurityGroupIngress wrappedParam =
-                        (com.amazon.ec2.RevokeSecurityGroupIngress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.RevokeSecurityGroupIngress.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    revokeSecurityGroupIngressResponse367 =
-
-                        skel.revokeSecurityGroupIngress(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), revokeSecurityGroupIngressResponse367, false);
-                } else
-
-                if ("createPlacementGroup".equals(methodName)) {
-
-                    com.amazon.ec2.CreatePlacementGroupResponse createPlacementGroupResponse369 = null;
-                    com.amazon.ec2.CreatePlacementGroup wrappedParam =
-                        (com.amazon.ec2.CreatePlacementGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreatePlacementGroup.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createPlacementGroupResponse369 =
-
-                        skel.createPlacementGroup(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createPlacementGroupResponse369, false);
-                } else
-
-                if ("deleteNetworkAclEntry".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteNetworkAclEntryResponse deleteNetworkAclEntryResponse371 = null;
-                    com.amazon.ec2.DeleteNetworkAclEntry wrappedParam =
-                        (com.amazon.ec2.DeleteNetworkAclEntry)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteNetworkAclEntry.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteNetworkAclEntryResponse371 =
-
-                        skel.deleteNetworkAclEntry(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkAclEntryResponse371, false);
-                } else
-
-                if ("activateLicense".equals(methodName)) {
-
-                    com.amazon.ec2.ActivateLicenseResponse activateLicenseResponse373 = null;
-                    com.amazon.ec2.ActivateLicense wrappedParam =
-                        (com.amazon.ec2.ActivateLicense)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ActivateLicense.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    activateLicenseResponse373 =
-
-                        skel.activateLicense(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), activateLicenseResponse373, false);
-                } else
-
-                if ("deleteRouteTable".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteRouteTableResponse deleteRouteTableResponse375 = null;
-                    com.amazon.ec2.DeleteRouteTable wrappedParam =
-                        (com.amazon.ec2.DeleteRouteTable)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteRouteTable.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteRouteTableResponse375 =
-
-                        skel.deleteRouteTable(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteRouteTableResponse375, false);
-                } else
-
-                if ("unmonitorInstances".equals(methodName)) {
-
-                    com.amazon.ec2.UnmonitorInstancesResponse unmonitorInstancesResponse377 = null;
-                    com.amazon.ec2.UnmonitorInstances wrappedParam =
-                        (com.amazon.ec2.UnmonitorInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.UnmonitorInstances.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    unmonitorInstancesResponse377 =
-
-                        skel.unmonitorInstances(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), unmonitorInstancesResponse377, false);
-                } else
-
-                if ("startInstances".equals(methodName)) {
-
-                    com.amazon.ec2.StartInstancesResponse startInstancesResponse379 = null;
-                    com.amazon.ec2.StartInstances wrappedParam =
-                        (com.amazon.ec2.StartInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.StartInstances.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    startInstancesResponse379 =
-
-                        skel.startInstances(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), startInstancesResponse379, false);
-                } else
-
-                if ("confirmProductInstance".equals(methodName)) {
-
-                    com.amazon.ec2.ConfirmProductInstanceResponse confirmProductInstanceResponse381 = null;
-                    com.amazon.ec2.ConfirmProductInstance wrappedParam =
-                        (com.amazon.ec2.ConfirmProductInstance)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ConfirmProductInstance.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    confirmProductInstanceResponse381 =
-
-                        skel.confirmProductInstance(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), confirmProductInstanceResponse381, false);
-                } else
-
-                if ("describeNetworkInterfaceAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse describeNetworkInterfaceAttributeResponse383 = null;
-                    com.amazon.ec2.DescribeNetworkInterfaceAttribute wrappedParam =
-                        (com.amazon.ec2.DescribeNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeNetworkInterfaceAttributeResponse383 =
-
-                        skel.describeNetworkInterfaceAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeNetworkInterfaceAttributeResponse383, false);
-                } else
-
-                if ("runInstances".equals(methodName)) {
-
-                    com.amazon.ec2.RunInstancesResponse runInstancesResponse385 = null;
-                    com.amazon.ec2.RunInstances wrappedParam =
-                        (com.amazon.ec2.RunInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RunInstances.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    runInstancesResponse385 =
-
-                        skel.runInstances(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), runInstancesResponse385, false);
-                } else
-
-                if ("createReservedInstancesListing".equals(methodName)) {
-
-                    com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListingResponse387 = null;
-                    com.amazon.ec2.CreateReservedInstancesListing wrappedParam =
-                        (com.amazon.ec2.CreateReservedInstancesListing)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.CreateReservedInstancesListing.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createReservedInstancesListingResponse387 =
-
-                        skel.createReservedInstancesListing(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createReservedInstancesListingResponse387, false);
-                } else
-
-                if ("createCustomerGateway".equals(methodName)) {
-
-                    com.amazon.ec2.CreateCustomerGatewayResponse createCustomerGatewayResponse389 = null;
-                    com.amazon.ec2.CreateCustomerGateway wrappedParam =
-                        (com.amazon.ec2.CreateCustomerGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateCustomerGateway.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createCustomerGatewayResponse389 =
-
-                        skel.createCustomerGateway(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createCustomerGatewayResponse389, false);
-                } else
-
-                if ("createNetworkAcl".equals(methodName)) {
-
-                    com.amazon.ec2.CreateNetworkAclResponse createNetworkAclResponse391 = null;
-                    com.amazon.ec2.CreateNetworkAcl wrappedParam =
-                        (com.amazon.ec2.CreateNetworkAcl)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateNetworkAcl.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createNetworkAclResponse391 =
-
-                        skel.createNetworkAcl(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createNetworkAclResponse391, false);
-                } else
-
-                if ("resetImageAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.ResetImageAttributeResponse resetImageAttributeResponse393 = null;
-                    com.amazon.ec2.ResetImageAttribute wrappedParam =
-                        (com.amazon.ec2.ResetImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ResetImageAttribute.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    resetImageAttributeResponse393 =
-
-                        skel.resetImageAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), resetImageAttributeResponse393, false);
-                } else
-
-                if ("modifyVolumeAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.ModifyVolumeAttributeResponse modifyVolumeAttributeResponse395 = null;
-                    com.amazon.ec2.ModifyVolumeAttribute wrappedParam =
-                        (com.amazon.ec2.ModifyVolumeAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ModifyVolumeAttribute.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    modifyVolumeAttributeResponse395 =
-
-                        skel.modifyVolumeAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), modifyVolumeAttributeResponse395, false);
-                } else
-
-                if ("describeReservedInstances".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeReservedInstancesResponse describeReservedInstancesResponse397 = null;
-                    com.amazon.ec2.DescribeReservedInstances wrappedParam =
-                        (com.amazon.ec2.DescribeReservedInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeReservedInstances.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeReservedInstancesResponse397 =
-
-                        skel.describeReservedInstances(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesResponse397, false);
-                } else
-
-                if ("resetSnapshotAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.ResetSnapshotAttributeResponse resetSnapshotAttributeResponse399 = null;
-                    com.amazon.ec2.ResetSnapshotAttribute wrappedParam =
-                        (com.amazon.ec2.ResetSnapshotAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ResetSnapshotAttribute.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    resetSnapshotAttributeResponse399 =
-
-                        skel.resetSnapshotAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), resetSnapshotAttributeResponse399, false);
-                } else
-
-                if ("deleteVolume".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteVolumeResponse deleteVolumeResponse401 = null;
-                    com.amazon.ec2.DeleteVolume wrappedParam =
-                        (com.amazon.ec2.DeleteVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteVolume.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteVolumeResponse401 =
-
-                        skel.deleteVolume(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteVolumeResponse401, false);
-                } else
-
-                if ("describeAvailabilityZones".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeAvailabilityZonesResponse describeAvailabilityZonesResponse403 = null;
-                    com.amazon.ec2.DescribeAvailabilityZones wrappedParam =
-                        (com.amazon.ec2.DescribeAvailabilityZones)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeAvailabilityZones.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeAvailabilityZonesResponse403 =
-
-                        skel.describeAvailabilityZones(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeAvailabilityZonesResponse403, false);
-                } else
-
-                if ("createVpnConnection".equals(methodName)) {
-
-                    com.amazon.ec2.CreateVpnConnectionResponse createVpnConnectionResponse405 = null;
-                    com.amazon.ec2.CreateVpnConnection wrappedParam =
-                        (com.amazon.ec2.CreateVpnConnection)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateVpnConnection.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createVpnConnectionResponse405 =
-
-                        skel.createVpnConnection(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createVpnConnectionResponse405, false);
-                } else
-
-                if ("cancelBundleTask".equals(methodName)) {
-
-                    com.amazon.ec2.CancelBundleTaskResponse cancelBundleTaskResponse407 = null;
-                    com.amazon.ec2.CancelBundleTask wrappedParam =
-                        (com.amazon.ec2.CancelBundleTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CancelBundleTask.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    cancelBundleTaskResponse407 =
-
-                        skel.cancelBundleTask(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), cancelBundleTaskResponse407, false);
-                } else
-
-                if ("replaceNetworkAclAssociation".equals(methodName)) {
-
-                    com.amazon.ec2.ReplaceNetworkAclAssociationResponse replaceNetworkAclAssociationResponse409 = null;
-                    com.amazon.ec2.ReplaceNetworkAclAssociation wrappedParam =
-                        (com.amazon.ec2.ReplaceNetworkAclAssociation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.ReplaceNetworkAclAssociation.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    replaceNetworkAclAssociationResponse409 =
-
-                        skel.replaceNetworkAclAssociation(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), replaceNetworkAclAssociationResponse409, false);
-                } else
-
-                if ("detachVpnGateway".equals(methodName)) {
-
-                    com.amazon.ec2.DetachVpnGatewayResponse detachVpnGatewayResponse411 = null;
-                    com.amazon.ec2.DetachVpnGateway wrappedParam =
-                        (com.amazon.ec2.DetachVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DetachVpnGateway.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    detachVpnGatewayResponse411 =
-
-                        skel.detachVpnGateway(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), detachVpnGatewayResponse411, false);
-                } else
-
-                if ("describeSnapshots".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeSnapshotsResponse describeSnapshotsResponse413 = null;
-                    com.amazon.ec2.DescribeSnapshots wrappedParam =
-                        (com.amazon.ec2.DescribeSnapshots)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeSnapshots.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeSnapshotsResponse413 =
-
-                        skel.describeSnapshots(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeSnapshotsResponse413, false);
-                } else
-
-                if ("deleteSubnet".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteSubnetResponse deleteSubnetResponse415 = null;
-                    com.amazon.ec2.DeleteSubnet wrappedParam =
-                        (com.amazon.ec2.DeleteSubnet)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteSubnet.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteSubnetResponse415 =
-
-                        skel.deleteSubnet(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteSubnetResponse415, false);
-                } else
-
-                if ("describeBundleTasks".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeBundleTasksResponse describeBundleTasksResponse417 = null;
-                    com.amazon.ec2.DescribeBundleTasks wrappedParam =
-                        (com.amazon.ec2.DescribeBundleTasks)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeBundleTasks.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeBundleTasksResponse417 =
-
-                        skel.describeBundleTasks(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeBundleTasksResponse417, false);
-                } else
-
-                if ("createKeyPair".equals(methodName)) {
-
-                    com.amazon.ec2.CreateKeyPairResponse createKeyPairResponse419 = null;
-                    com.amazon.ec2.CreateKeyPair wrappedParam =
-                        (com.amazon.ec2.CreateKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateKeyPair.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createKeyPairResponse419 =
-
-                        skel.createKeyPair(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createKeyPairResponse419, false);
-                } else
-
-                if ("createImage".equals(methodName)) {
-
-                    com.amazon.ec2.CreateImageResponse createImageResponse421 = null;
-                    com.amazon.ec2.CreateImage wrappedParam =
-                        (com.amazon.ec2.CreateImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateImage.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createImageResponse421 =
-
-                        skel.createImage(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createImageResponse421, false);
-                } else
-
-                if ("enableVgwRoutePropagation".equals(methodName)) {
-
-                    com.amazon.ec2.EnableVgwRoutePropagationResponse enableVgwRoutePropagationResponse423 = null;
-                    com.amazon.ec2.EnableVgwRoutePropagation wrappedParam =
-                        (com.amazon.ec2.EnableVgwRoutePropagation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.EnableVgwRoutePropagation.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    enableVgwRoutePropagationResponse423 =
-
-                        skel.enableVgwRoutePropagation(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), enableVgwRoutePropagationResponse423, false);
-                } else
-
-                if ("unassignPrivateIpAddresses".equals(methodName)) {
-
-                    com.amazon.ec2.UnassignPrivateIpAddressesResponse unassignPrivateIpAddressesResponse425 = null;
-                    com.amazon.ec2.UnassignPrivateIpAddresses wrappedParam =
-                        (com.amazon.ec2.UnassignPrivateIpAddresses)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.UnassignPrivateIpAddresses.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    unassignPrivateIpAddressesResponse425 =
-
-                        skel.unassignPrivateIpAddresses(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), unassignPrivateIpAddressesResponse425, false);
-                } else
-
-                if ("deregisterImage".equals(methodName)) {
-
-                    com.amazon.ec2.DeregisterImageResponse deregisterImageResponse427 = null;
-                    com.amazon.ec2.DeregisterImage wrappedParam =
-                        (com.amazon.ec2.DeregisterImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeregisterImage.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deregisterImageResponse427 =
-
-                        skel.deregisterImage(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deregisterImageResponse427, false);
-                } else
-
-                if ("deleteVpnConnectionRoute".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteVpnConnectionRouteResponse deleteVpnConnectionRouteResponse429 = null;
-                    com.amazon.ec2.DeleteVpnConnectionRoute wrappedParam =
-                        (com.amazon.ec2.DeleteVpnConnectionRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DeleteVpnConnectionRoute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteVpnConnectionRouteResponse429 =
-
-                        skel.deleteVpnConnectionRoute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteVpnConnectionRouteResponse429, false);
-                } else
-
-                if ("modifyImageAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.ModifyImageAttributeResponse modifyImageAttributeResponse431 = null;
-                    com.amazon.ec2.ModifyImageAttribute wrappedParam =
-                        (com.amazon.ec2.ModifyImageAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ModifyImageAttribute.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    modifyImageAttributeResponse431 =
-
-                        skel.modifyImageAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), modifyImageAttributeResponse431, false);
-                } else
-
-                if ("cancelConversionTask".equals(methodName)) {
-
-                    com.amazon.ec2.CancelConversionTaskResponse cancelConversionTaskResponse433 = null;
-                    com.amazon.ec2.CancelConversionTask wrappedParam =
-                        (com.amazon.ec2.CancelConversionTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CancelConversionTask.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    cancelConversionTaskResponse433 =
-
-                        skel.cancelConversionTask(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), cancelConversionTaskResponse433, false);
-                } else
-
-                if ("describeVolumes".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeVolumesResponse describeVolumesResponse435 = null;
-                    com.amazon.ec2.DescribeVolumes wrappedParam =
-                        (com.amazon.ec2.DescribeVolumes)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVolumes.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeVolumesResponse435 =
-
-                        skel.describeVolumes(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumesResponse435, false);
-                } else
-
-                if ("cancelReservedInstancesListing".equals(methodName)) {
-
-                    com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListingResponse437 = null;
-                    com.amazon.ec2.CancelReservedInstancesListing wrappedParam =
-                        (com.amazon.ec2.CancelReservedInstancesListing)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.CancelReservedInstancesListing.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    cancelReservedInstancesListingResponse437 =
-
-                        skel.cancelReservedInstancesListing(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), cancelReservedInstancesListingResponse437, false);
-                } else
-
-                if ("getPasswordData".equals(methodName)) {
-
-                    com.amazon.ec2.GetPasswordDataResponse getPasswordDataResponse439 = null;
-                    com.amazon.ec2.GetPasswordData wrappedParam =
-                        (com.amazon.ec2.GetPasswordData)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.GetPasswordData.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    getPasswordDataResponse439 =
-
-                        skel.getPasswordData(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), getPasswordDataResponse439, false);
-                } else
-
-                if ("allocateAddress".equals(methodName)) {
-
-                    com.amazon.ec2.AllocateAddressResponse allocateAddressResponse441 = null;
-                    com.amazon.ec2.AllocateAddress wrappedParam =
-                        (com.amazon.ec2.AllocateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AllocateAddress.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    allocateAddressResponse441 =
-
-                        skel.allocateAddress(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), allocateAddressResponse441, false);
-                } else
-
-                if ("deleteSecurityGroup".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteSecurityGroupResponse deleteSecurityGroupResponse443 = null;
-                    com.amazon.ec2.DeleteSecurityGroup wrappedParam =
-                        (com.amazon.ec2.DeleteSecurityGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteSecurityGroup.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteSecurityGroupResponse443 =
-
-                        skel.deleteSecurityGroup(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteSecurityGroupResponse443, false);
-                } else
-
-                if ("deletePlacementGroup".equals(methodName)) {
-
-                    com.amazon.ec2.DeletePlacementGroupResponse deletePlacementGroupResponse445 = null;
-                    com.amazon.ec2.DeletePlacementGroup wrappedParam =
-                        (com.amazon.ec2.DeletePlacementGroup)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeletePlacementGroup.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deletePlacementGroupResponse445 =
-
-                        skel.deletePlacementGroup(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deletePlacementGroupResponse445, false);
-                } else
-
-                if ("disassociateAddress".equals(methodName)) {
-
-                    com.amazon.ec2.DisassociateAddressResponse disassociateAddressResponse447 = null;
-                    com.amazon.ec2.DisassociateAddress wrappedParam =
-                        (com.amazon.ec2.DisassociateAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DisassociateAddress.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    disassociateAddressResponse447 =
-
-                        skel.disassociateAddress(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), disassociateAddressResponse447, false);
-                } else
-
-                if ("deleteDhcpOptions".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteDhcpOptionsResponse deleteDhcpOptionsResponse449 = null;
-                    com.amazon.ec2.DeleteDhcpOptions wrappedParam =
-                        (com.amazon.ec2.DeleteDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteDhcpOptions.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteDhcpOptionsResponse449 =
-
-                        skel.deleteDhcpOptions(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteDhcpOptionsResponse449, false);
-                } else
-
-                if ("describeSpotDatafeedSubscription".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscriptionResponse451 = null;
-                    com.amazon.ec2.DescribeSpotDatafeedSubscription wrappedParam =
-                        (com.amazon.ec2.DescribeSpotDatafeedSubscription)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeSpotDatafeedSubscription.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeSpotDatafeedSubscriptionResponse451 =
-
-                        skel.describeSpotDatafeedSubscription(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeSpotDatafeedSubscriptionResponse451, false);
-                } else
-
-                if ("describeNetworkAcls".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeNetworkAclsResponse describeNetworkAclsResponse453 = null;
-                    com.amazon.ec2.DescribeNetworkAcls wrappedParam =
-                        (com.amazon.ec2.DescribeNetworkAcls)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeNetworkAcls.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeNetworkAclsResponse453 =
-
-                        skel.describeNetworkAcls(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeNetworkAclsResponse453, false);
-                } else
-
-                if ("enableVolumeIO".equals(methodName)) {
-
-                    com.amazon.ec2.EnableVolumeIOResponse enableVolumeIOResponse455 = null;
-                    com.amazon.ec2.EnableVolumeIO wrappedParam =
-                        (com.amazon.ec2.EnableVolumeIO)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.EnableVolumeIO.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    enableVolumeIOResponse455 =
-
-                        skel.enableVolumeIO(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), enableVolumeIOResponse455, false);
-                } else
-
-                if ("attachVpnGateway".equals(methodName)) {
-
-                    com.amazon.ec2.AttachVpnGatewayResponse attachVpnGatewayResponse457 = null;
-                    com.amazon.ec2.AttachVpnGateway wrappedParam =
-                        (com.amazon.ec2.AttachVpnGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.AttachVpnGateway.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    attachVpnGatewayResponse457 =
-
-                        skel.attachVpnGateway(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), attachVpnGatewayResponse457, false);
-                } else
-
-                if ("describeInternetGateways".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeInternetGatewaysResponse describeInternetGatewaysResponse459 = null;
-                    com.amazon.ec2.DescribeInternetGateways wrappedParam =
-                        (com.amazon.ec2.DescribeInternetGateways)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeInternetGateways.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeInternetGatewaysResponse459 =
-
-                        skel.describeInternetGateways(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeInternetGatewaysResponse459, false);
-                } else
-
-                if ("describeDhcpOptions".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeDhcpOptionsResponse describeDhcpOptionsResponse461 = null;
-                    com.amazon.ec2.DescribeDhcpOptions wrappedParam =
-                        (com.amazon.ec2.DescribeDhcpOptions)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeDhcpOptions.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeDhcpOptionsResponse461 =
-
-                        skel.describeDhcpOptions(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeDhcpOptionsResponse461, false);
-                } else
-
-                if ("createSpotDatafeedSubscription".equals(methodName)) {
-
-                    com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscriptionResponse463 = null;
-                    com.amazon.ec2.CreateSpotDatafeedSubscription wrappedParam =
-                        (com.amazon.ec2.CreateSpotDatafeedSubscription)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.CreateSpotDatafeedSubscription.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createSpotDatafeedSubscriptionResponse463 =
-
-                        skel.createSpotDatafeedSubscription(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createSpotDatafeedSubscriptionResponse463, false);
-                } else
-
-                if ("describeReservedInstancesListings".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeReservedInstancesListingsResponse describeReservedInstancesListingsResponse465 = null;
-                    com.amazon.ec2.DescribeReservedInstancesListings wrappedParam =
-                        (com.amazon.ec2.DescribeReservedInstancesListings)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeReservedInstancesListings.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeReservedInstancesListingsResponse465 =
-
-                        skel.describeReservedInstancesListings(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeReservedInstancesListingsResponse465, false);
-                } else
-
-                if ("describeInstanceStatus".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeInstanceStatusResponse describeInstanceStatusResponse467 = null;
-                    com.amazon.ec2.DescribeInstanceStatus wrappedParam =
-                        (com.amazon.ec2.DescribeInstanceStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeInstanceStatus.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeInstanceStatusResponse467 =
-
-                        skel.describeInstanceStatus(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeInstanceStatusResponse467, false);
-                } else
-
-                if ("modifyNetworkInterfaceAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttributeResponse469 = null;
-                    com.amazon.ec2.ModifyNetworkInterfaceAttribute wrappedParam =
-                        (com.amazon.ec2.ModifyNetworkInterfaceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.ModifyNetworkInterfaceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    modifyNetworkInterfaceAttributeResponse469 =
-
-                        skel.modifyNetworkInterfaceAttribute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), modifyNetworkInterfaceAttributeResponse469, false);
-                } else
-
-                if ("disableVgwRoutePropagation".equals(methodName)) {
-
-                    com.amazon.ec2.DisableVgwRoutePropagationResponse disableVgwRoutePropagationResponse471 = null;
-                    com.amazon.ec2.DisableVgwRoutePropagation wrappedParam =
-                        (com.amazon.ec2.DisableVgwRoutePropagation)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DisableVgwRoutePropagation.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    disableVgwRoutePropagationResponse471 =
-
-                        skel.disableVgwRoutePropagation(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), disableVgwRoutePropagationResponse471, false);
-                } else
-
-                if ("describeVolumeStatus".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeVolumeStatusResponse describeVolumeStatusResponse473 = null;
-                    com.amazon.ec2.DescribeVolumeStatus wrappedParam =
-                        (com.amazon.ec2.DescribeVolumeStatus)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVolumeStatus.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeVolumeStatusResponse473 =
-
-                        skel.describeVolumeStatus(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeVolumeStatusResponse473, false);
-                } else
-
-                if ("detachNetworkInterface".equals(methodName)) {
-
-                    com.amazon.ec2.DetachNetworkInterfaceResponse detachNetworkInterfaceResponse475 = null;
-                    com.amazon.ec2.DetachNetworkInterface wrappedParam =
-                        (com.amazon.ec2.DetachNetworkInterface)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DetachNetworkInterface.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    detachNetworkInterfaceResponse475 =
-
-                        skel.detachNetworkInterface(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), detachNetworkInterfaceResponse475, false);
-                } else
-
-                if ("describeSecurityGroups".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeSecurityGroupsResponse describeSecurityGroupsResponse477 = null;
-                    com.amazon.ec2.DescribeSecurityGroups wrappedParam =
-                        (com.amazon.ec2.DescribeSecurityGroups)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeSecurityGroups.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeSecurityGroupsResponse477 =
-
-                        skel.describeSecurityGroups(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeSecurityGroupsResponse477, false);
-                } else
-
-                if ("describeInstances".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeInstancesResponse describeInstancesResponse479 = null;
-                    com.amazon.ec2.DescribeInstances wrappedParam =
-                        (com.amazon.ec2.DescribeInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeInstances.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeInstancesResponse479 =
-
-                        skel.describeInstances(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeInstancesResponse479, false);
-                } else
-
-                if ("describeNetworkInterfaces".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeNetworkInterfacesResponse describeNetworkInterfacesResponse481 = null;
-                    com.amazon.ec2.DescribeNetworkInterfaces wrappedParam =
-                        (com.amazon.ec2.DescribeNetworkInterfaces)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeNetworkInterfaces.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeNetworkInterfacesResponse481 =
-
-                        skel.describeNetworkInterfaces(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeNetworkInterfacesResponse481, false);
-                } else
-
-                if ("deleteKeyPair".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteKeyPairResponse deleteKeyPairResponse483 = null;
-                    com.amazon.ec2.DeleteKeyPair wrappedParam =
-                        (com.amazon.ec2.DeleteKeyPair)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteKeyPair.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteKeyPairResponse483 =
-
-                        skel.deleteKeyPair(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteKeyPairResponse483, false);
-                } else
-
-                if ("createSnapshot".equals(methodName)) {
-
-                    com.amazon.ec2.CreateSnapshotResponse createSnapshotResponse485 = null;
-                    com.amazon.ec2.CreateSnapshot wrappedParam =
-                        (com.amazon.ec2.CreateSnapshot)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateSnapshot.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createSnapshotResponse485 =
-
-                        skel.createSnapshot(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createSnapshotResponse485, false);
-                } else
-
-                if ("describeVpnGateways".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeVpnGatewaysResponse describeVpnGatewaysResponse487 = null;
-                    com.amazon.ec2.DescribeVpnGateways wrappedParam =
-                        (com.amazon.ec2.DescribeVpnGateways)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeVpnGateways.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeVpnGatewaysResponse487 =
-
-                        skel.describeVpnGateways(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeVpnGatewaysResponse487, false);
-                } else
-
-                if ("deleteTags".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteTagsResponse deleteTagsResponse489 = null;
-                    com.amazon.ec2.DeleteTags wrappedParam =
-                        (com.amazon.ec2.DeleteTags)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteTags.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteTagsResponse489 =
-
-                        skel.deleteTags(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteTagsResponse489, false);
-                } else
-
-                if ("deleteSnapshot".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteSnapshotResponse deleteSnapshotResponse491 = null;
-                    com.amazon.ec2.DeleteSnapshot wrappedParam =
-                        (com.amazon.ec2.DeleteSnapshot)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteSnapshot.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteSnapshotResponse491 =
-
-                        skel.deleteSnapshot(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteSnapshotResponse491, false);
-                } else
-
-                if ("deleteCustomerGateway".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteCustomerGatewayResponse deleteCustomerGatewayResponse493 = null;
-                    com.amazon.ec2.DeleteCustomerGateway wrappedParam =
-                        (com.amazon.ec2.DeleteCustomerGateway)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteCustomerGateway.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteCustomerGatewayResponse493 =
-
-                        skel.deleteCustomerGateway(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteCustomerGatewayResponse493, false);
-                } else
-
-                if ("createVolume".equals(methodName)) {
-
-                    com.amazon.ec2.CreateVolumeResponse createVolumeResponse495 = null;
-                    com.amazon.ec2.CreateVolume wrappedParam =
-                        (com.amazon.ec2.CreateVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateVolume.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createVolumeResponse495 =
-
-                        skel.createVolume(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createVolumeResponse495, false);
-                } else
-
-                if ("cancelExportTask".equals(methodName)) {
-
-                    com.amazon.ec2.CancelExportTaskResponse cancelExportTaskResponse497 = null;
-                    com.amazon.ec2.CancelExportTask wrappedParam =
-                        (com.amazon.ec2.CancelExportTask)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CancelExportTask.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    cancelExportTaskResponse497 =
-
-                        skel.cancelExportTask(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), cancelExportTaskResponse497, false);
-                } else
-
-                if ("registerImage".equals(methodName)) {
-
-                    com.amazon.ec2.RegisterImageResponse registerImageResponse499 = null;
-                    com.amazon.ec2.RegisterImage wrappedParam =
-                        (com.amazon.ec2.RegisterImage)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RegisterImage.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    registerImageResponse499 =
-
-                        skel.registerImage(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), registerImageResponse499, false);
-                } else
-
-                if ("detachVolume".equals(methodName)) {
-
-                    com.amazon.ec2.DetachVolumeResponse detachVolumeResponse501 = null;
-                    com.amazon.ec2.DetachVolume wrappedParam =
-                        (com.amazon.ec2.DetachVolume)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DetachVolume.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    detachVolumeResponse501 =
-
-                        skel.detachVolume(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), detachVolumeResponse501, false);
-                } else
-
-                if ("stopInstances".equals(methodName)) {
-
-                    com.amazon.ec2.StopInstancesResponse stopInstancesResponse503 = null;
-                    com.amazon.ec2.StopInstances wrappedParam =
-                        (com.amazon.ec2.StopInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.StopInstances.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    stopInstancesResponse503 =
-
-                        skel.stopInstances(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), stopInstancesResponse503, false);
-                } else
-
-                if ("createRoute".equals(methodName)) {
-
-                    com.amazon.ec2.CreateRouteResponse createRouteResponse505 = null;
-                    com.amazon.ec2.CreateRoute wrappedParam =
-                        (com.amazon.ec2.CreateRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.CreateRoute.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    createRouteResponse505 =
-
-                        skel.createRoute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), createRouteResponse505, false);
-                } else
-
-                if ("releaseAddress".equals(methodName)) {
-
-                    com.amazon.ec2.ReleaseAddressResponse releaseAddressResponse507 = null;
-                    com.amazon.ec2.ReleaseAddress wrappedParam =
-                        (com.amazon.ec2.ReleaseAddress)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.ReleaseAddress.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    releaseAddressResponse507 =
-
-                        skel.releaseAddress(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), releaseAddressResponse507, false);
-                } else
-
-                if ("describeRouteTables".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeRouteTablesResponse describeRouteTablesResponse509 = null;
-                    com.amazon.ec2.DescribeRouteTables wrappedParam =
-                        (com.amazon.ec2.DescribeRouteTables)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DescribeRouteTables.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeRouteTablesResponse509 =
-
-                        skel.describeRouteTables(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeRouteTablesResponse509, false);
-                } else
-
-                if ("describeCustomerGateways".equals(methodName)) {
-
-                    com.amazon.ec2.DescribeCustomerGatewaysResponse describeCustomerGatewaysResponse511 = null;
-                    com.amazon.ec2.DescribeCustomerGateways wrappedParam =
-                        (com.amazon.ec2.DescribeCustomerGateways)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.DescribeCustomerGateways.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    describeCustomerGatewaysResponse511 =
-
-                        skel.describeCustomerGateways(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), describeCustomerGatewaysResponse511, false);
-                } else
-
-                if ("deleteNetworkAcl".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteNetworkAclResponse deleteNetworkAclResponse513 = null;
-                    com.amazon.ec2.DeleteNetworkAcl wrappedParam =
-                        (com.amazon.ec2.DeleteNetworkAcl)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteNetworkAcl.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteNetworkAclResponse513 =
-
-                        skel.deleteNetworkAcl(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteNetworkAclResponse513, false);
-                } else
-
-                if ("deleteRoute".equals(methodName)) {
-
-                    com.amazon.ec2.DeleteRouteResponse deleteRouteResponse515 = null;
-                    com.amazon.ec2.DeleteRoute wrappedParam =
-                        (com.amazon.ec2.DeleteRoute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.DeleteRoute.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    deleteRouteResponse515 =
-
-                        skel.deleteRoute(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), deleteRouteResponse515, false);
-                } else
-
-                if ("rebootInstances".equals(methodName)) {
-
-                    com.amazon.ec2.RebootInstancesResponse rebootInstancesResponse517 = null;
-                    com.amazon.ec2.RebootInstances wrappedParam =
-                        (com.amazon.ec2.RebootInstances)fromOM(msgContext.getEnvelope().getBody().getFirstElement(), com.amazon.ec2.RebootInstances.class,
-                            getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    rebootInstancesResponse517 =
-
-                        skel.rebootInstances(wrappedParam);
-
-                    envelope = toEnvelope(getSOAPFactory(msgContext), rebootInstancesResponse517, false);
-                } else
-
-                if ("modifyInstanceAttribute".equals(methodName)) {
-
-                    com.amazon.ec2.ModifyInstanceAttributeResponse modifyInstanceAttributeResponse519 = null;
-                    com.amazon.ec2.ModifyInstanceAttribute wrappedParam =
-                        (com.amazon.ec2.ModifyInstanceAttribute)fromOM(msgContext.getEnvelope().getBody().getFirstElement(),
-                            com.amazon.ec2.ModifyInstanceAttribute.class, getEnvelopeNamespaces(msgContext.getEnvelope()));
-
-                    modifyInstanceAttributeResponse519 =
-
-                        skel.modifyInstanceAttribute(wrappedParam);
-
-                    envelope = toEnv

<TRUNCATED>

[42/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 55365b1..0000000
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetItemRequestType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index bc65ea8..0000000
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesSetRequestType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 89d2201..0000000
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesType.java
+++ /dev/null
@@ -1,677 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 6d2d1f9..0000000
--- a/awsapi/src/com/amazon/ec2/AssociateAddress.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AssociateAddress bean class
-*/
-
-public class AssociateAddress 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/", "AssociateAddress", "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 AssociateAddress
-    */
-
-    protected com.amazon.ec2.AssociateAddressType localAssociateAddress;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AssociateAddressType
-    */
-    public com.amazon.ec2.AssociateAddressType getAssociateAddress() {
-        return localAssociateAddress;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AssociateAddress
-       */
-    public void setAssociateAddress(com.amazon.ec2.AssociateAddressType param) {
-
-        this.localAssociateAddress = 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 {
-                AssociateAddress.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 (localAssociateAddress == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAssociateAddress.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 localAssociateAddress.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 AssociateAddress parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AssociateAddress object = new AssociateAddress();
-
-            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/", "AssociateAddress").equals(reader.getName())) {
-
-                            object.setAssociateAddress(com.amazon.ec2.AssociateAddressType.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
-
-}


[16/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 696f8c6..0000000
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskType.java
+++ /dev/null
@@ -1,648 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 56f7795..0000000
--- a/awsapi/src/com/amazon/ec2/CreateInstanceExportTaskTypeChoice_type0.java
+++ /dev/null
@@ -1,363 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 3035ed5..0000000
--- a/awsapi/src/com/amazon/ec2/CreateInternetGateway.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 0bf3fec..0000000
--- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[48/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 296e581..0000000
--- a/awsapi/src/com/amazon/ec2/ActivateLicense.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ActivateLicense bean class
-*/
-
-public class ActivateLicense 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/", "ActivateLicense", "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 ActivateLicense
-    */
-
-    protected com.amazon.ec2.ActivateLicenseType localActivateLicense;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.ActivateLicenseType
-    */
-    public com.amazon.ec2.ActivateLicenseType getActivateLicense() {
-        return localActivateLicense;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ActivateLicense
-       */
-    public void setActivateLicense(com.amazon.ec2.ActivateLicenseType param) {
-
-        this.localActivateLicense = 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 {
-                ActivateLicense.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 (localActivateLicense == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localActivateLicense.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 localActivateLicense.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 ActivateLicense parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ActivateLicense object = new ActivateLicense();
-
-            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/", "ActivateLicense").equals(reader.getName())) {
-
-                            object.setActivateLicense(com.amazon.ec2.ActivateLicenseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index ad3f4be..0000000
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ActivateLicenseResponse bean class
-*/
-
-public class ActivateLicenseResponse 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/", "ActivateLicenseResponse", "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 ActivateLicenseResponse
-    */
-
-    protected com.amazon.ec2.ActivateLicenseResponseType localActivateLicenseResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.ActivateLicenseResponseType
-    */
-    public com.amazon.ec2.ActivateLicenseResponseType getActivateLicenseResponse() {
-        return localActivateLicenseResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ActivateLicenseResponse
-       */
-    public void setActivateLicenseResponse(com.amazon.ec2.ActivateLicenseResponseType param) {
-
-        this.localActivateLicenseResponse = 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 {
-                ActivateLicenseResponse.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 (localActivateLicenseResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localActivateLicenseResponse.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 localActivateLicenseResponse.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 ActivateLicenseResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ActivateLicenseResponse object = new ActivateLicenseResponse();
-
-            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/", "ActivateLicenseResponse").equals(reader.getName())) {
-
-                            object.setActivateLicenseResponse(com.amazon.ec2.ActivateLicenseResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 02d73d5..0000000
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ActivateLicenseResponseType bean class
-*/
-
-public class ActivateLicenseResponseType 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/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 {
-                ActivateLicenseResponseType.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 + ":ActivateLicenseResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ActivateLicenseResponseType", 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 ActivateLicenseResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ActivateLicenseResponseType object = new ActivateLicenseResponseType();
-
-            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 (!"ActivateLicenseResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (ActivateLicenseResponseType)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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 5e7f5c3..0000000
--- a/awsapi/src/com/amazon/ec2/ActivateLicenseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  ActivateLicenseType bean class
-*/
-
-public class ActivateLicenseType 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/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 LicenseId
-    */
-
-    protected java.lang.String localLicenseId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getLicenseId() {
-        return localLicenseId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param LicenseId
-       */
-    public void setLicenseId(java.lang.String param) {
-
-        this.localLicenseId = param;
-
-    }
-
-    /**
-    * field for Capacity
-    */
-
-    protected int localCapacity;
-
-    /**
-    * Auto generated getter method
-    * @return int
-    */
-    public int getCapacity() {
-        return localCapacity;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Capacity
-       */
-    public void setCapacity(int param) {
-
-        this.localCapacity = 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 {
-                ActivateLicenseType.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 + ":ActivateLicenseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "ActivateLicenseType", 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, "licenseId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "licenseId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("licenseId");
-        }
-
-        if (localLicenseId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("licenseId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localLicenseId);
-
-        }
-
-        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, "capacity", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "capacity");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("capacity");
-        }
-
-        if (localCapacity == java.lang.Integer.MIN_VALUE) {
-
-            throw new org.apache.axis2.databinding.ADBException("capacity cannot be null!!");
-
-        } else {
-            xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localCapacity));
-        }
-
-        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/", "licenseId"));
-
-        if (localLicenseId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localLicenseId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("licenseId cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "capacity"));
-
-        elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localCapacity));
-
-        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 ActivateLicenseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            ActivateLicenseType object = new ActivateLicenseType();
-
-            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 (!"ActivateLicenseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (ActivateLicenseType)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/", "licenseId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setLicenseId(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/", "capacity").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setCapacity(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 185f43d..0000000
--- a/awsapi/src/com/amazon/ec2/AllocateAddress.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AllocateAddress bean class
-*/
-
-public class AllocateAddress 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/", "AllocateAddress", "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 AllocateAddress
-    */
-
-    protected com.amazon.ec2.AllocateAddressType localAllocateAddress;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AllocateAddressType
-    */
-    public com.amazon.ec2.AllocateAddressType getAllocateAddress() {
-        return localAllocateAddress;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AllocateAddress
-       */
-    public void setAllocateAddress(com.amazon.ec2.AllocateAddressType param) {
-
-        this.localAllocateAddress = 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 {
-                AllocateAddress.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 (localAllocateAddress == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAllocateAddress.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 localAllocateAddress.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 AllocateAddress parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AllocateAddress object = new AllocateAddress();
-
-            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/", "AllocateAddress").equals(reader.getName())) {
-
-                            object.setAllocateAddress(com.amazon.ec2.AllocateAddressType.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
-
-}


[51/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
Remove AWS api bridge

This has been a discussion point for a while. The (mostly generated)
code for the AWS api bridge is by far the largest source component in
Cloudstack, while seldomly used.

Now that alternate options exist to provide EC2 compatibility, it
makes sense to remove it for the few users who cannot directly
talk to the cloudstack API.


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

Branch: refs/heads/noawsapi
Commit: 84042f2c3259203b1ea1956cd239b9122079bae9
Parents: 83656a6
Author: Pierre-Yves Ritschard <py...@spootnik.org>
Authored: Fri Nov 21 11:17:18 2014 +0100
Committer: Pierre-Yves Ritschard <py...@spootnik.org>
Committed: Fri Nov 21 11:17:18 2014 +0100

----------------------------------------------------------------------
 README.md                                       |      1 -
 .../db/mysql/cloudbridge_bucketpolicy.sql       |     45 -
 awsapi-setup/db/mysql/cloudbridge_db.sql        |     30 -
 awsapi-setup/db/mysql/cloudbridge_index.sql     |     64 -
 awsapi-setup/db/mysql/cloudbridge_multipart.sql |     77 -
 .../db/mysql/cloudbridge_multipart_alter.sql    |     23 -
 awsapi-setup/db/mysql/cloudbridge_offering.sql  |     40 -
 .../db/mysql/cloudbridge_offering_alter.sql     |     21 -
 .../db/mysql/cloudbridge_policy_alter.sql       |     21 -
 awsapi-setup/db/mysql/cloudbridge_schema.sql    |    162 -
 awsapi-setup/db/mysql/deploy-db-bridge.sh       |     72 -
 awsapi-setup/db/mysql/init_db.bat               |     26 -
 awsapi-setup/init/debian/cloud-bridge           |    244 -
 awsapi-setup/init/rpm/cloud-bridge              |    300 -
 awsapi-setup/setup/cloud-setup-bridge           |    143 -
 awsapi-setup/setup/cloudstack-aws-api-register  |     93 -
 awsapi/.pydevproject                            |     25 -
 awsapi/conf/applicationContext.xml.in           |     55 -
 awsapi/conf/cloud-bridge.properties.in          |     25 -
 awsapi/conf/ec2-service.properties.in           |     25 -
 awsapi/pom.xml                                  |    441 -
 awsapi/resource/AmazonEC2/crypto.properties     |     24 -
 awsapi/resource/AmazonEC2/services.xml          |    605 -
 awsapi/resource/AmazonEC2/xes.keystore          |    Bin 2032 -> 0 bytes
 awsapi/resource/Axis2/axis2.xml                 |    561 -
 awsapi/scripts/run.bat                          |     18 -
 awsapi/scripts/run.sh                           |     23 -
 awsapi/src/com/amazon/ec2/ActivateLicense.java  |    323 -
 .../com/amazon/ec2/ActivateLicenseResponse.java |    323 -
 .../amazon/ec2/ActivateLicenseResponseType.java |    500 -
 .../src/com/amazon/ec2/ActivateLicenseType.java |    500 -
 awsapi/src/com/amazon/ec2/AllocateAddress.java  |    323 -
 .../com/amazon/ec2/AllocateAddressResponse.java |    323 -
 .../amazon/ec2/AllocateAddressResponseType.java |    685 -
 .../src/com/amazon/ec2/AllocateAddressType.java |    440 -
 .../com/amazon/ec2/AllocationIdSetItemType.java |    425 -
 .../src/com/amazon/ec2/AllocationIdSetType.java |    491 -
 .../ec2/AmazonEC2MessageReceiverInOut.java      |   9323 -
 .../src/com/amazon/ec2/AmazonEC2Skeleton.java   |   1627 -
 .../amazon/ec2/AmazonEC2SkeletonInterface.java  |   1194 -
 .../amazon/ec2/AssignPrivateIpAddresses.java    |    323 -
 .../ec2/AssignPrivateIpAddressesResponse.java   |    324 -
 .../AssignPrivateIpAddressesResponseType.java   |    500 -
 ...ignPrivateIpAddressesSetItemRequestType.java |    425 -
 .../AssignPrivateIpAddressesSetRequestType.java |    477 -
 .../ec2/AssignPrivateIpAddressesType.java       |    677 -
 awsapi/src/com/amazon/ec2/AssociateAddress.java |    323 -
 .../amazon/ec2/AssociateAddressResponse.java    |    323 -
 .../ec2/AssociateAddressResponseType.java       |    596 -
 .../com/amazon/ec2/AssociateAddressType.java    |    620 -
 .../ec2/AssociateAddressTypeChoice_type0.java   |    489 -
 .../ec2/AssociateAddressTypeChoice_type1.java   |    489 -
 .../com/amazon/ec2/AssociateDhcpOptions.java    |    323 -
 .../ec2/AssociateDhcpOptionsResponse.java       |    324 -
 .../ec2/AssociateDhcpOptionsResponseType.java   |    500 -
 .../amazon/ec2/AssociateDhcpOptionsType.java    |    507 -
 .../src/com/amazon/ec2/AssociateRouteTable.java |    323 -
 .../amazon/ec2/AssociateRouteTableResponse.java |    324 -
 .../ec2/AssociateRouteTableResponseType.java    |    507 -
 .../com/amazon/ec2/AssociateRouteTableType.java |    507 -
 .../com/amazon/ec2/AttachInternetGateway.java   |    323 -
 .../ec2/AttachInternetGatewayResponse.java      |    324 -
 .../ec2/AttachInternetGatewayResponseType.java  |    500 -
 .../amazon/ec2/AttachInternetGatewayType.java   |    507 -
 .../com/amazon/ec2/AttachNetworkInterface.java  |    323 -
 .../ec2/AttachNetworkInterfaceResponse.java     |    324 -
 .../ec2/AttachNetworkInterfaceResponseType.java |    507 -
 .../amazon/ec2/AttachNetworkInterfaceType.java  |    582 -
 awsapi/src/com/amazon/ec2/AttachVolume.java     |    322 -
 .../com/amazon/ec2/AttachVolumeResponse.java    |    323 -
 .../amazon/ec2/AttachVolumeResponseType.java    |    835 -
 awsapi/src/com/amazon/ec2/AttachVolumeType.java |    589 -
 awsapi/src/com/amazon/ec2/AttachVpnGateway.java |    323 -
 .../amazon/ec2/AttachVpnGatewayResponse.java    |    323 -
 .../ec2/AttachVpnGatewayResponseType.java       |    477 -
 .../com/amazon/ec2/AttachVpnGatewayType.java    |    507 -
 .../ec2/AttachmentSetItemResponseType.java      |    828 -
 .../amazon/ec2/AttachmentSetResponseType.java   |    491 -
 .../src/com/amazon/ec2/AttachmentSetType.java   |    491 -
 awsapi/src/com/amazon/ec2/AttachmentType.java   |    507 -
 .../amazon/ec2/AttributeBooleanValueType.java   |    418 -
 .../src/com/amazon/ec2/AttributeValueType.java  |    425 -
 .../ec2/AuthorizeSecurityGroupEgress.java       |    324 -
 .../AuthorizeSecurityGroupEgressResponse.java   |    324 -
 ...uthorizeSecurityGroupEgressResponseType.java |    500 -
 .../ec2/AuthorizeSecurityGroupEgressType.java   |    477 -
 .../ec2/AuthorizeSecurityGroupIngress.java      |    324 -
 .../AuthorizeSecurityGroupIngressResponse.java  |    324 -
 ...thorizeSecurityGroupIngressResponseType.java |    500 -
 .../ec2/AuthorizeSecurityGroupIngressType.java  |    536 -
 ...izeSecurityGroupIngressTypeChoice_type0.java |    489 -
 .../amazon/ec2/AvailabilityZoneItemType.java    |    641 -
 .../ec2/AvailabilityZoneMessageSetType.java     |    491 -
 .../amazon/ec2/AvailabilityZoneMessageType.java |    425 -
 .../com/amazon/ec2/AvailabilityZoneSetType.java |    491 -
 .../amazon/ec2/BlockDeviceMappingItemType.java  |    470 -
 .../BlockDeviceMappingItemTypeChoice_type0.java |    525 -
 .../com/amazon/ec2/BlockDeviceMappingType.java  |    491 -
 awsapi/src/com/amazon/ec2/BundleInstance.java   |    323 -
 .../com/amazon/ec2/BundleInstanceResponse.java  |    323 -
 .../amazon/ec2/BundleInstanceResponseType.java  |    477 -
 .../amazon/ec2/BundleInstanceS3StorageType.java |    798 -
 .../amazon/ec2/BundleInstanceTaskErrorType.java |    507 -
 .../ec2/BundleInstanceTaskStorageType.java      |    395 -
 .../com/amazon/ec2/BundleInstanceTaskType.java  |    968 -
 .../amazon/ec2/BundleInstanceTasksSetType.java  |    491 -
 .../src/com/amazon/ec2/BundleInstanceType.java  |    477 -
 awsapi/src/com/amazon/ec2/CancelBundleTask.java |    323 -
 .../amazon/ec2/CancelBundleTaskResponse.java    |    323 -
 .../ec2/CancelBundleTaskResponseType.java       |    477 -
 .../com/amazon/ec2/CancelBundleTaskType.java    |    425 -
 .../com/amazon/ec2/CancelConversionTask.java    |    323 -
 .../ec2/CancelConversionTaskResponse.java       |    324 -
 .../ec2/CancelConversionTaskResponseType.java   |    500 -
 .../amazon/ec2/CancelConversionTaskType.java    |    425 -
 awsapi/src/com/amazon/ec2/CancelExportTask.java |    323 -
 .../amazon/ec2/CancelExportTaskResponse.java    |    323 -
 .../ec2/CancelExportTaskResponseType.java       |    500 -
 .../com/amazon/ec2/CancelExportTaskType.java    |    425 -
 .../ec2/CancelReservedInstancesListing.java     |    324 -
 .../CancelReservedInstancesListingResponse.java |    324 -
 ...celReservedInstancesListingResponseType.java |    479 -
 .../ec2/CancelReservedInstancesListingType.java |    426 -
 .../amazon/ec2/CancelSpotInstanceRequests.java  |    324 -
 .../ec2/CancelSpotInstanceRequestsResponse.java |    324 -
 ...SpotInstanceRequestsResponseSetItemType.java |    508 -
 ...ncelSpotInstanceRequestsResponseSetType.java |    477 -
 .../CancelSpotInstanceRequestsResponseType.java |    478 -
 .../ec2/CancelSpotInstanceRequestsType.java     |    396 -
 .../com/amazon/ec2/ConfirmProductInstance.java  |    323 -
 .../ec2/ConfirmProductInstanceResponse.java     |    324 -
 .../ec2/ConfirmProductInstanceResponseType.java |    596 -
 .../amazon/ec2/ConfirmProductInstanceType.java  |    507 -
 .../amazon/ec2/ConversionTaskIdItemType.java    |    425 -
 .../com/amazon/ec2/ConversionTaskIdSetType.java |    491 -
 .../com/amazon/ec2/ConversionTaskSetType.java   |    491 -
 .../src/com/amazon/ec2/ConversionTaskType.java  |    810 -
 .../ec2/ConversionTaskTypeChoice_type0.java     |    429 -
 .../com/amazon/ec2/CreateCustomerGateway.java   |    323 -
 .../ec2/CreateCustomerGatewayResponse.java      |    324 -
 .../ec2/CreateCustomerGatewayResponseType.java  |    477 -
 .../amazon/ec2/CreateCustomerGatewayType.java   |    599 -
 .../src/com/amazon/ec2/CreateDhcpOptions.java   |    323 -
 .../amazon/ec2/CreateDhcpOptionsResponse.java   |    324 -
 .../ec2/CreateDhcpOptionsResponseType.java      |    477 -
 .../com/amazon/ec2/CreateDhcpOptionsType.java   |    395 -
 awsapi/src/com/amazon/ec2/CreateImage.java      |    322 -
 .../src/com/amazon/ec2/CreateImageResponse.java |    323 -
 .../com/amazon/ec2/CreateImageResponseType.java |    507 -
 awsapi/src/com/amazon/ec2/CreateImageType.java  |    761 -
 .../amazon/ec2/CreateInstanceExportTask.java    |    323 -
 .../ec2/CreateInstanceExportTaskResponse.java   |    324 -
 .../CreateInstanceExportTaskResponseType.java   |    477 -
 .../ec2/CreateInstanceExportTaskType.java       |    648 -
 ...reateInstanceExportTaskTypeChoice_type0.java |    363 -
 .../com/amazon/ec2/CreateInternetGateway.java   |    323 -
 .../ec2/CreateInternetGatewayResponse.java      |    324 -
 .../ec2/CreateInternetGatewayResponseType.java  |    477 -
 .../amazon/ec2/CreateInternetGatewayType.java   |    336 -
 awsapi/src/com/amazon/ec2/CreateKeyPair.java    |    323 -
 .../com/amazon/ec2/CreateKeyPairResponse.java   |    323 -
 .../amazon/ec2/CreateKeyPairResponseType.java   |    671 -
 .../src/com/amazon/ec2/CreateKeyPairType.java   |    425 -
 awsapi/src/com/amazon/ec2/CreateNetworkAcl.java |    323 -
 .../com/amazon/ec2/CreateNetworkAclEntry.java   |    323 -
 .../ec2/CreateNetworkAclEntryResponse.java      |    324 -
 .../ec2/CreateNetworkAclEntryResponseType.java  |    500 -
 .../amazon/ec2/CreateNetworkAclEntryType.java   |    954 -
 .../amazon/ec2/CreateNetworkAclResponse.java    |    323 -
 .../ec2/CreateNetworkAclResponseType.java       |    477 -
 .../com/amazon/ec2/CreateNetworkAclType.java    |    425 -
 .../com/amazon/ec2/CreateNetworkInterface.java  |    323 -
 .../ec2/CreateNetworkInterfaceResponse.java     |    324 -
 .../ec2/CreateNetworkInterfaceResponseType.java |    477 -
 .../amazon/ec2/CreateNetworkInterfaceType.java  |    847 -
 .../com/amazon/ec2/CreatePlacementGroup.java    |    323 -
 .../ec2/CreatePlacementGroupResponse.java       |    324 -
 .../ec2/CreatePlacementGroupResponseType.java   |    500 -
 .../amazon/ec2/CreatePlacementGroupType.java    |    507 -
 .../ec2/CreateReservedInstancesListing.java     |    324 -
 .../CreateReservedInstancesListingResponse.java |    324 -
 ...ateReservedInstancesListingResponseType.java |    479 -
 .../ec2/CreateReservedInstancesListingType.java |    650 -
 awsapi/src/com/amazon/ec2/CreateRoute.java      |    322 -
 .../src/com/amazon/ec2/CreateRouteResponse.java |    323 -
 .../com/amazon/ec2/CreateRouteResponseType.java |    500 -
 awsapi/src/com/amazon/ec2/CreateRouteTable.java |    323 -
 .../amazon/ec2/CreateRouteTableResponse.java    |    323 -
 .../ec2/CreateRouteTableResponseType.java       |    477 -
 .../com/amazon/ec2/CreateRouteTableType.java    |    425 -
 awsapi/src/com/amazon/ec2/CreateRouteType.java  |    552 -
 .../amazon/ec2/CreateRouteTypeChoice_type0.java |    585 -
 .../src/com/amazon/ec2/CreateSecurityGroup.java |    323 -
 .../amazon/ec2/CreateSecurityGroupResponse.java |    324 -
 .../ec2/CreateSecurityGroupResponseType.java    |    582 -
 .../com/amazon/ec2/CreateSecurityGroupType.java |    603 -
 awsapi/src/com/amazon/ec2/CreateSnapshot.java   |    323 -
 .../com/amazon/ec2/CreateSnapshotResponse.java  |    323 -
 .../amazon/ec2/CreateSnapshotResponseType.java  |   1095 -
 .../src/com/amazon/ec2/CreateSnapshotType.java  |    521 -
 .../ec2/CreateSpotDatafeedSubscription.java     |    324 -
 .../CreateSpotDatafeedSubscriptionResponse.java |    324 -
 ...ateSpotDatafeedSubscriptionResponseType.java |    478 -
 .../ec2/CreateSpotDatafeedSubscriptionType.java |    507 -
 awsapi/src/com/amazon/ec2/CreateSubnet.java     |    322 -
 .../com/amazon/ec2/CreateSubnetResponse.java    |    323 -
 .../amazon/ec2/CreateSubnetResponseType.java    |    477 -
 awsapi/src/com/amazon/ec2/CreateSubnetType.java |    603 -
 awsapi/src/com/amazon/ec2/CreateTags.java       |    322 -
 .../src/com/amazon/ec2/CreateTagsResponse.java  |    323 -
 .../com/amazon/ec2/CreateTagsResponseType.java  |    500 -
 awsapi/src/com/amazon/ec2/CreateTagsType.java   |    447 -
 awsapi/src/com/amazon/ec2/CreateVolume.java     |    322 -
 .../ec2/CreateVolumePermissionItemType.java     |    541 -
 .../ec2/CreateVolumePermissionListType.java     |    491 -
 .../CreateVolumePermissionOperationType.java    |    481 -
 .../com/amazon/ec2/CreateVolumeResponse.java    |    323 -
 .../amazon/ec2/CreateVolumeResponseType.java    |   1091 -
 awsapi/src/com/amazon/ec2/CreateVolumeType.java |    807 -
 awsapi/src/com/amazon/ec2/CreateVpc.java        |    322 -
 .../src/com/amazon/ec2/CreateVpcResponse.java   |    323 -
 .../com/amazon/ec2/CreateVpcResponseType.java   |    477 -
 awsapi/src/com/amazon/ec2/CreateVpcType.java    |    521 -
 .../src/com/amazon/ec2/CreateVpnConnection.java |    323 -
 .../amazon/ec2/CreateVpnConnectionResponse.java |    324 -
 .../ec2/CreateVpnConnectionResponseType.java    |    477 -
 .../amazon/ec2/CreateVpnConnectionRoute.java    |    323 -
 .../ec2/CreateVpnConnectionRouteResponse.java   |    324 -
 .../CreateVpnConnectionRouteResponseType.java   |    500 -
 .../ec2/CreateVpnConnectionRouteType.java       |    507 -
 .../com/amazon/ec2/CreateVpnConnectionType.java |    655 -
 awsapi/src/com/amazon/ec2/CreateVpnGateway.java |    323 -
 .../amazon/ec2/CreateVpnGatewayResponse.java    |    323 -
 .../ec2/CreateVpnGatewayResponseType.java       |    477 -
 .../com/amazon/ec2/CreateVpnGatewayType.java    |    521 -
 .../ec2/CustomerGatewayIdSetItemType.java       |    425 -
 .../amazon/ec2/CustomerGatewayIdSetType.java    |    491 -
 .../com/amazon/ec2/CustomerGatewaySetType.java  |    491 -
 .../src/com/amazon/ec2/CustomerGatewayType.java |    830 -
 .../src/com/amazon/ec2/DeactivateLicense.java   |    323 -
 .../amazon/ec2/DeactivateLicenseResponse.java   |    324 -
 .../ec2/DeactivateLicenseResponseType.java      |    500 -
 .../com/amazon/ec2/DeactivateLicenseType.java   |    500 -
 .../com/amazon/ec2/DeleteCustomerGateway.java   |    323 -
 .../ec2/DeleteCustomerGatewayResponse.java      |    324 -
 .../ec2/DeleteCustomerGatewayResponseType.java  |    500 -
 .../amazon/ec2/DeleteCustomerGatewayType.java   |    425 -
 .../src/com/amazon/ec2/DeleteDhcpOptions.java   |    323 -
 .../amazon/ec2/DeleteDhcpOptionsResponse.java   |    324 -
 .../ec2/DeleteDhcpOptionsResponseType.java      |    500 -
 .../com/amazon/ec2/DeleteDhcpOptionsType.java   |    425 -
 .../com/amazon/ec2/DeleteInternetGateway.java   |    323 -
 .../ec2/DeleteInternetGatewayResponse.java      |    324 -
 .../ec2/DeleteInternetGatewayResponseType.java  |    500 -
 .../amazon/ec2/DeleteInternetGatewayType.java   |    425 -
 awsapi/src/com/amazon/ec2/DeleteKeyPair.java    |    323 -
 .../com/amazon/ec2/DeleteKeyPairResponse.java   |    323 -
 .../amazon/ec2/DeleteKeyPairResponseType.java   |    500 -
 .../src/com/amazon/ec2/DeleteKeyPairType.java   |    425 -
 awsapi/src/com/amazon/ec2/DeleteNetworkAcl.java |    323 -
 .../com/amazon/ec2/DeleteNetworkAclEntry.java   |    323 -
 .../ec2/DeleteNetworkAclEntryResponse.java      |    324 -
 .../ec2/DeleteNetworkAclEntryResponseType.java  |    500 -
 .../amazon/ec2/DeleteNetworkAclEntryType.java   |    575 -
 .../amazon/ec2/DeleteNetworkAclResponse.java    |    323 -
 .../ec2/DeleteNetworkAclResponseType.java       |    500 -
 .../com/amazon/ec2/DeleteNetworkAclType.java    |    425 -
 .../com/amazon/ec2/DeleteNetworkInterface.java  |    323 -
 .../ec2/DeleteNetworkInterfaceResponse.java     |    324 -
 .../ec2/DeleteNetworkInterfaceResponseType.java |    500 -
 .../amazon/ec2/DeleteNetworkInterfaceType.java  |    425 -
 .../com/amazon/ec2/DeletePlacementGroup.java    |    323 -
 .../ec2/DeletePlacementGroupResponse.java       |    324 -
 .../ec2/DeletePlacementGroupResponseType.java   |    500 -
 .../amazon/ec2/DeletePlacementGroupType.java    |    425 -
 awsapi/src/com/amazon/ec2/DeleteRoute.java      |    322 -
 .../src/com/amazon/ec2/DeleteRouteResponse.java |    323 -
 .../com/amazon/ec2/DeleteRouteResponseType.java |    500 -
 awsapi/src/com/amazon/ec2/DeleteRouteTable.java |    323 -
 .../amazon/ec2/DeleteRouteTableResponse.java    |    323 -
 .../ec2/DeleteRouteTableResponseType.java       |    500 -
 .../com/amazon/ec2/DeleteRouteTableType.java    |    425 -
 awsapi/src/com/amazon/ec2/DeleteRouteType.java  |    507 -
 .../src/com/amazon/ec2/DeleteSecurityGroup.java |    323 -
 .../amazon/ec2/DeleteSecurityGroupResponse.java |    324 -
 .../ec2/DeleteSecurityGroupResponseType.java    |    500 -
 .../com/amazon/ec2/DeleteSecurityGroupType.java |    541 -
 awsapi/src/com/amazon/ec2/DeleteSnapshot.java   |    323 -
 .../com/amazon/ec2/DeleteSnapshotResponse.java  |    323 -
 .../amazon/ec2/DeleteSnapshotResponseType.java  |    500 -
 .../src/com/amazon/ec2/DeleteSnapshotType.java  |    425 -
 .../ec2/DeleteSpotDatafeedSubscription.java     |    324 -
 .../DeleteSpotDatafeedSubscriptionResponse.java |    324 -
 ...eteSpotDatafeedSubscriptionResponseType.java |    500 -
 .../ec2/DeleteSpotDatafeedSubscriptionType.java |    336 -
 awsapi/src/com/amazon/ec2/DeleteSubnet.java     |    322 -
 .../com/amazon/ec2/DeleteSubnetResponse.java    |    323 -
 .../amazon/ec2/DeleteSubnetResponseType.java    |    500 -
 awsapi/src/com/amazon/ec2/DeleteSubnetType.java |    425 -
 awsapi/src/com/amazon/ec2/DeleteTags.java       |    322 -
 .../src/com/amazon/ec2/DeleteTagsResponse.java  |    323 -
 .../com/amazon/ec2/DeleteTagsResponseType.java  |    500 -
 .../com/amazon/ec2/DeleteTagsSetItemType.java   |    537 -
 .../src/com/amazon/ec2/DeleteTagsSetType.java   |    491 -
 awsapi/src/com/amazon/ec2/DeleteTagsType.java   |    447 -
 awsapi/src/com/amazon/ec2/DeleteVolume.java     |    322 -
 .../com/amazon/ec2/DeleteVolumeResponse.java    |    323 -
 .../amazon/ec2/DeleteVolumeResponseType.java    |    500 -
 awsapi/src/com/amazon/ec2/DeleteVolumeType.java |    425 -
 awsapi/src/com/amazon/ec2/DeleteVpc.java        |    322 -
 .../src/com/amazon/ec2/DeleteVpcResponse.java   |    323 -
 .../com/amazon/ec2/DeleteVpcResponseType.java   |    500 -
 awsapi/src/com/amazon/ec2/DeleteVpcType.java    |    425 -
 .../src/com/amazon/ec2/DeleteVpnConnection.java |    323 -
 .../amazon/ec2/DeleteVpnConnectionResponse.java |    324 -
 .../ec2/DeleteVpnConnectionResponseType.java    |    500 -
 .../amazon/ec2/DeleteVpnConnectionRoute.java    |    323 -
 .../ec2/DeleteVpnConnectionRouteResponse.java   |    324 -
 .../DeleteVpnConnectionRouteResponseType.java   |    500 -
 .../ec2/DeleteVpnConnectionRouteType.java       |    507 -
 .../com/amazon/ec2/DeleteVpnConnectionType.java |    425 -
 awsapi/src/com/amazon/ec2/DeleteVpnGateway.java |    323 -
 .../amazon/ec2/DeleteVpnGatewayResponse.java    |    323 -
 .../ec2/DeleteVpnGatewayResponseType.java       |    500 -
 .../com/amazon/ec2/DeleteVpnGatewayType.java    |    425 -
 awsapi/src/com/amazon/ec2/DeregisterImage.java  |    323 -
 .../com/amazon/ec2/DeregisterImageResponse.java |    323 -
 .../amazon/ec2/DeregisterImageResponseType.java |    500 -
 .../src/com/amazon/ec2/DeregisterImageType.java |    425 -
 .../src/com/amazon/ec2/DescribeAddresses.java   |    323 -
 .../amazon/ec2/DescribeAddressesInfoType.java   |    491 -
 .../amazon/ec2/DescribeAddressesItemType.java   |    425 -
 .../amazon/ec2/DescribeAddressesResponse.java   |    324 -
 .../ec2/DescribeAddressesResponseInfoType.java  |    491 -
 .../ec2/DescribeAddressesResponseItemType.java  |   1087 -
 .../ec2/DescribeAddressesResponseType.java      |    477 -
 .../com/amazon/ec2/DescribeAddressesType.java   |    513 -
 .../amazon/ec2/DescribeAvailabilityZones.java   |    324 -
 .../ec2/DescribeAvailabilityZonesResponse.java  |    324 -
 .../DescribeAvailabilityZonesResponseType.java  |    477 -
 .../DescribeAvailabilityZonesSetItemType.java   |    425 -
 .../ec2/DescribeAvailabilityZonesSetType.java   |    491 -
 .../ec2/DescribeAvailabilityZonesType.java      |    461 -
 .../src/com/amazon/ec2/DescribeBundleTasks.java |    323 -
 .../amazon/ec2/DescribeBundleTasksInfoType.java |    491 -
 .../amazon/ec2/DescribeBundleTasksItemType.java |    425 -
 .../amazon/ec2/DescribeBundleTasksResponse.java |    324 -
 .../ec2/DescribeBundleTasksResponseType.java    |    478 -
 .../com/amazon/ec2/DescribeBundleTasksType.java |    461 -
 .../com/amazon/ec2/DescribeConversionTasks.java |    323 -
 .../ec2/DescribeConversionTasksResponse.java    |    324 -
 .../DescribeConversionTasksResponseType.java    |    477 -
 .../amazon/ec2/DescribeConversionTasksType.java |    395 -
 .../amazon/ec2/DescribeCustomerGateways.java    |    323 -
 .../ec2/DescribeCustomerGatewaysResponse.java   |    324 -
 .../DescribeCustomerGatewaysResponseType.java   |    477 -
 .../ec2/DescribeCustomerGatewaysType.java       |    477 -
 .../src/com/amazon/ec2/DescribeDhcpOptions.java |    323 -
 .../amazon/ec2/DescribeDhcpOptionsResponse.java |    324 -
 .../ec2/DescribeDhcpOptionsResponseType.java    |    477 -
 .../com/amazon/ec2/DescribeDhcpOptionsType.java |    477 -
 .../src/com/amazon/ec2/DescribeExportTasks.java |    323 -
 .../amazon/ec2/DescribeExportTasksResponse.java |    324 -
 .../ec2/DescribeExportTasksResponseType.java    |    477 -
 .../com/amazon/ec2/DescribeExportTasksType.java |    395 -
 .../com/amazon/ec2/DescribeImageAttribute.java  |    323 -
 .../ec2/DescribeImageAttributeResponse.java     |    324 -
 .../ec2/DescribeImageAttributeResponseType.java |    552 -
 ...eImageAttributeResponseTypeChoice_type0.java |    693 -
 .../amazon/ec2/DescribeImageAttributeType.java  |    470 -
 .../ec2/DescribeImageAttributesGroup.java       |    759 -
 awsapi/src/com/amazon/ec2/DescribeImages.java   |    323 -
 .../ec2/DescribeImagesExecutableBySetType.java  |    491 -
 .../ec2/DescribeImagesExecutableByType.java     |    425 -
 .../com/amazon/ec2/DescribeImagesInfoType.java  |    491 -
 .../com/amazon/ec2/DescribeImagesItemType.java  |    425 -
 .../com/amazon/ec2/DescribeImagesOwnerType.java |    425 -
 .../amazon/ec2/DescribeImagesOwnersType.java    |    491 -
 .../com/amazon/ec2/DescribeImagesResponse.java  |    323 -
 .../ec2/DescribeImagesResponseInfoType.java     |    491 -
 .../ec2/DescribeImagesResponseItemType.java     |   2190 -
 .../amazon/ec2/DescribeImagesResponseType.java  |    477 -
 .../src/com/amazon/ec2/DescribeImagesType.java  |    594 -
 .../amazon/ec2/DescribeInstanceAttribute.java   |    324 -
 .../ec2/DescribeInstanceAttributeResponse.java  |    324 -
 .../DescribeInstanceAttributeResponseType.java  |    552 -
 ...stanceAttributeResponseTypeChoice_type0.java |   1093 -
 .../ec2/DescribeInstanceAttributeType.java      |    470 -
 .../ec2/DescribeInstanceAttributesGroup.java    |   1092 -
 .../com/amazon/ec2/DescribeInstanceStatus.java  |    323 -
 .../ec2/DescribeInstanceStatusResponse.java     |    324 -
 .../ec2/DescribeInstanceStatusResponseType.java |    573 -
 .../amazon/ec2/DescribeInstanceStatusType.java  |    742 -
 .../src/com/amazon/ec2/DescribeInstances.java   |    323 -
 .../amazon/ec2/DescribeInstancesInfoType.java   |    491 -
 .../amazon/ec2/DescribeInstancesItemType.java   |    425 -
 .../amazon/ec2/DescribeInstancesResponse.java   |    324 -
 .../ec2/DescribeInstancesResponseType.java      |    477 -
 .../com/amazon/ec2/DescribeInstancesType.java   |    461 -
 .../amazon/ec2/DescribeInternetGateways.java    |    323 -
 .../ec2/DescribeInternetGatewaysResponse.java   |    324 -
 .../DescribeInternetGatewaysResponseType.java   |    477 -
 .../ec2/DescribeInternetGatewaysType.java       |    461 -
 awsapi/src/com/amazon/ec2/DescribeKeyPairs.java |    323 -
 .../amazon/ec2/DescribeKeyPairsInfoType.java    |    491 -
 .../amazon/ec2/DescribeKeyPairsItemType.java    |    425 -
 .../amazon/ec2/DescribeKeyPairsResponse.java    |    323 -
 .../ec2/DescribeKeyPairsResponseInfoType.java   |    491 -
 .../ec2/DescribeKeyPairsResponseItemType.java   |    507 -
 .../ec2/DescribeKeyPairsResponseType.java       |    477 -
 .../com/amazon/ec2/DescribeKeyPairsType.java    |    461 -
 awsapi/src/com/amazon/ec2/DescribeLicenses.java |    323 -
 .../amazon/ec2/DescribeLicensesResponse.java    |    323 -
 .../ec2/DescribeLicensesResponseType.java       |    477 -
 .../com/amazon/ec2/DescribeLicensesType.java    |    477 -
 .../src/com/amazon/ec2/DescribeNetworkAcls.java |    323 -
 .../amazon/ec2/DescribeNetworkAclsResponse.java |    324 -
 .../ec2/DescribeNetworkAclsResponseType.java    |    477 -
 .../com/amazon/ec2/DescribeNetworkAclsType.java |    461 -
 .../ec2/DescribeNetworkInterfaceAttribute.java  |    324 -
 ...scribeNetworkInterfaceAttributeResponse.java |    324 -
 ...beNetworkInterfaceAttributeResponseType.java |    552 -
 ...erfaceAttributeResponseTypeChoice_type0.java |    562 -
 .../DescribeNetworkInterfaceAttributeType.java  |    470 -
 ...DescribeNetworkInterfaceAttributesGroup.java |    561 -
 .../amazon/ec2/DescribeNetworkInterfaces.java   |    324 -
 .../ec2/DescribeNetworkInterfacesResponse.java  |    324 -
 .../DescribeNetworkInterfacesResponseType.java  |    477 -
 .../ec2/DescribeNetworkInterfacesType.java      |    478 -
 .../ec2/DescribePlacementGroupItemType.java     |    425 -
 .../com/amazon/ec2/DescribePlacementGroups.java |    323 -
 .../ec2/DescribePlacementGroupsInfoType.java    |    491 -
 .../ec2/DescribePlacementGroupsResponse.java    |    324 -
 .../DescribePlacementGroupsResponseType.java    |    477 -
 .../amazon/ec2/DescribePlacementGroupsType.java |    461 -
 awsapi/src/com/amazon/ec2/DescribeRegions.java  |    323 -
 .../com/amazon/ec2/DescribeRegionsResponse.java |    323 -
 .../amazon/ec2/DescribeRegionsResponseType.java |    477 -
 .../amazon/ec2/DescribeRegionsSetItemType.java  |    425 -
 .../com/amazon/ec2/DescribeRegionsSetType.java  |    491 -
 .../src/com/amazon/ec2/DescribeRegionsType.java |    461 -
 .../amazon/ec2/DescribeReservedInstances.java   |    324 -
 ...ribeReservedInstancesListingSetItemType.java |    426 -
 ...DescribeReservedInstancesListingSetType.java |    477 -
 .../ec2/DescribeReservedInstancesListings.java  |    324 -
 ...scribeReservedInstancesListingsResponse.java |    324 -
 ...vedInstancesListingsResponseSetItemType.java |   1104 -
 ...eservedInstancesListingsResponseSetType.java |    493 -
 ...beReservedInstancesListingsResponseType.java |    479 -
 .../DescribeReservedInstancesListingsType.java  |    546 -
 .../ec2/DescribeReservedInstancesOfferings.java |    324 -
 ...cribeReservedInstancesOfferingsResponse.java |    324 -
 ...edInstancesOfferingsResponseSetItemType.java |   1353 -
 ...servedInstancesOfferingsResponseSetType.java |    493 -
 ...eReservedInstancesOfferingsResponseType.java |    575 -
 ...beReservedInstancesOfferingsSetItemType.java |    426 -
 ...scribeReservedInstancesOfferingsSetType.java |    492 -
 .../DescribeReservedInstancesOfferingsType.java |   1524 -
 .../ec2/DescribeReservedInstancesResponse.java  |    324 -
 ...ibeReservedInstancesResponseSetItemType.java |   1519 -
 ...escribeReservedInstancesResponseSetType.java |    492 -
 .../DescribeReservedInstancesResponseType.java  |    477 -
 .../DescribeReservedInstancesSetItemType.java   |    425 -
 .../ec2/DescribeReservedInstancesSetType.java   |    491 -
 .../ec2/DescribeReservedInstancesType.java      |    574 -
 .../src/com/amazon/ec2/DescribeRouteTables.java |    323 -
 .../amazon/ec2/DescribeRouteTablesResponse.java |    324 -
 .../ec2/DescribeRouteTablesResponseType.java    |    477 -
 .../com/amazon/ec2/DescribeRouteTablesType.java |    461 -
 .../com/amazon/ec2/DescribeSecurityGroups.java  |    323 -
 .../DescribeSecurityGroupsIdSetItemType.java    |    425 -
 .../ec2/DescribeSecurityGroupsIdSetType.java    |    491 -
 .../ec2/DescribeSecurityGroupsResponse.java     |    324 -
 .../ec2/DescribeSecurityGroupsResponseType.java |    477 -
 .../ec2/DescribeSecurityGroupsSetItemType.java  |    425 -
 .../ec2/DescribeSecurityGroupsSetType.java      |    491 -
 .../amazon/ec2/DescribeSecurityGroupsType.java  |    528 -
 .../amazon/ec2/DescribeSnapshotAttribute.java   |    324 -
 .../ec2/DescribeSnapshotAttributeResponse.java  |    324 -
 .../DescribeSnapshotAttributeResponseType.java  |    552 -
 ...apshotAttributeResponseTypeChoice_type0.java |    431 -
 .../ec2/DescribeSnapshotAttributeType.java      |    470 -
 .../ec2/DescribeSnapshotAttributesGroup.java    |    430 -
 .../src/com/amazon/ec2/DescribeSnapshots.java   |    323 -
 .../amazon/ec2/DescribeSnapshotsOwnerType.java  |    425 -
 .../amazon/ec2/DescribeSnapshotsOwnersType.java |    491 -
 .../amazon/ec2/DescribeSnapshotsResponse.java   |    324 -
 .../ec2/DescribeSnapshotsResponseType.java      |    477 -
 .../DescribeSnapshotsRestorableBySetType.java   |    491 -
 .../ec2/DescribeSnapshotsRestorableByType.java  |    425 -
 .../DescribeSnapshotsSetItemResponseType.java   |   1177 -
 .../ec2/DescribeSnapshotsSetItemType.java       |    425 -
 .../ec2/DescribeSnapshotsSetResponseType.java   |    491 -
 .../amazon/ec2/DescribeSnapshotsSetType.java    |    491 -
 .../com/amazon/ec2/DescribeSnapshotsType.java   |    595 -
 .../ec2/DescribeSpotDatafeedSubscription.java   |    324 -
 ...escribeSpotDatafeedSubscriptionResponse.java |    324 -
 ...ibeSpotDatafeedSubscriptionResponseType.java |    478 -
 .../DescribeSpotDatafeedSubscriptionType.java   |    336 -
 .../ec2/DescribeSpotInstanceRequests.java       |    324 -
 .../DescribeSpotInstanceRequestsResponse.java   |    324 -
 ...escribeSpotInstanceRequestsResponseType.java |    478 -
 .../ec2/DescribeSpotInstanceRequestsType.java   |    462 -
 .../amazon/ec2/DescribeSpotPriceHistory.java    |    323 -
 .../ec2/DescribeSpotPriceHistoryResponse.java   |    324 -
 .../DescribeSpotPriceHistoryResponseType.java   |    573 -
 .../ec2/DescribeSpotPriceHistoryType.java       |   1030 -
 awsapi/src/com/amazon/ec2/DescribeSubnets.java  |    323 -
 .../com/amazon/ec2/DescribeSubnetsResponse.java |    323 -
 .../amazon/ec2/DescribeSubnetsResponseType.java |    477 -
 .../src/com/amazon/ec2/DescribeSubnetsType.java |    477 -
 awsapi/src/com/amazon/ec2/DescribeTags.java     |    322 -
 .../com/amazon/ec2/DescribeTagsResponse.java    |    323 -
 .../amazon/ec2/DescribeTagsResponseType.java    |    477 -
 awsapi/src/com/amazon/ec2/DescribeTagsType.java |    410 -
 .../com/amazon/ec2/DescribeVolumeAttribute.java |    323 -
 .../ec2/DescribeVolumeAttributeResponse.java    |    324 -
 .../DescribeVolumeAttributeResponseType.java    |    552 -
 ...VolumeAttributeResponseTypeChoice_type0.java |    430 -
 .../amazon/ec2/DescribeVolumeAttributeType.java |    470 -
 .../ec2/DescribeVolumeAttributesGroup.java      |    429 -
 .../com/amazon/ec2/DescribeVolumeStatus.java    |    323 -
 .../ec2/DescribeVolumeStatusResponse.java       |    324 -
 .../ec2/DescribeVolumeStatusResponseType.java   |    573 -
 .../amazon/ec2/DescribeVolumeStatusType.java    |    655 -
 awsapi/src/com/amazon/ec2/DescribeVolumes.java  |    323 -
 .../com/amazon/ec2/DescribeVolumesResponse.java |    323 -
 .../amazon/ec2/DescribeVolumesResponseType.java |    477 -
 .../ec2/DescribeVolumesSetItemResponseType.java |   1126 -
 .../amazon/ec2/DescribeVolumesSetItemType.java  |    425 -
 .../ec2/DescribeVolumesSetResponseType.java     |    491 -
 .../com/amazon/ec2/DescribeVolumesSetType.java  |    491 -
 .../src/com/amazon/ec2/DescribeVolumesType.java |    461 -
 awsapi/src/com/amazon/ec2/DescribeVpcs.java     |    322 -
 .../com/amazon/ec2/DescribeVpcsResponse.java    |    323 -
 .../amazon/ec2/DescribeVpcsResponseType.java    |    477 -
 awsapi/src/com/amazon/ec2/DescribeVpcsType.java |    477 -
 .../com/amazon/ec2/DescribeVpnConnections.java  |    323 -
 .../ec2/DescribeVpnConnectionsResponse.java     |    324 -
 .../ec2/DescribeVpnConnectionsResponseType.java |    477 -
 .../amazon/ec2/DescribeVpnConnectionsType.java  |    477 -
 .../src/com/amazon/ec2/DescribeVpnGateways.java |    323 -
 .../amazon/ec2/DescribeVpnGatewaysResponse.java |    324 -
 .../ec2/DescribeVpnGatewaysResponseType.java    |    477 -
 .../com/amazon/ec2/DescribeVpnGatewaysType.java |    477 -
 .../com/amazon/ec2/DetachInternetGateway.java   |    323 -
 .../ec2/DetachInternetGatewayResponse.java      |    324 -
 .../ec2/DetachInternetGatewayResponseType.java  |    500 -
 .../amazon/ec2/DetachInternetGatewayType.java   |    507 -
 .../com/amazon/ec2/DetachNetworkInterface.java  |    323 -
 .../ec2/DetachNetworkInterfaceResponse.java     |    324 -
 .../ec2/DetachNetworkInterfaceResponseType.java |    500 -
 .../amazon/ec2/DetachNetworkInterfaceType.java  |    515 -
 awsapi/src/com/amazon/ec2/DetachVolume.java     |    322 -
 .../com/amazon/ec2/DetachVolumeResponse.java    |    323 -
 .../amazon/ec2/DetachVolumeResponseType.java    |    835 -
 awsapi/src/com/amazon/ec2/DetachVolumeType.java |    709 -
 awsapi/src/com/amazon/ec2/DetachVpnGateway.java |    323 -
 .../amazon/ec2/DetachVpnGatewayResponse.java    |    323 -
 .../ec2/DetachVpnGatewayResponseType.java       |    500 -
 .../com/amazon/ec2/DetachVpnGatewayType.java    |    507 -
 .../ec2/DhcpConfigurationItemSetType.java       |    491 -
 .../amazon/ec2/DhcpConfigurationItemType.java   |    477 -
 .../amazon/ec2/DhcpOptionsIdSetItemType.java    |    425 -
 .../com/amazon/ec2/DhcpOptionsIdSetType.java    |    491 -
 .../src/com/amazon/ec2/DhcpOptionsSetType.java  |    491 -
 awsapi/src/com/amazon/ec2/DhcpOptionsType.java  |    543 -
 awsapi/src/com/amazon/ec2/DhcpValueSetType.java |    491 -
 awsapi/src/com/amazon/ec2/DhcpValueType.java    |    425 -
 .../amazon/ec2/DisableVgwRoutePropagation.java  |    324 -
 .../DisableVgwRoutePropagationRequestType.java  |    507 -
 .../ec2/DisableVgwRoutePropagationResponse.java |    324 -
 .../DisableVgwRoutePropagationResponseType.java |    500 -
 .../src/com/amazon/ec2/DisassociateAddress.java |    323 -
 .../amazon/ec2/DisassociateAddressResponse.java |    324 -
 .../ec2/DisassociateAddressResponseType.java    |    500 -
 .../com/amazon/ec2/DisassociateAddressType.java |    542 -
 .../com/amazon/ec2/DisassociateRouteTable.java  |    323 -
 .../ec2/DisassociateRouteTableResponse.java     |    324 -
 .../ec2/DisassociateRouteTableResponseType.java |    500 -
 .../amazon/ec2/DisassociateRouteTableType.java  |    425 -
 .../amazon/ec2/DiskImageDescriptionType.java    |    678 -
 .../src/com/amazon/ec2/DiskImageDetailType.java |    582 -
 awsapi/src/com/amazon/ec2/DiskImageSetType.java |    491 -
 awsapi/src/com/amazon/ec2/DiskImageType.java    |    542 -
 .../ec2/DiskImageVolumeDescriptionType.java     |    507 -
 .../src/com/amazon/ec2/DiskImageVolumeType.java |    425 -
 .../src/com/amazon/ec2/EbsBlockDeviceType.java  |    814 -
 ...sInstanceBlockDeviceMappingResponseType.java |    679 -
 awsapi/src/com/amazon/ec2/EmptyElementType.java |    336 -
 .../amazon/ec2/EnableVgwRoutePropagation.java   |    324 -
 .../EnableVgwRoutePropagationRequestType.java   |    507 -
 .../ec2/EnableVgwRoutePropagationResponse.java  |    324 -
 .../EnableVgwRoutePropagationResponseType.java  |    500 -
 awsapi/src/com/amazon/ec2/EnableVolumeIO.java   |    323 -
 .../com/amazon/ec2/EnableVolumeIOResponse.java  |    323 -
 .../amazon/ec2/EnableVolumeIOResponseType.java  |    500 -
 .../src/com/amazon/ec2/EnableVolumeIOType.java  |    425 -
 .../src/com/amazon/ec2/ExportTaskIdSetType.java |    491 -
 awsapi/src/com/amazon/ec2/ExportTaskIdType.java |    425 -
 .../com/amazon/ec2/ExportTaskResponseType.java  |    787 -
 .../ec2/ExportTaskResponseTypeChoice_type0.java |    363 -
 .../ec2/ExportTaskResponseTypeChoice_type1.java |    363 -
 .../amazon/ec2/ExportTaskSetResponseType.java   |    491 -
 .../amazon/ec2/ExportToS3TaskResponseType.java  |    684 -
 .../src/com/amazon/ec2/ExportToS3TaskType.java  |    700 -
 awsapi/src/com/amazon/ec2/ExtensionMapper.java  |   3579 -
 awsapi/src/com/amazon/ec2/FilterSetType.java    |    490 -
 awsapi/src/com/amazon/ec2/FilterType.java       |    477 -
 awsapi/src/com/amazon/ec2/GetConsoleOutput.java |    323 -
 .../amazon/ec2/GetConsoleOutputResponse.java    |    323 -
 .../ec2/GetConsoleOutputResponseType.java       |    671 -
 .../com/amazon/ec2/GetConsoleOutputType.java    |    425 -
 awsapi/src/com/amazon/ec2/GetPasswordData.java  |    323 -
 .../com/amazon/ec2/GetPasswordDataResponse.java |    323 -
 .../amazon/ec2/GetPasswordDataResponseType.java |    671 -
 .../src/com/amazon/ec2/GetPasswordDataType.java |    425 -
 awsapi/src/com/amazon/ec2/GroupItemType.java    |    537 -
 awsapi/src/com/amazon/ec2/GroupSetType.java     |    491 -
 .../ec2/IamInstanceProfileRequestType.java      |    537 -
 .../ec2/IamInstanceProfileResponseType.java     |    507 -
 awsapi/src/com/amazon/ec2/IcmpTypeCodeType.java |    493 -
 awsapi/src/com/amazon/ec2/ImportInstance.java   |    323 -
 .../amazon/ec2/ImportInstanceGroupItemType.java |    537 -
 .../amazon/ec2/ImportInstanceGroupSetType.java  |    491 -
 .../ImportInstanceLaunchSpecificationType.java  |   1064 -
 .../com/amazon/ec2/ImportInstanceResponse.java  |    323 -
 .../amazon/ec2/ImportInstanceResponseType.java  |    477 -
 .../ec2/ImportInstanceTaskDetailsType.java      |    685 -
 .../src/com/amazon/ec2/ImportInstanceType.java  |    714 -
 .../ec2/ImportInstanceVolumeDetailItemType.java |    877 -
 .../ec2/ImportInstanceVolumeDetailSetType.java  |    491 -
 awsapi/src/com/amazon/ec2/ImportKeyPair.java    |    323 -
 .../com/amazon/ec2/ImportKeyPairResponse.java   |    323 -
 .../amazon/ec2/ImportKeyPairResponseType.java   |    589 -
 .../src/com/amazon/ec2/ImportKeyPairType.java   |    507 -
 awsapi/src/com/amazon/ec2/ImportVolume.java     |    322 -
 .../com/amazon/ec2/ImportVolumeResponse.java    |    323 -
 .../amazon/ec2/ImportVolumeResponseType.java    |    477 -
 .../amazon/ec2/ImportVolumeTaskDetailsType.java |    699 -
 awsapi/src/com/amazon/ec2/ImportVolumeType.java |    624 -
 .../ec2/InstanceBlockDeviceMappingItemType.java |    470 -
 ...eBlockDeviceMappingItemTypeChoice_type0.java |    525 -
 ...tanceBlockDeviceMappingResponseItemType.java |    470 -
 ...viceMappingResponseItemTypeChoice_type0.java |    364 -
 .../InstanceBlockDeviceMappingResponseType.java |    492 -
 .../ec2/InstanceBlockDeviceMappingType.java     |    491 -
 .../amazon/ec2/InstanceCountsSetItemType.java   |    500 -
 .../com/amazon/ec2/InstanceCountsSetType.java   |    476 -
 .../amazon/ec2/InstanceEbsBlockDeviceType.java  |    515 -
 .../ec2/InstanceExportTaskResponseType.java     |    521 -
 .../src/com/amazon/ec2/InstanceIdSetType.java   |    491 -
 awsapi/src/com/amazon/ec2/InstanceIdType.java   |    425 -
 .../amazon/ec2/InstanceLicenseRequestType.java  |    425 -
 .../amazon/ec2/InstanceLicenseResponseType.java |    425 -
 .../amazon/ec2/InstanceMonitoringStateType.java |    425 -
 ...InstanceNetworkInterfaceAssociationType.java |    521 -
 .../InstanceNetworkInterfaceAttachmentType.java |    739 -
 ...tanceNetworkInterfaceSetItemRequestType.java |   1124 -
 .../InstanceNetworkInterfaceSetItemType.java    |   1414 -
 .../InstanceNetworkInterfaceSetRequestType.java |    492 -
 .../ec2/InstanceNetworkInterfaceSetType.java    |    491 -
 .../com/amazon/ec2/InstancePlacementType.java   |    537 -
 .../InstancePrivateIpAddressesSetItemType.java  |    598 -
 .../ec2/InstancePrivateIpAddressesSetType.java  |    491 -
 .../amazon/ec2/InstanceStateChangeSetType.java  |    491 -
 .../com/amazon/ec2/InstanceStateChangeType.java |    529 -
 .../src/com/amazon/ec2/InstanceStateType.java   |    500 -
 .../ec2/InstanceStatusDetailsSetItemType.java   |    603 -
 .../ec2/InstanceStatusDetailsSetType.java       |    491 -
 .../com/amazon/ec2/InstanceStatusEventType.java |    685 -
 .../amazon/ec2/InstanceStatusEventsSetType.java |    491 -
 .../com/amazon/ec2/InstanceStatusItemType.java  |    728 -
 .../com/amazon/ec2/InstanceStatusSetType.java   |    491 -
 .../src/com/amazon/ec2/InstanceStatusType.java  |    491 -
 .../com/amazon/ec2/InstanceTypeSetItemType.java |    425 -
 .../src/com/amazon/ec2/InstanceTypeSetType.java |    476 -
 .../ec2/InternetGatewayAttachmentSetType.java   |    491 -
 .../ec2/InternetGatewayAttachmentType.java      |    507 -
 .../ec2/InternetGatewayIdSetItemType.java       |    425 -
 .../amazon/ec2/InternetGatewayIdSetType.java    |    491 -
 .../com/amazon/ec2/InternetGatewaySetType.java  |    491 -
 .../src/com/amazon/ec2/InternetGatewayType.java |    543 -
 .../src/com/amazon/ec2/IpPermissionSetType.java |    491 -
 awsapi/src/com/amazon/ec2/IpPermissionType.java |    713 -
 awsapi/src/com/amazon/ec2/IpRangeItemType.java  |    425 -
 awsapi/src/com/amazon/ec2/IpRangeSetType.java   |    491 -
 .../amazon/ec2/LaunchPermissionItemType.java    |    541 -
 .../amazon/ec2/LaunchPermissionListType.java    |    491 -
 .../ec2/LaunchPermissionOperationType.java      |    481 -
 .../ec2/LaunchSpecificationRequestType.java     |   1532 -
 .../ec2/LaunchSpecificationResponseType.java    |   1465 -
 .../amazon/ec2/LicenseCapacitySetItemType.java  |    672 -
 .../com/amazon/ec2/LicenseCapacitySetType.java  |    491 -
 .../com/amazon/ec2/LicenseIdSetItemType.java    |    425 -
 awsapi/src/com/amazon/ec2/LicenseIdSetType.java |    491 -
 .../src/com/amazon/ec2/LicenseSetItemType.java  |    707 -
 awsapi/src/com/amazon/ec2/LicenseSetType.java   |    491 -
 .../com/amazon/ec2/ModifyImageAttribute.java    |    323 -
 .../ec2/ModifyImageAttributeResponse.java       |    324 -
 .../ec2/ModifyImageAttributeResponseType.java   |    500 -
 .../amazon/ec2/ModifyImageAttributeType.java    |    470 -
 .../ModifyImageAttributeTypeChoice_type0.java   |    495 -
 .../com/amazon/ec2/ModifyInstanceAttribute.java |    323 -
 .../ec2/ModifyInstanceAttributeResponse.java    |    324 -
 .../ModifyInstanceAttributeResponseType.java    |    500 -
 .../amazon/ec2/ModifyInstanceAttributeType.java |    470 -
 ...ModifyInstanceAttributeTypeChoice_type0.java |    960 -
 .../ModifyNetworkInterfaceAttachmentType.java   |    500 -
 .../ec2/ModifyNetworkInterfaceAttribute.java    |    324 -
 ...ModifyNetworkInterfaceAttributeResponse.java |    324 -
 ...fyNetworkInterfaceAttributeResponseType.java |    500 -
 .../ModifyNetworkInterfaceAttributeType.java    |    470 -
 ...tworkInterfaceAttributeTypeChoice_type0.java |    562 -
 .../com/amazon/ec2/ModifySnapshotAttribute.java |    323 -
 .../ec2/ModifySnapshotAttributeResponse.java    |    324 -
 .../ModifySnapshotAttributeResponseType.java    |    500 -
 .../amazon/ec2/ModifySnapshotAttributeType.java |    478 -
 .../com/amazon/ec2/ModifyVolumeAttribute.java   |    323 -
 .../ec2/ModifyVolumeAttributeResponse.java      |    324 -
 .../ec2/ModifyVolumeAttributeResponseType.java  |    500 -
 .../amazon/ec2/ModifyVolumeAttributeType.java   |    470 -
 .../ModifyVolumeAttributeTypeChoice_type0.java  |    363 -
 awsapi/src/com/amazon/ec2/MonitorInstances.java |    323 -
 .../amazon/ec2/MonitorInstancesResponse.java    |    323 -
 .../MonitorInstancesResponseSetItemType.java    |    477 -
 .../ec2/MonitorInstancesResponseSetType.java    |    476 -
 .../ec2/MonitorInstancesResponseType.java       |    477 -
 .../amazon/ec2/MonitorInstancesSetItemType.java |    425 -
 .../com/amazon/ec2/MonitorInstancesSetType.java |    476 -
 .../com/amazon/ec2/MonitorInstancesType.java    |    395 -
 .../com/amazon/ec2/MonitoringInstanceType.java  |    434 -
 .../ec2/NetworkAclAssociationSetType.java       |    491 -
 .../amazon/ec2/NetworkAclAssociationType.java   |    590 -
 .../com/amazon/ec2/NetworkAclEntrySetType.java  |    491 -
 .../src/com/amazon/ec2/NetworkAclEntryType.java |    872 -
 .../com/amazon/ec2/NetworkAclIdSetItemType.java |    425 -
 .../src/com/amazon/ec2/NetworkAclIdSetType.java |    491 -
 .../src/com/amazon/ec2/NetworkAclSetType.java   |    491 -
 awsapi/src/com/amazon/ec2/NetworkAclType.java   |    752 -
 .../ec2/NetworkInterfaceAssociationType.java    |    715 -
 .../ec2/NetworkInterfaceAttachmentType.java     |    931 -
 .../ec2/NetworkInterfaceIdSetItemType.java      |    425 -
 .../amazon/ec2/NetworkInterfaceIdSetType.java   |    491 -
 ...kInterfacePrivateIpAddressesSetItemType.java |    566 -
 ...tworkInterfacePrivateIpAddressesSetType.java |    492 -
 .../com/amazon/ec2/NetworkInterfaceSetType.java |    491 -
 .../com/amazon/ec2/NetworkInterfaceType.java    |   1815 -
 .../ec2/NullableAttributeBooleanValueType.java  |    434 -
 .../amazon/ec2/NullableAttributeValueType.java  |    440 -
 .../com/amazon/ec2/PlacementGroupInfoType.java  |    589 -
 .../com/amazon/ec2/PlacementGroupSetType.java   |    491 -
 .../com/amazon/ec2/PlacementRequestType.java    |    634 -
 .../com/amazon/ec2/PlacementResponseType.java   |    618 -
 awsapi/src/com/amazon/ec2/PortRangeType.java    |    493 -
 .../ec2/PriceScheduleRequestSetItemType.java    |    589 -
 .../amazon/ec2/PriceScheduleRequestSetType.java |    476 -
 .../amazon/ec2/PriceScheduleSetItemType.java    |    663 -
 .../com/amazon/ec2/PriceScheduleSetType.java    |    491 -
 .../amazon/ec2/PricingDetailsSetItemType.java   |    493 -
 .../com/amazon/ec2/PricingDetailsSetType.java   |    491 -
 .../PrivateIpAddressesSetItemRequestType.java   |    515 -
 .../ec2/PrivateIpAddressesSetRequestType.java   |    491 -
 .../src/com/amazon/ec2/ProductCodeItemType.java |    425 -
 .../src/com/amazon/ec2/ProductCodeListType.java |    491 -
 .../com/amazon/ec2/ProductCodesSetItemType.java |    507 -
 .../src/com/amazon/ec2/ProductCodesSetType.java |    491 -
 .../ec2/ProductDescriptionSetItemType.java      |    425 -
 .../amazon/ec2/ProductDescriptionSetType.java   |    476 -
 .../com/amazon/ec2/PropagatingVgwSetType.java   |    491 -
 .../src/com/amazon/ec2/PropagatingVgwType.java  |    425 -
 .../ec2/PurchaseReservedInstancesOffering.java  |    324 -
 ...rchaseReservedInstancesOfferingResponse.java |    324 -
 ...seReservedInstancesOfferingResponseType.java |    507 -
 .../PurchaseReservedInstancesOfferingType.java  |    567 -
 awsapi/src/com/amazon/ec2/RebootInstances.java  |    323 -
 .../com/amazon/ec2/RebootInstancesInfoType.java |    476 -
 .../com/amazon/ec2/RebootInstancesItemType.java |    425 -
 .../com/amazon/ec2/RebootInstancesResponse.java |    323 -
 .../amazon/ec2/RebootInstancesResponseType.java |    500 -
 .../src/com/amazon/ec2/RebootInstancesType.java |    395 -
 .../amazon/ec2/RecurringChargesSetItemType.java |    500 -
 .../com/amazon/ec2/RecurringChargesSetType.java |    491 -
 awsapi/src/com/amazon/ec2/RegionItemType.java   |    507 -
 awsapi/src/com/amazon/ec2/RegionSetType.java    |    491 -
 awsapi/src/com/amazon/ec2/RegisterImage.java    |    323 -
 .../com/amazon/ec2/RegisterImageResponse.java   |    323 -
 .../amazon/ec2/RegisterImageResponseType.java   |    507 -
 .../src/com/amazon/ec2/RegisterImageType.java   |   1072 -
 awsapi/src/com/amazon/ec2/ReleaseAddress.java   |    323 -
 .../com/amazon/ec2/ReleaseAddressResponse.java  |    323 -
 .../amazon/ec2/ReleaseAddressResponseType.java  |    500 -
 .../src/com/amazon/ec2/ReleaseAddressType.java  |    388 -
 .../ec2/ReleaseAddressTypeChoice_type0.java     |    489 -
 .../ec2/ReplaceNetworkAclAssociation.java       |    324 -
 .../ReplaceNetworkAclAssociationResponse.java   |    324 -
 ...eplaceNetworkAclAssociationResponseType.java |    507 -
 .../ec2/ReplaceNetworkAclAssociationType.java   |    507 -
 .../com/amazon/ec2/ReplaceNetworkAclEntry.java  |    323 -
 .../ec2/ReplaceNetworkAclEntryResponse.java     |    324 -
 .../ec2/ReplaceNetworkAclEntryResponseType.java |    500 -
 .../amazon/ec2/ReplaceNetworkAclEntryType.java  |    954 -
 awsapi/src/com/amazon/ec2/ReplaceRoute.java     |    322 -
 .../com/amazon/ec2/ReplaceRouteResponse.java    |    323 -
 .../amazon/ec2/ReplaceRouteResponseType.java    |    500 -
 .../ec2/ReplaceRouteTableAssociation.java       |    324 -
 .../ReplaceRouteTableAssociationResponse.java   |    324 -
 ...eplaceRouteTableAssociationResponseType.java |    507 -
 .../ec2/ReplaceRouteTableAssociationType.java   |    507 -
 awsapi/src/com/amazon/ec2/ReplaceRouteType.java |    552 -
 .../ec2/ReplaceRouteTypeChoice_type0.java       |    585 -
 .../com/amazon/ec2/ReportInstanceStatus.java    |    323 -
 ...portInstanceStatusReasonCodeSetItemType.java |    425 -
 .../ReportInstanceStatusReasonCodesSetType.java |    477 -
 .../ec2/ReportInstanceStatusResponse.java       |    324 -
 .../ec2/ReportInstanceStatusResponseType.java   |    500 -
 .../amazon/ec2/ReportInstanceStatusType.java    |    817 -
 .../com/amazon/ec2/RequestSpotInstances.java    |    323 -
 .../ec2/RequestSpotInstancesResponse.java       |    324 -
 .../ec2/RequestSpotInstancesResponseType.java   |    478 -
 .../amazon/ec2/RequestSpotInstancesType.java    |   1058 -
 .../src/com/amazon/ec2/ReservationInfoType.java |    707 -
 .../src/com/amazon/ec2/ReservationSetType.java  |    491 -
 .../ec2/ReservedInstanceLimitPriceType.java     |    514 -
 .../src/com/amazon/ec2/ResetImageAttribute.java |    323 -
 .../amazon/ec2/ResetImageAttributeResponse.java |    324 -
 .../ec2/ResetImageAttributeResponseType.java    |    500 -
 .../com/amazon/ec2/ResetImageAttributeType.java |    470 -
 .../amazon/ec2/ResetImageAttributesGroup.java   |    363 -
 .../com/amazon/ec2/ResetInstanceAttribute.java  |    323 -
 .../ec2/ResetInstanceAttributeResponse.java     |    324 -
 .../ec2/ResetInstanceAttributeResponseType.java |    500 -
 .../amazon/ec2/ResetInstanceAttributeType.java  |    470 -
 .../ec2/ResetInstanceAttributesGroup.java       |    495 -
 .../ec2/ResetNetworkInterfaceAttribute.java     |    324 -
 .../ResetNetworkInterfaceAttributeResponse.java |    324 -
 ...etNetworkInterfaceAttributeResponseType.java |    500 -
 .../ec2/ResetNetworkInterfaceAttributeType.java |    470 -
 .../ResetNetworkInterfaceAttributesGroup.java   |    363 -
 .../com/amazon/ec2/ResetSnapshotAttribute.java  |    323 -
 .../ec2/ResetSnapshotAttributeResponse.java     |    324 -
 .../ec2/ResetSnapshotAttributeResponseType.java |    500 -
 .../amazon/ec2/ResetSnapshotAttributeType.java  |    470 -
 .../ec2/ResetSnapshotAttributesGroup.java       |    364 -
 .../com/amazon/ec2/ResourceIdSetItemType.java   |    425 -
 .../src/com/amazon/ec2/ResourceIdSetType.java   |    491 -
 .../com/amazon/ec2/ResourceTagSetItemType.java  |    507 -
 .../src/com/amazon/ec2/ResourceTagSetType.java  |    491 -
 .../amazon/ec2/RevokeSecurityGroupEgress.java   |    324 -
 .../ec2/RevokeSecurityGroupEgressResponse.java  |    324 -
 .../RevokeSecurityGroupEgressResponseType.java  |    500 -
 .../ec2/RevokeSecurityGroupEgressType.java      |    477 -
 .../amazon/ec2/RevokeSecurityGroupIngress.java  |    324 -
 .../ec2/RevokeSecurityGroupIngressResponse.java |    324 -
 .../RevokeSecurityGroupIngressResponseType.java |    500 -
 .../ec2/RevokeSecurityGroupIngressType.java     |    536 -
 ...okeSecurityGroupIngressTypeChoice_type0.java |    489 -
 awsapi/src/com/amazon/ec2/RouteSetType.java     |    490 -
 .../ec2/RouteTableAssociationSetType.java       |    491 -
 .../amazon/ec2/RouteTableAssociationType.java   |    553 -
 .../RouteTableAssociationTypeChoice_type0.java  |    483 -
 .../com/amazon/ec2/RouteTableIdSetItemType.java |    425 -
 .../src/com/amazon/ec2/RouteTableIdSetType.java |    491 -
 .../src/com/amazon/ec2/RouteTableSetType.java   |    491 -
 awsapi/src/com/amazon/ec2/RouteTableType.java   |    729 -
 awsapi/src/com/amazon/ec2/RouteType.java        |    975 -
 awsapi/src/com/amazon/ec2/RunInstances.java     |    322 -
 .../com/amazon/ec2/RunInstancesResponse.java    |    323 -
 .../amazon/ec2/RunInstancesResponseType.java    |    789 -
 awsapi/src/com/amazon/ec2/RunInstancesType.java |   2036 -
 .../amazon/ec2/RunningInstancesItemType.java    |   3494 -
 .../com/amazon/ec2/RunningInstancesSetType.java |    476 -
 .../amazon/ec2/SecurityGroupIdSetItemType.java  |    425 -
 .../com/amazon/ec2/SecurityGroupIdSetType.java  |    491 -
 .../com/amazon/ec2/SecurityGroupItemType.java   |    951 -
 .../com/amazon/ec2/SecurityGroupSetType.java    |    491 -
 .../ec2/SpotDatafeedSubscriptionType.java       |    737 -
 .../ec2/SpotInstanceRequestIdSetItemType.java   |    426 -
 .../ec2/SpotInstanceRequestIdSetType.java       |    491 -
 .../ec2/SpotInstanceRequestSetItemType.java     |   1650 -
 .../amazon/ec2/SpotInstanceRequestSetType.java  |    491 -
 .../amazon/ec2/SpotInstanceStateFaultType.java  |    507 -
 .../amazon/ec2/SpotPlacementRequestType.java    |    537 -
 .../amazon/ec2/SpotPriceHistorySetItemType.java |    767 -
 .../com/amazon/ec2/SpotPriceHistorySetType.java |    491 -
 awsapi/src/com/amazon/ec2/StartInstances.java   |    323 -
 .../com/amazon/ec2/StartInstancesResponse.java  |    323 -
 .../amazon/ec2/StartInstancesResponseType.java  |    477 -
 .../src/com/amazon/ec2/StartInstancesType.java  |    395 -
 awsapi/src/com/amazon/ec2/StateReasonType.java  |    507 -
 awsapi/src/com/amazon/ec2/StopInstances.java    |    323 -
 .../com/amazon/ec2/StopInstancesResponse.java   |    323 -
 .../amazon/ec2/StopInstancesResponseType.java   |    477 -
 .../src/com/amazon/ec2/StopInstancesType.java   |    485 -
 .../src/com/amazon/ec2/SubnetIdSetItemType.java |    425 -
 awsapi/src/com/amazon/ec2/SubnetIdSetType.java  |    491 -
 awsapi/src/com/amazon/ec2/SubnetSetType.java    |    490 -
 awsapi/src/com/amazon/ec2/SubnetType.java       |    973 -
 awsapi/src/com/amazon/ec2/TagSetItemType.java   |    731 -
 awsapi/src/com/amazon/ec2/TagSetType.java       |    491 -
 .../src/com/amazon/ec2/TerminateInstances.java  |    323 -
 .../amazon/ec2/TerminateInstancesResponse.java  |    324 -
 .../ec2/TerminateInstancesResponseType.java     |    477 -
 .../com/amazon/ec2/TerminateInstancesType.java  |    395 -
 .../amazon/ec2/UnassignPrivateIpAddresses.java  |    324 -
 .../ec2/UnassignPrivateIpAddressesResponse.java |    324 -
 .../UnassignPrivateIpAddressesResponseType.java |    500 -
 .../ec2/UnassignPrivateIpAddressesType.java     |    478 -
 .../src/com/amazon/ec2/UnmonitorInstances.java  |    323 -
 .../amazon/ec2/UnmonitorInstancesResponse.java  |    324 -
 awsapi/src/com/amazon/ec2/UserDataType.java     |    551 -
 .../com/amazon/ec2/UserIdGroupPairSetType.java  |    491 -
 .../src/com/amazon/ec2/UserIdGroupPairType.java |    634 -
 awsapi/src/com/amazon/ec2/ValueSetType.java     |    490 -
 awsapi/src/com/amazon/ec2/ValueType.java        |    425 -
 awsapi/src/com/amazon/ec2/VgwTelemetryType.java |    491 -
 .../amazon/ec2/VolumeStatusActionItemType.java  |    671 -
 .../amazon/ec2/VolumeStatusActionsSetType.java  |    491 -
 .../amazon/ec2/VolumeStatusDetailsItemType.java |    507 -
 .../amazon/ec2/VolumeStatusDetailsSetType.java  |    491 -
 .../amazon/ec2/VolumeStatusEventItemType.java   |    753 -
 .../amazon/ec2/VolumeStatusEventsSetType.java   |    491 -
 .../com/amazon/ec2/VolumeStatusInfoType.java    |    477 -
 .../com/amazon/ec2/VolumeStatusItemType.java    |    663 -
 .../src/com/amazon/ec2/VolumeStatusSetType.java |    491 -
 awsapi/src/com/amazon/ec2/VpcIdSetItemType.java |    425 -
 awsapi/src/com/amazon/ec2/VpcIdSetType.java     |    491 -
 awsapi/src/com/amazon/ec2/VpcSetType.java       |    490 -
 awsapi/src/com/amazon/ec2/VpcType.java          |    879 -
 .../amazon/ec2/VpnConnectionIdSetItemType.java  |    425 -
 .../com/amazon/ec2/VpnConnectionIdSetType.java  |    491 -
 .../ec2/VpnConnectionOptionsRequestType.java    |    434 -
 .../ec2/VpnConnectionOptionsResponseType.java   |    434 -
 .../com/amazon/ec2/VpnConnectionSetType.java    |    491 -
 .../src/com/amazon/ec2/VpnConnectionType.java   |   1131 -
 .../com/amazon/ec2/VpnGatewayIdSetItemType.java |    425 -
 .../src/com/amazon/ec2/VpnGatewayIdSetType.java |    491 -
 .../src/com/amazon/ec2/VpnGatewaySetType.java   |    491 -
 awsapi/src/com/amazon/ec2/VpnGatewayType.java   |    802 -
 .../src/com/amazon/ec2/VpnStaticRouteType.java  |    589 -
 .../com/amazon/ec2/VpnStaticRoutesSetType.java  |    491 -
 .../com/amazon/ec2/VpnTunnelTelemetryType.java  |    759 -
 .../ec2/client/AmazonEC2CallbackHandler.java    |   2076 -
 .../com/amazon/ec2/client/AmazonEC2Stub.java    | 455651 ----------------
 awsapi/src/com/amazon/s3/AccessControlList.java |    494 -
 .../src/com/amazon/s3/AccessControlPolicy.java  |    447 -
 .../com/amazon/s3/AmazonCustomerByEmail.java    |    424 -
 .../amazon/s3/AmazonS3MessageReceiverInOut.java |   1130 -
 awsapi/src/com/amazon/s3/AmazonS3Skeleton.java  |    207 -
 .../amazon/s3/AmazonS3SkeletonInterface.java    |    162 -
 .../src/com/amazon/s3/BucketLoggingStatus.java  |    410 -
 awsapi/src/com/amazon/s3/CanonicalUser.java     |    520 -
 awsapi/src/com/amazon/s3/CopyObject.java        |   1958 -
 .../src/com/amazon/s3/CopyObjectResponse.java   |    392 -
 awsapi/src/com/amazon/s3/CopyObjectResult.java  |    507 -
 awsapi/src/com/amazon/s3/CreateBucket.java      |    779 -
 .../amazon/s3/CreateBucketConfiguration.java    |    395 -
 .../src/com/amazon/s3/CreateBucketResponse.java |    392 -
 .../src/com/amazon/s3/CreateBucketResult.java   |    425 -
 awsapi/src/com/amazon/s3/DeleteBucket.java      |    809 -
 .../src/com/amazon/s3/DeleteBucketResponse.java |    392 -
 awsapi/src/com/amazon/s3/DeleteMarkerEntry.java |    730 -
 awsapi/src/com/amazon/s3/DeleteObject.java      |    891 -
 .../src/com/amazon/s3/DeleteObjectResponse.java |    392 -
 awsapi/src/com/amazon/s3/ExtensionMapper.java   |    267 -
 .../amazon/s3/GetBucketAccessControlPolicy.java |    810 -
 .../GetBucketAccessControlPolicyResponse.java   |    395 -
 .../com/amazon/s3/GetBucketLoggingStatus.java   |    809 -
 .../s3/GetBucketLoggingStatusResponse.java      |    395 -
 awsapi/src/com/amazon/s3/GetObject.java         |   1116 -
 .../amazon/s3/GetObjectAccessControlPolicy.java |    892 -
 .../GetObjectAccessControlPolicyResponse.java   |    395 -
 awsapi/src/com/amazon/s3/GetObjectExtended.java |   1942 -
 .../amazon/s3/GetObjectExtendedResponse.java    |    392 -
 awsapi/src/com/amazon/s3/GetObjectResponse.java |    392 -
 awsapi/src/com/amazon/s3/GetObjectResult.java   |    771 -
 awsapi/src/com/amazon/s3/Grant.java             |    447 -
 awsapi/src/com/amazon/s3/Grantee.java           |    338 -
 awsapi/src/com/amazon/s3/Group.java             |    424 -
 awsapi/src/com/amazon/s3/ListAllMyBuckets.java  |    631 -
 .../com/amazon/s3/ListAllMyBucketsEntry.java    |    507 -
 .../src/com/amazon/s3/ListAllMyBucketsList.java |    491 -
 .../com/amazon/s3/ListAllMyBucketsResponse.java |    393 -
 .../com/amazon/s3/ListAllMyBucketsResult.java   |    447 -
 awsapi/src/com/amazon/s3/ListBucket.java        |   1193 -
 .../src/com/amazon/s3/ListBucketResponse.java   |    392 -
 awsapi/src/com/amazon/s3/ListBucketResult.java  |   1370 -
 awsapi/src/com/amazon/s3/ListEntry.java         |    781 -
 .../src/com/amazon/s3/ListVersionsResponse.java |    392 -
 .../src/com/amazon/s3/ListVersionsResult.java   |   1544 -
 .../s3/ListVersionsResultChoice_type0.java      |    429 -
 .../src/com/amazon/s3/LocationConstraint.java   |    422 -
 awsapi/src/com/amazon/s3/LoggingSettings.java   |    573 -
 awsapi/src/com/amazon/s3/MetadataDirective.java |    419 -
 awsapi/src/com/amazon/s3/MetadataEntry.java     |    507 -
 awsapi/src/com/amazon/s3/MfaDeleteStatus.java   |    419 -
 .../amazon/s3/NotificationConfiguration.java    |    492 -
 awsapi/src/com/amazon/s3/Payer.java             |    419 -
 awsapi/src/com/amazon/s3/Permission.java        |    431 -
 awsapi/src/com/amazon/s3/PostResponse.java      |    668 -
 awsapi/src/com/amazon/s3/PrefixEntry.java       |    425 -
 awsapi/src/com/amazon/s3/PutObject.java         |   1250 -
 awsapi/src/com/amazon/s3/PutObjectInline.java   |   1341 -
 .../com/amazon/s3/PutObjectInlineResponse.java  |    393 -
 awsapi/src/com/amazon/s3/PutObjectResponse.java |    392 -
 awsapi/src/com/amazon/s3/PutObjectResult.java   |    507 -
 .../amazon/s3/RequestPaymentConfiguration.java  |    395 -
 awsapi/src/com/amazon/s3/Result.java            |    395 -
 .../amazon/s3/SetBucketAccessControlPolicy.java |    877 -
 .../SetBucketAccessControlPolicyResponse.java   |    341 -
 .../com/amazon/s3/SetBucketLoggingStatus.java   |    860 -
 .../s3/SetBucketLoggingStatusResponse.java      |    341 -
 .../amazon/s3/SetObjectAccessControlPolicy.java |    944 -
 .../SetObjectAccessControlPolicyResponse.java   |    341 -
 awsapi/src/com/amazon/s3/Status.java            |    500 -
 awsapi/src/com/amazon/s3/StorageClass.java      |    419 -
 .../src/com/amazon/s3/TopicConfiguration.java   |    582 -
 awsapi/src/com/amazon/s3/User.java              |    337 -
 awsapi/src/com/amazon/s3/VersionEntry.java      |    938 -
 .../com/amazon/s3/VersioningConfiguration.java  |    477 -
 awsapi/src/com/amazon/s3/VersioningStatus.java  |    419 -
 .../s3/client/AmazonS3CallbackHandler.java      |    284 -
 .../src/com/amazon/s3/client/AmazonS3Stub.java  |  40003 --
 .../bridge/auth/ec2/AuthenticationHandler.java  |    145 -
 .../bridge/auth/ec2/AuthenticationModule.java   |     51 -
 awsapi/src/com/cloud/bridge/auth/ec2/module.xml |     35 -
 .../bridge/auth/s3/AuthenticationHandler.java   |    200 -
 .../bridge/auth/s3/AuthenticationModule.java    |     53 -
 awsapi/src/com/cloud/bridge/auth/s3/module.xml  |     35 -
 .../bridge/io/DimeDelimitedInputStream.java     |    565 -
 .../cloud/bridge/io/FileRangeDataSource.java    |     59 -
 .../cloud/bridge/io/FileRangeInputStream.java   |     94 -
 .../bridge/io/MTOMAwareResultStreamWriter.java  |    142 -
 .../bridge/io/MultiPartDimeInputStream.java     |    152 -
 .../cloud/bridge/io/S3CAStorBucketAdapter.java  |    484 -
 .../bridge/io/S3FileSystemBucketAdapter.java    |    244 -
 .../lifecycle/ServiceEngineLifecycle.java       |     52 -
 .../com/cloud/bridge/model/BucketPolicyVO.java  |     84 -
 .../cloud/bridge/model/CloudStackAccountVO.java |     49 -
 .../bridge/model/CloudStackConfigurationVO.java |     45 -
 .../model/CloudStackServiceOfferingVO.java      |     65 -
 .../cloud/bridge/model/CloudStackUserVO.java    |     49 -
 .../com/cloud/bridge/model/MHostMountVO.java    |    135 -
 awsapi/src/com/cloud/bridge/model/MHostVO.java  |    137 -
 .../cloud/bridge/model/MultiPartPartsVO.java    |    122 -
 .../cloud/bridge/model/MultiPartUploadsVO.java  |    110 -
 .../com/cloud/bridge/model/MultipartMetaVO.java |     72 -
 .../cloud/bridge/model/OfferingBundleVO.java    |     60 -
 awsapi/src/com/cloud/bridge/model/SAcl.java     |    142 -
 awsapi/src/com/cloud/bridge/model/SAclVO.java   |    243 -
 awsapi/src/com/cloud/bridge/model/SBucket.java  |    122 -
 .../src/com/cloud/bridge/model/SBucketVO.java   |    164 -
 awsapi/src/com/cloud/bridge/model/SHost.java    |    116 -
 awsapi/src/com/cloud/bridge/model/SHostVO.java  |    152 -
 awsapi/src/com/cloud/bridge/model/SMetaVO.java  |    112 -
 .../com/cloud/bridge/model/SObjectItemVO.java   |    191 -
 .../src/com/cloud/bridge/model/SObjectVO.java   |    238 -
 .../cloud/bridge/model/UserCredentialsVO.java   |    119 -
 .../com/cloud/bridge/persist/dao/BaseDao.java   |     52 -
 .../bridge/persist/dao/BucketPolicyDao.java     |     28 -
 .../bridge/persist/dao/BucketPolicyDaoImpl.java |     75 -
 .../persist/dao/CloudStackAccountDao.java       |     25 -
 .../persist/dao/CloudStackAccountDaoImpl.java   |     56 -
 .../persist/dao/CloudStackConfigurationDao.java |     25 -
 .../dao/CloudStackConfigurationDaoImpl.java     |     62 -
 .../persist/dao/CloudStackSvcOfferingDao.java   |     28 -
 .../dao/CloudStackSvcOfferingDaoImpl.java       |     76 -
 .../bridge/persist/dao/CloudStackUserDao.java   |     26 -
 .../persist/dao/CloudStackUserDaoImpl.java      |     64 -
 .../com/cloud/bridge/persist/dao/MHostDao.java  |     28 -
 .../cloud/bridge/persist/dao/MHostDaoImpl.java  |     65 -
 .../cloud/bridge/persist/dao/MHostMountDao.java |     26 -
 .../bridge/persist/dao/MHostMountDaoImpl.java   |     52 -
 .../bridge/persist/dao/MultiPartPartsDao.java   |     34 -
 .../persist/dao/MultiPartPartsDaoImpl.java      |    118 -
 .../bridge/persist/dao/MultiPartUploadsDao.java |     35 -
 .../persist/dao/MultiPartUploadsDaoImpl.java    |    122 -
 .../bridge/persist/dao/MultipartLoadDao.java    |    349 -
 .../bridge/persist/dao/MultipartMetaDao.java    |     28 -
 .../persist/dao/MultipartMetaDaoImpl.java       |     52 -
 .../cloud/bridge/persist/dao/OfferingDao.java   |     34 -
 .../bridge/persist/dao/OfferingDaoImpl.java     |    135 -
 .../com/cloud/bridge/persist/dao/SAclDao.java   |     37 -
 .../cloud/bridge/persist/dao/SAclDaoImpl.java   |    130 -
 .../cloud/bridge/persist/dao/SBucketDao.java    |     30 -
 .../bridge/persist/dao/SBucketDaoImpl.java      |     73 -
 .../com/cloud/bridge/persist/dao/SHostDao.java  |     28 -
 .../cloud/bridge/persist/dao/SHostDaoImpl.java  |     71 -
 .../com/cloud/bridge/persist/dao/SMetaDao.java  |     33 -
 .../cloud/bridge/persist/dao/SMetaDaoImpl.java  |     92 -
 .../cloud/bridge/persist/dao/SObjectDao.java    |     33 -
 .../bridge/persist/dao/SObjectDaoImpl.java      |    120 -
 .../bridge/persist/dao/SObjectItemDao.java      |     30 -
 .../bridge/persist/dao/SObjectItemDaoImpl.java  |     73 -
 .../bridge/persist/dao/UserCredentialsDao.java  |     28 -
 .../persist/dao/UserCredentialsDaoImpl.java     |     74 -
 .../cloud/bridge/service/EC2MainServlet.java    |    141 -
 .../cloud/bridge/service/EC2RestServlet.java    |   2210 -
 .../cloud/bridge/service/EC2SoapService.java    |   1089 -
 .../bridge/service/EC2SoapServiceImpl.java      |   3230 -
 .../com/cloud/bridge/service/S3Constants.java   |     24 -
 .../com/cloud/bridge/service/S3RestServlet.java |    827 -
 .../com/cloud/bridge/service/UserContext.java   |    109 -
 .../src/com/cloud/bridge/service/UserInfo.java  |     59 -
 .../service/controller/s3/S3BucketAction.java   |   1057 -
 .../service/controller/s3/S3ObjectAction.java   |   1205 -
 .../s3/S3SerializableServiceImplementation.java |    714 -
 .../service/controller/s3/ServiceProvider.java  |    386 -
 .../service/controller/s3/ServletAction.java    |     27 -
 .../cloud/bridge/service/core/ec2/Account.java  |     58 -
 .../bridge/service/core/ec2/DiskOffer.java      |     84 -
 .../bridge/service/core/ec2/DiskOfferings.java  |     36 -
 .../bridge/service/core/ec2/EC2Address.java     |     43 -
 .../service/core/ec2/EC2AddressFilterSet.java   |    105 -
 .../service/core/ec2/EC2AssociateAddress.java   |     46 -
 .../ec2/EC2AuthorizeRevokeSecurityGroup.java    |     46 -
 .../service/core/ec2/EC2AvailabilityZone.java   |     55 -
 .../core/ec2/EC2AvailabilityZonesFilterSet.java |    100 -
 .../bridge/service/core/ec2/EC2CreateImage.java |     54 -
 .../core/ec2/EC2CreateImageResponse.java        |     34 -
 .../service/core/ec2/EC2CreateKeyPair.java      |     44 -
 .../service/core/ec2/EC2CreateVolume.java       |     75 -
 .../service/core/ec2/EC2DeleteKeyPair.java      |     45 -
 .../service/core/ec2/EC2DescribeAddresses.java  |     59 -
 .../core/ec2/EC2DescribeAddressesResponse.java  |     36 -
 .../core/ec2/EC2DescribeAvailabilityZones.java  |     46 -
 .../EC2DescribeAvailabilityZonesResponse.java   |     36 -
 .../core/ec2/EC2DescribeImageAttribute.java     |     45 -
 .../service/core/ec2/EC2DescribeImages.java     |     64 -
 .../core/ec2/EC2DescribeImagesResponse.java     |     36 -
 .../service/core/ec2/EC2DescribeInstances.java  |     54 -
 .../core/ec2/EC2DescribeInstancesResponse.java  |     36 -
 .../service/core/ec2/EC2DescribeKeyPairs.java   |     59 -
 .../core/ec2/EC2DescribeKeyPairsResponse.java   |     45 -
 .../core/ec2/EC2DescribeSecurityGroups.java     |     45 -
 .../ec2/EC2DescribeSecurityGroupsResponse.java  |     36 -
 .../service/core/ec2/EC2DescribeSnapshots.java  |     54 -
 .../core/ec2/EC2DescribeSnapshotsResponse.java  |     36 -
 .../service/core/ec2/EC2DescribeTags.java       |     34 -
 .../core/ec2/EC2DescribeTagsResponse.java       |     37 -
 .../service/core/ec2/EC2DescribeVolumes.java    |     54 -
 .../core/ec2/EC2DescribeVolumesResponse.java    |     40 -
 .../core/ec2/EC2DisassociateAddress.java        |     44 -
 .../bridge/service/core/ec2/EC2Engine.java      |   2876 -
 .../bridge/service/core/ec2/EC2Filter.java      |     59 -
 .../service/core/ec2/EC2GroupFilterSet.java     |    218 -
 .../cloud/bridge/service/core/ec2/EC2Image.java |    146 -
 .../service/core/ec2/EC2ImageAttributes.java    |     81 -
 .../service/core/ec2/EC2ImageFilterSet.java     |    168 -
 .../core/ec2/EC2ImageLaunchPermission.java      |     52 -
 .../service/core/ec2/EC2ImportKeyPair.java      |     62 -
 .../bridge/service/core/ec2/EC2Instance.java    |    221 -
 .../service/core/ec2/EC2InstanceFilterSet.java  |    252 -
 .../service/core/ec2/EC2IpPermission.java       |    121 -
 .../service/core/ec2/EC2KeyPairFilterSet.java   |    105 -
 .../core/ec2/EC2ModifyImageAttribute.java       |     76 -
 .../core/ec2/EC2ModifyInstanceAttribute.java    |     63 -
 .../service/core/ec2/EC2PasswordData.java       |     40 -
 .../service/core/ec2/EC2RebootInstances.java    |     36 -
 .../service/core/ec2/EC2RegisterImage.java      |    100 -
 .../service/core/ec2/EC2ReleaseAddress.java     |     42 -
 .../bridge/service/core/ec2/EC2ResourceTag.java |     64 -
 .../service/core/ec2/EC2RunInstances.java       |    138 -
 .../core/ec2/EC2RunInstancesResponse.java       |     36 -
 .../bridge/service/core/ec2/EC2SSHKeyPair.java  |     58 -
 .../service/core/ec2/EC2SecurityGroup.java      |    104 -
 .../bridge/service/core/ec2/EC2Snapshot.java    |    130 -
 .../service/core/ec2/EC2SnapshotFilterSet.java  |    186 -
 .../service/core/ec2/EC2StartInstances.java     |     36 -
 .../core/ec2/EC2StartInstancesResponse.java     |     37 -
 .../service/core/ec2/EC2StopInstances.java      |     56 -
 .../core/ec2/EC2StopInstancesResponse.java      |     36 -
 .../bridge/service/core/ec2/EC2TagKeyValue.java |     44 -
 .../bridge/service/core/ec2/EC2TagTypeId.java   |     47 -
 .../cloud/bridge/service/core/ec2/EC2Tags.java  |     43 -
 .../service/core/ec2/EC2TagsFilterSet.java      |    107 -
 .../bridge/service/core/ec2/EC2Volume.java      |    261 -
 .../service/core/ec2/EC2VolumeFilterSet.java    |    257 -
 .../core/ec2/IpForwardingRuleResponse.java      |     98 -
 .../bridge/service/core/ec2/OfferingBundle.java |     36 -
 .../bridge/service/core/ec2/ServiceOffer.java   |     88 -
 .../service/core/ec2/ServiceOfferings.java      |     37 -
 .../service/core/s3/S3AccessControlList.java    |     42 -
 .../service/core/s3/S3AccessControlPolicy.java  |     42 -
 .../bridge/service/core/s3/S3AuthParams.java    |     56 -
 .../bridge/service/core/s3/S3BucketAdapter.java |     42 -
 .../bridge/service/core/s3/S3BucketPolicy.java  |    162 -
 .../bridge/service/core/s3/S3CanonicalUser.java |     47 -
 .../service/core/s3/S3ConditionFactory.java     |    180 -
 .../service/core/s3/S3ConditionalHeaders.java   |    191 -
 .../service/core/s3/S3CopyObjectRequest.java    |    128 -
 .../service/core/s3/S3CopyObjectResponse.java   |     67 -
 .../core/s3/S3CreateBucketConfiguration.java    |     40 -
 .../service/core/s3/S3CreateBucketRequest.java  |     60 -
 .../service/core/s3/S3CreateBucketResponse.java |     33 -
 .../service/core/s3/S3DeleteBucketRequest.java  |     33 -
 .../service/core/s3/S3DeleteObjectRequest.java  |     52 -
 .../cloud/bridge/service/core/s3/S3Engine.java  |   1825 -
 .../S3GetBucketAccessControlPolicyRequest.java  |     33 -
 .../S3GetObjectAccessControlPolicyRequest.java  |     51 -
 .../service/core/s3/S3GetObjectRequest.java     |    116 -
 .../service/core/s3/S3GetObjectResponse.java    |     92 -
 .../cloud/bridge/service/core/s3/S3Grant.java   |     81 -
 .../service/core/s3/S3HostCallingFormat.java    |    149 -
 .../core/s3/S3ListAllMyBucketsEntry.java        |     53 -
 .../core/s3/S3ListAllMyBucketsRequest.java      |     23 -
 .../core/s3/S3ListAllMyBucketsResponse.java     |     43 -
 .../core/s3/S3ListBucketObjectEntry.java        |    139 -
 .../core/s3/S3ListBucketPrefixEntry.java        |     36 -
 .../service/core/s3/S3ListBucketRequest.java    |     78 -
 .../service/core/s3/S3ListBucketResponse.java   |    122 -
 .../bridge/service/core/s3/S3MetaDataEntry.java |     41 -
 .../bridge/service/core/s3/S3MultipartPart.java |     70 -
 .../service/core/s3/S3MultipartUpload.java      |     70 -
 .../bridge/service/core/s3/S3PolicyAction.java  |    135 -
 .../service/core/s3/S3PolicyArnCondition.java   |    152 -
 .../service/core/s3/S3PolicyBoolCondition.java  |    124 -
 .../service/core/s3/S3PolicyCondition.java      |    124 -
 .../service/core/s3/S3PolicyConditionBlock.java |     78 -
 .../bridge/service/core/s3/S3PolicyContext.java |    108 -
 .../service/core/s3/S3PolicyDateCondition.java  |    177 -
 .../core/s3/S3PolicyIPAddressCondition.java     |    146 -
 .../core/s3/S3PolicyNumericCondition.java       |    167 -
 .../service/core/s3/S3PolicyPrincipal.java      |     65 -
 .../service/core/s3/S3PolicyStatement.java      |    165 -
 .../core/s3/S3PolicyStringCondition.java        |    163 -
 .../core/s3/S3PutObjectInlineRequest.java       |    107 -
 .../core/s3/S3PutObjectInlineResponse.java      |     65 -
 .../service/core/s3/S3PutObjectRequest.java     |    107 -
 .../service/core/s3/S3PutObjectResponse.java    |     44 -
 .../cloud/bridge/service/core/s3/S3Request.java |     52 -
 .../bridge/service/core/s3/S3Response.java      |     55 -
 .../S3SetBucketAccessControlPolicyRequest.java  |     42 -
 .../S3SetObjectAccessControlPolicyRequest.java  |     60 -
 .../exception/ConfigurationException.java       |     36 -
 .../service/exception/EC2ServiceException.java  |    169 -
 .../exception/FileNotExistException.java        |     36 -
 .../exception/HostNotMountedException.java      |     36 -
 .../exception/InternalErrorException.java       |     36 -
 .../service/exception/InvalidBucketName.java    |     37 -
 .../InvalidRequestContentException.java         |     36 -
 .../service/exception/NetworkIOException.java   |     36 -
 .../exception/NoSuchObjectException.java        |     37 -
 .../exception/ObjectAlreadyExistsException.java |     36 -
 .../exception/OutOfServiceException.java        |     36 -
 .../exception/OutOfStorageException.java        |     36 -
 .../exception/PermissionDeniedException.java    |     36 -
 .../service/exception/UnsupportedException.java |     36 -
 .../com/cloud/bridge/tool/CloudS3CmdTool.java   |    322 -
 .../cloud/bridge/util/AuthenticationUtils.java  |     47 -
 .../cloud/bridge/util/CalendarDateParam.java    |     31 -
 .../cloud/bridge/util/ConfigurationHelper.java  |     97 -
 awsapi/src/com/cloud/bridge/util/Converter.java |     66 -
 .../src/com/cloud/bridge/util/CryptoHelper.java |     20 -
 .../bridge/util/DatabindingConverterUtil.java   |     59 -
 .../src/com/cloud/bridge/util/DateHelper.java   |     92 -
 .../src/com/cloud/bridge/util/EC2RestAuth.java  |    284 -
 .../src/com/cloud/bridge/util/EntityParam.java  |     29 -
 .../src/com/cloud/bridge/util/HeaderParam.java  |     49 -
 .../util/ISO8601SimpleDateTimeFormat.java       |    341 -
 .../com/cloud/bridge/util/IpAddressRange.java   |    128 -
 .../com/cloud/bridge/util/IteratorHelper.java   |     54 -
 .../src/com/cloud/bridge/util/JsonAccessor.java |    248 -
 awsapi/src/com/cloud/bridge/util/NetHelper.java |     95 -
 .../src/com/cloud/bridge/util/OrderedPair.java  |     52 -
 .../src/com/cloud/bridge/util/PolicyParser.java |    356 -
 awsapi/src/com/cloud/bridge/util/RestAuth.java  |    408 -
 .../src/com/cloud/bridge/util/S3SoapAuth.java   |     70 -
 .../bridge/util/ServletRequestDataSource.java   |     59 -
 .../src/com/cloud/bridge/util/StringHelper.java |    125 -
 awsapi/src/com/cloud/bridge/util/TextParam.java |     29 -
 awsapi/src/com/cloud/bridge/util/TimeParam.java |     31 -
 .../com/cloud/bridge/util/TimestampParam.java   |     31 -
 awsapi/src/com/cloud/bridge/util/Triple.java    |     64 -
 awsapi/src/com/cloud/bridge/util/XElement.java  |     34 -
 awsapi/src/com/cloud/bridge/util/XFlatten.java  |     28 -
 awsapi/src/com/cloud/bridge/util/XOmitNull.java |     28 -
 .../com/cloud/bridge/util/XSerializable.java    |     27 -
 .../src/com/cloud/bridge/util/XSerializer.java  |    489 -
 .../cloud/bridge/util/XSerializerAdapter.java   |     32 -
 .../bridge/util/XSerializerJsonAdapter.java     |    162 -
 .../bridge/util/XSerializerXmlAdapter.java      |    170 -
 awsapi/src/com/cloud/bridge/util/XmlHelper.java |    172 -
 awsapi/src/com/cloud/stack/CloudStackApi.java   |   2603 -
 .../src/com/cloud/stack/CloudStackClient.java   |    198 -
 .../src/com/cloud/stack/CloudStackCommand.java  |    149 -
 .../com/cloud/stack/models/ApiConstants.java    |    518 -
 .../cloud/stack/models/CloudStackAccount.java   |    285 -
 .../stack/models/CloudStackCapabilities.java    |     57 -
 .../stack/models/CloudStackConfiguration.java   |     71 -
 .../stack/models/CloudStackDiskOffering.java    |     92 -
 .../com/cloud/stack/models/CloudStackEvent.java |    130 -
 .../cloud/stack/models/CloudStackEventType.java |     37 -
 .../stack/models/CloudStackExtractTemplate.java |    147 -
 .../stack/models/CloudStackIdentifier.java      |     51 -
 .../stack/models/CloudStackInfoResponse.java    |     59 -
 .../stack/models/CloudStackIngressRule.java     |     88 -
 .../stack/models/CloudStackInstanceGroup.java   |     85 -
 .../cloud/stack/models/CloudStackIpAddress.java |    152 -
 .../cloud/stack/models/CloudStackKeyPair.java   |     58 -
 .../cloud/stack/models/CloudStackKeyValue.java  |     57 -
 .../models/CloudStackLoadBalancerRule.java      |    148 -
 .../cloud/stack/models/CloudStackNetwork.java   |    311 -
 .../stack/models/CloudStackNetworkOffering.java |    139 -
 .../stack/models/CloudStackNetworkService.java  |     57 -
 .../CloudStackNetworkServiceCapability.java     |     47 -
 .../com/cloud/stack/models/CloudStackNic.java   |    105 -
 .../stack/models/CloudStackOsCategory.java      |     48 -
 .../cloud/stack/models/CloudStackOsType.java    |     56 -
 .../stack/models/CloudStackPasswordData.java    |     41 -
 .../models/CloudStackPortForwardingRule.java    |    148 -
 .../stack/models/CloudStackResourceLimit.java   |     55 -
 .../stack/models/CloudStackResourceTag.java     |     50 -
 .../stack/models/CloudStackSecurityGroup.java   |     88 -
 .../models/CloudStackSecurityGroupIngress.java  |    111 -
 .../stack/models/CloudStackServiceOffering.java |    196 -
 .../cloud/stack/models/CloudStackSnapshot.java  |    118 -
 .../stack/models/CloudStackSnapshotPolicy.java  |     85 -
 .../cloud/stack/models/CloudStackTemplate.java  |    319 -
 .../models/CloudStackTemplatePermission.java    |     68 -
 .../com/cloud/stack/models/CloudStackUser.java  |    157 -
 .../cloud/stack/models/CloudStackUserVm.java    |    415 -
 .../cloud/stack/models/CloudStackVolume.java    |    315 -
 .../com/cloud/stack/models/CloudStackZone.java  |    178 -
 .../com/cloud/gate/service/ServiceTestCase.java |     79 -
 .../com/cloud/gate/testcase/BaseTestCase.java   |     57 -
 .../gate/util/CloudStackClientTestCase.java     |     72 -
 .../cloud/gate/util/JsonAccessorTestCase.java   |     69 -
 .../test/com/cloud/gate/util/UtilTestCase.java  |    187 -
 .../com/cloud/gate/util/Xml2JavaTestData.xml    |     54 -
 awsapi/test/html/certSubmit.html                |     37 -
 awsapi/test/html/testRestURL.txt                |     44 -
 awsapi/web/web.xml                              |    156 -
 client/tomcatconf/db.properties.in              |      7 -
 client/tomcatconf/log4j-cloud.xml.in            |     27 -
 debian/cloudstack-awsapi.install                |     26 -
 debian/control                                  |      5 -
 debian/rules                                    |     24 +-
 developer/pom.xml                               |     17 +-
 .../snapshot/test/resources/db.properties       |      3 -
 .../com/cloud/utils/db/TransactionLegacy.java   |     38 -
 .../com/cloud/utils/db/TestTransaction.java     |      3 -
 framework/db/test/db.properties                 |      7 -
 framework/jobs/test/resources/db.properties     |      3 -
 packaging/centos63/cloud.spec                   |     92 +-
 packaging/centos63/replace.properties           |      2 -
 packaging/debian/replace.properties             |      2 -
 .../resources/components-example.xml            |     26 -
 .../globodns/test/resources/db.properties       |      7 -
 .../contrail/management/TestDbSetup.java        |      4 -
 .../test/resources/db.properties                |      3 -
 pom.xml                                         |      9 +-
 server/test/resources/db.properties             |      3 -
 .../iam/plugin/test/resources/db.properties     |      7 -
 .../iam/server/test/resources/db.properties     |      7 -
 setup/bindir/cloud-setup-databases.in           |     20 -
 tools/eclipse/eclipse.epf                       |      2 +-
 tools/whisker/LICENSE                           |   2518 -
 tools/whisker/descriptor-for-packaging.xml      |    151 -
 usage/test/resources/db.properties              |      3 -
 utils/conf/db.properties                        |      7 -
 1361 files changed, 19 insertions(+), 1049221 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 59a8427..7baf042 100644
--- a/README.md
+++ b/README.md
@@ -132,5 +132,4 @@ The following provides more details on the included cryptographic software:
 * CloudStack has a system requirement of MySQL, and uses native database encryption functionality.
 * CloudStack makes use of the Bouncy Castle general-purpose encryption library.
 * CloudStack can optionally interacts with and controls OpenSwan-based VPNs.
-* CloudStack has a dependency on Apache WSS4J as part of the AWSAPI implementation.
 * CloudStack has a dependency on and makes use of JSch - a java SSH2 implementation.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/cloudbridge_bucketpolicy.sql
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/cloudbridge_bucketpolicy.sql b/awsapi-setup/db/mysql/cloudbridge_bucketpolicy.sql
deleted file mode 100644
index 44019f1..0000000
--- a/awsapi-setup/db/mysql/cloudbridge_bucketpolicy.sql
+++ /dev/null
@@ -1,45 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
--- 
---   http://www.apache.org/licenses/LICENSE-2.0
--- 
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-
-USE cloudbridge;
-
--- This file (and cloudbridge_policy_alter.sql) can be applied to an existing cloudbridge 
--- database.   It is used to manage defined bucket access policies.
---
-SET foreign_key_checks = 0;
-
-DROP TABLE IF EXISTS bucket_policies;
-
--- 1) Amazon S3 only allows one policy to be defined for a bucket.
--- 2) The maximum size of a policy is 20 KB.
--- 3) A bucket policy has to be able to exist even before the bucket itself (e.g., to
---    support "CreateBucket" actions).
---
-CREATE TABLE bucket_policies (
-	ID BIGINT NOT NULL AUTO_INCREMENT,
-	
-	BucketName VARCHAR(64) NOT NULL,
-	OwnerCanonicalID VARCHAR(150) NOT NULL,
-	
-	Policy VARCHAR(20000) NOT NULL,  -- policies are written in JSON 
-
-	PRIMARY KEY(ID)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-SET foreign_key_checks = 1;
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/awsapi-setup/db/mysql/cloudbridge_db.sql
----------------------------------------------------------------------
diff --git a/awsapi-setup/db/mysql/cloudbridge_db.sql b/awsapi-setup/db/mysql/cloudbridge_db.sql
deleted file mode 100644
index 952a34d..0000000
--- a/awsapi-setup/db/mysql/cloudbridge_db.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
--- 
---   http://www.apache.org/licenses/LICENSE-2.0
--- 
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-
-SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI';
-
-DROP DATABASE IF EXISTS cloudbridge;
-CREATE DATABASE cloudbridge;
-  
-GRANT ALL ON cloudbridge.* to cloud@`localhost` identified by 'cloud';
-GRANT ALL ON cloudbridge.* to cloud@`%` identified by 'cloud';
-
-GRANT process ON *.* TO `cloud`@`localhost`;
-GRANT process ON *.* TO `cloud`@`%`;
-
-COMMIT;


[15/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f10e7d8..0000000
--- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index cac97b6..0000000
--- a/awsapi/src/com/amazon/ec2/CreateInternetGatewayType.java
+++ /dev/null
@@ -1,336 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f276110..0000000
--- a/awsapi/src/com/amazon/ec2/CreateKeyPair.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateKeyPair bean class
-*/
-
-public class CreateKeyPair 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/", "CreateKeyPair", "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 CreateKeyPair
-    */
-
-    protected com.amazon.ec2.CreateKeyPairType localCreateKeyPair;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateKeyPairType
-    */
-    public com.amazon.ec2.CreateKeyPairType getCreateKeyPair() {
-        return localCreateKeyPair;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateKeyPair
-       */
-    public void setCreateKeyPair(com.amazon.ec2.CreateKeyPairType param) {
-
-        this.localCreateKeyPair = 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 {
-                CreateKeyPair.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 (localCreateKeyPair == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateKeyPair.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 localCreateKeyPair.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 CreateKeyPair parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateKeyPair object = new CreateKeyPair();
-
-            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/", "CreateKeyPair").equals(reader.getName())) {
-
-                            object.setCreateKeyPair(com.amazon.ec2.CreateKeyPairType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index e35b801..0000000
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateKeyPairResponse bean class
-*/
-
-public class CreateKeyPairResponse 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/", "CreateKeyPairResponse", "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 CreateKeyPairResponse
-    */
-
-    protected com.amazon.ec2.CreateKeyPairResponseType localCreateKeyPairResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateKeyPairResponseType
-    */
-    public com.amazon.ec2.CreateKeyPairResponseType getCreateKeyPairResponse() {
-        return localCreateKeyPairResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateKeyPairResponse
-       */
-    public void setCreateKeyPairResponse(com.amazon.ec2.CreateKeyPairResponseType param) {
-
-        this.localCreateKeyPairResponse = 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 {
-                CreateKeyPairResponse.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 (localCreateKeyPairResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateKeyPairResponse.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 localCreateKeyPairResponse.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 CreateKeyPairResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateKeyPairResponse object = new CreateKeyPairResponse();
-
-            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/", "CreateKeyPairResponse").equals(reader.getName())) {
-
-                            object.setCreateKeyPairResponse(com.amazon.ec2.CreateKeyPairResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 5275429..0000000
--- a/awsapi/src/com/amazon/ec2/CreateKeyPairResponseType.java
+++ /dev/null
@@ -1,671 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateKeyPairResponseType bean class
-*/
-
-public class CreateKeyPairResponseType 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/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 KeyName
-    */
-
-    protected java.lang.String localKeyName;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getKeyName() {
-        return localKeyName;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param KeyName
-       */
-    public void setKeyName(java.lang.String param) {
-
-        this.localKeyName = param;
-
-    }
-
-    /**
-    * field for KeyFingerprint
-    */
-
-    protected java.lang.String localKeyFingerprint;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getKeyFingerprint() {
-        return localKeyFingerprint;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param KeyFingerprint
-       */
-    public void setKeyFingerprint(java.lang.String param) {
-
-        this.localKeyFingerprint = param;
-
-    }
-
-    /**
-    * field for KeyMaterial
-    */
-
-    protected java.lang.String localKeyMaterial;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getKeyMaterial() {
-        return localKeyMaterial;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param KeyMaterial
-       */
-    public void setKeyMaterial(java.lang.String param) {
-
-        this.localKeyMaterial = 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 {
-                CreateKeyPairResponseType.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 + ":CreateKeyPairResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateKeyPairResponseType", 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, "keyName", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "keyName");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("keyName");
-        }
-
-        if (localKeyName == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("keyName cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localKeyName);
-
-        }
-
-        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, "keyFingerprint", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "keyFingerprint");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("keyFingerprint");
-        }
-
-        if (localKeyFingerprint == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("keyFingerprint cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localKeyFingerprint);
-
-        }
-
-        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, "keyMaterial", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "keyMaterial");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("keyMaterial");
-        }
-
-        if (localKeyMaterial == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("keyMaterial cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localKeyMaterial);
-
-        }
-
-        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/", "keyName"));
-
-        if (localKeyName != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localKeyName));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("keyName cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "keyFingerprint"));
-
-        if (localKeyFingerprint != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localKeyFingerprint));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("keyFingerprint cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "keyMaterial"));
-
-        if (localKeyMaterial != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localKeyMaterial));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("keyMaterial 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 CreateKeyPairResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateKeyPairResponseType object = new CreateKeyPairResponseType();
-
-            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 (!"CreateKeyPairResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateKeyPairResponseType)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/", "keyName").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setKeyName(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/", "keyFingerprint").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setKeyFingerprint(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/", "keyMaterial").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setKeyMaterial(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
-
-}


[19/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index ed7a135..0000000
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateCustomerGatewayResponseType bean class
-*/
-
-public class CreateCustomerGatewayResponseType 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/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 CustomerGateway
-    */
-
-    protected com.amazon.ec2.CustomerGatewayType localCustomerGateway;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CustomerGatewayType
-    */
-    public com.amazon.ec2.CustomerGatewayType getCustomerGateway() {
-        return localCustomerGateway;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CustomerGateway
-       */
-    public void setCustomerGateway(com.amazon.ec2.CustomerGatewayType param) {
-
-        this.localCustomerGateway = 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 {
-                CreateCustomerGatewayResponseType.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 + ":CreateCustomerGatewayResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateCustomerGatewayResponseType", 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 (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/2012-08-15/", "customerGateway"), 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/", "customerGateway"));
-
-        if (localCustomerGateway == null) {
-            throw new org.apache.axis2.databinding.ADBException("customerGateway cannot be null!!");
-        }
-        elementList.add(localCustomerGateway);
-
-        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 CreateCustomerGatewayResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateCustomerGatewayResponseType object = new CreateCustomerGatewayResponseType();
-
-            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 (!"CreateCustomerGatewayResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateCustomerGatewayResponseType)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/", "customerGateway").equals(reader.getName())) {
-
-                    object.setCustomerGateway(com.amazon.ec2.CustomerGatewayType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 002fae2..0000000
--- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java
+++ /dev/null
@@ -1,599 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateCustomerGatewayType bean class
-*/
-
-public class CreateCustomerGatewayType 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/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 Type
-    */
-
-    protected java.lang.String localType;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getType() {
-        return localType;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Type
-       */
-    public void setType(java.lang.String param) {
-
-        this.localType = param;
-
-    }
-
-    /**
-    * field for IpAddress
-    */
-
-    protected java.lang.String localIpAddress;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getIpAddress() {
-        return localIpAddress;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param IpAddress
-       */
-    public void setIpAddress(java.lang.String param) {
-
-        this.localIpAddress = param;
-
-    }
-
-    /**
-    * field for BgpAsn
-    */
-
-    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
-    * @return int
-    */
-    public int getBgpAsn() {
-        return localBgpAsn;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param BgpAsn
-       */
-    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;
-
-    }
-
-    /**
-    * 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 {
-                CreateCustomerGatewayType.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 + ":CreateCustomerGatewayType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateCustomerGatewayType", 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, "type", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "type");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("type");
-        }
-
-        if (localType == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("type cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localType);
-
-        }
-
-        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, "ipAddress", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "ipAddress");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("ipAddress");
-        }
-
-        if (localIpAddress == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("ipAddress cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localIpAddress);
-
-        }
-
-        xmlWriter.writeEndElement();
-        if (localBgpAsnTracker) {
-            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, "bgpAsn", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "bgpAsn");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("bgpAsn");
-            }
-
-            if (localBgpAsn == java.lang.Integer.MIN_VALUE) {
-
-                throw new org.apache.axis2.databinding.ADBException("bgpAsn cannot be null!!");
-
-            } else {
-                xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localBgpAsn));
-            }
-
-            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/", "type"));
-
-        if (localType != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localType));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("type cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ipAddress"));
-
-        if (localIpAddress != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localIpAddress));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("ipAddress cannot be null!!");
-        }
-        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());
-
-    }
-
-    /**
-     *  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 CreateCustomerGatewayType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateCustomerGatewayType object = new CreateCustomerGatewayType();
-
-            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 (!"CreateCustomerGatewayType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateCustomerGatewayType)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/", "type").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setType(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/", "ipAddress").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setIpAddress(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/", "bgpAsn").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setBgpAsn(org.apache.axis2.databinding.utils.ConverterUtil.convertToInt(content));
-
-                    reader.next();
-
-                }  // End of if for expected property start element
-
-                else {
-
-                    object.setBgpAsn(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index d182cb1..0000000
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateDhcpOptions bean class
-*/
-
-public class CreateDhcpOptions 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/", "CreateDhcpOptions", "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 CreateDhcpOptions
-    */
-
-    protected com.amazon.ec2.CreateDhcpOptionsType localCreateDhcpOptions;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateDhcpOptionsType
-    */
-    public com.amazon.ec2.CreateDhcpOptionsType getCreateDhcpOptions() {
-        return localCreateDhcpOptions;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateDhcpOptions
-       */
-    public void setCreateDhcpOptions(com.amazon.ec2.CreateDhcpOptionsType param) {
-
-        this.localCreateDhcpOptions = 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 {
-                CreateDhcpOptions.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 (localCreateDhcpOptions == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateDhcpOptions.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 localCreateDhcpOptions.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 CreateDhcpOptions parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateDhcpOptions object = new CreateDhcpOptions();
-
-            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/", "CreateDhcpOptions").equals(reader.getName())) {
-
-                            object.setCreateDhcpOptions(com.amazon.ec2.CreateDhcpOptionsType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b49b0a2..0000000
--- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateDhcpOptionsResponse bean class
-*/
-
-public class CreateDhcpOptionsResponse 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/", "CreateDhcpOptionsResponse", "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 CreateDhcpOptionsResponse
-    */
-
-    protected com.amazon.ec2.CreateDhcpOptionsResponseType localCreateDhcpOptionsResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateDhcpOptionsResponseType
-    */
-    public com.amazon.ec2.CreateDhcpOptionsResponseType getCreateDhcpOptionsResponse() {
-        return localCreateDhcpOptionsResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateDhcpOptionsResponse
-       */
-    public void setCreateDhcpOptionsResponse(com.amazon.ec2.CreateDhcpOptionsResponseType param) {
-
-        this.localCreateDhcpOptionsResponse = 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 {
-                CreateDhcpOptionsResponse.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 (localCreateDhcpOptionsResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateDhcpOptionsResponse.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 localCreateDhcpOptionsResponse.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 CreateDhcpOptionsResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateDhcpOptionsResponse object = new CreateDhcpOptionsResponse();
-
-            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/", "CreateDhcpOptionsResponse").equals(reader.getName())) {
-
-                            object.setCreateDhcpOptionsResponse(com.amazon.ec2.CreateDhcpOptionsResponseType.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
-
-}


[43/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 77dd851..0000000
--- a/awsapi/src/com/amazon/ec2/AmazonEC2SkeletonInterface.java
+++ /dev/null
@@ -1,1194 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:00:16 CEST)
- */
-package com.amazon.ec2;
-
-/**
- *  AmazonEC2SkeletonInterface java skeleton interface for the axisService
- */
-public interface AmazonEC2SkeletonInterface {
-
-    /**
-     * Auto generated method signature
-     *
-                                * @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.StartInstancesResponse startInstances(com.amazon.ec2.StartInstances startInstances);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param confirmProductInstance
-     */
-
-    public com.amazon.ec2.ConfirmProductInstanceResponse confirmProductInstance(com.amazon.ec2.ConfirmProductInstance confirmProductInstance);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeNetworkInterfaceAttribute
-     */
-
-    public com.amazon.ec2.DescribeNetworkInterfaceAttributeResponse describeNetworkInterfaceAttribute(
-        com.amazon.ec2.DescribeNetworkInterfaceAttribute describeNetworkInterfaceAttribute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param runInstances
-     */
-
-    public com.amazon.ec2.RunInstancesResponse runInstances(com.amazon.ec2.RunInstances runInstances);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createReservedInstancesListing
-     */
-
-    public com.amazon.ec2.CreateReservedInstancesListingResponse createReservedInstancesListing(
-        com.amazon.ec2.CreateReservedInstancesListing createReservedInstancesListing);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createCustomerGateway
-     */
-
-    public com.amazon.ec2.CreateCustomerGatewayResponse createCustomerGateway(com.amazon.ec2.CreateCustomerGateway createCustomerGateway);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createNetworkAcl
-     */
-
-    public com.amazon.ec2.CreateNetworkAclResponse createNetworkAcl(com.amazon.ec2.CreateNetworkAcl createNetworkAcl);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param resetImageAttribute
-     */
-
-    public com.amazon.ec2.ResetImageAttributeResponse resetImageAttribute(com.amazon.ec2.ResetImageAttribute resetImageAttribute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param modifyVolumeAttribute
-     */
-
-    public com.amazon.ec2.ModifyVolumeAttributeResponse modifyVolumeAttribute(com.amazon.ec2.ModifyVolumeAttribute modifyVolumeAttribute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeReservedInstances
-     */
-
-    public com.amazon.ec2.DescribeReservedInstancesResponse describeReservedInstances(com.amazon.ec2.DescribeReservedInstances describeReservedInstances);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param resetSnapshotAttribute
-     */
-
-    public com.amazon.ec2.ResetSnapshotAttributeResponse resetSnapshotAttribute(com.amazon.ec2.ResetSnapshotAttribute resetSnapshotAttribute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteVolume
-     */
-
-    public com.amazon.ec2.DeleteVolumeResponse deleteVolume(com.amazon.ec2.DeleteVolume deleteVolume);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeAvailabilityZones
-     */
-
-    public com.amazon.ec2.DescribeAvailabilityZonesResponse describeAvailabilityZones(com.amazon.ec2.DescribeAvailabilityZones describeAvailabilityZones);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createVpnConnection
-     */
-
-    public com.amazon.ec2.CreateVpnConnectionResponse createVpnConnection(com.amazon.ec2.CreateVpnConnection createVpnConnection);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param cancelBundleTask
-     */
-
-    public com.amazon.ec2.CancelBundleTaskResponse cancelBundleTask(com.amazon.ec2.CancelBundleTask cancelBundleTask);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param replaceNetworkAclAssociation
-     */
-
-    public com.amazon.ec2.ReplaceNetworkAclAssociationResponse replaceNetworkAclAssociation(com.amazon.ec2.ReplaceNetworkAclAssociation replaceNetworkAclAssociation);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param detachVpnGateway
-     */
-
-    public com.amazon.ec2.DetachVpnGatewayResponse detachVpnGateway(com.amazon.ec2.DetachVpnGateway detachVpnGateway);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeSnapshots
-     */
-
-    public com.amazon.ec2.DescribeSnapshotsResponse describeSnapshots(com.amazon.ec2.DescribeSnapshots describeSnapshots);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteSubnet
-     */
-
-    public com.amazon.ec2.DeleteSubnetResponse deleteSubnet(com.amazon.ec2.DeleteSubnet deleteSubnet);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeBundleTasks
-     */
-
-    public com.amazon.ec2.DescribeBundleTasksResponse describeBundleTasks(com.amazon.ec2.DescribeBundleTasks describeBundleTasks);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createKeyPair
-     */
-
-    public com.amazon.ec2.CreateKeyPairResponse createKeyPair(com.amazon.ec2.CreateKeyPair createKeyPair);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createImage
-     */
-
-    public com.amazon.ec2.CreateImageResponse createImage(com.amazon.ec2.CreateImage createImage);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param enableVgwRoutePropagation
-     */
-
-    public com.amazon.ec2.EnableVgwRoutePropagationResponse enableVgwRoutePropagation(com.amazon.ec2.EnableVgwRoutePropagation enableVgwRoutePropagation);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param unassignPrivateIpAddresses
-     */
-
-    public com.amazon.ec2.UnassignPrivateIpAddressesResponse unassignPrivateIpAddresses(com.amazon.ec2.UnassignPrivateIpAddresses unassignPrivateIpAddresses);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deregisterImage
-     */
-
-    public com.amazon.ec2.DeregisterImageResponse deregisterImage(com.amazon.ec2.DeregisterImage deregisterImage);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteVpnConnectionRoute
-     */
-
-    public com.amazon.ec2.DeleteVpnConnectionRouteResponse deleteVpnConnectionRoute(com.amazon.ec2.DeleteVpnConnectionRoute deleteVpnConnectionRoute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param modifyImageAttribute
-     */
-
-    public com.amazon.ec2.ModifyImageAttributeResponse modifyImageAttribute(com.amazon.ec2.ModifyImageAttribute modifyImageAttribute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param cancelConversionTask
-     */
-
-    public com.amazon.ec2.CancelConversionTaskResponse cancelConversionTask(com.amazon.ec2.CancelConversionTask cancelConversionTask);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeVolumes
-     */
-
-    public com.amazon.ec2.DescribeVolumesResponse describeVolumes(com.amazon.ec2.DescribeVolumes describeVolumes);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param cancelReservedInstancesListing
-     */
-
-    public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing(
-        com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param getPasswordData
-     */
-
-    public com.amazon.ec2.GetPasswordDataResponse getPasswordData(com.amazon.ec2.GetPasswordData getPasswordData);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param allocateAddress
-     */
-
-    public com.amazon.ec2.AllocateAddressResponse allocateAddress(com.amazon.ec2.AllocateAddress allocateAddress);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteSecurityGroup
-     */
-
-    public com.amazon.ec2.DeleteSecurityGroupResponse deleteSecurityGroup(com.amazon.ec2.DeleteSecurityGroup deleteSecurityGroup);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deletePlacementGroup
-     */
-
-    public com.amazon.ec2.DeletePlacementGroupResponse deletePlacementGroup(com.amazon.ec2.DeletePlacementGroup deletePlacementGroup);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param disassociateAddress
-     */
-
-    public com.amazon.ec2.DisassociateAddressResponse disassociateAddress(com.amazon.ec2.DisassociateAddress disassociateAddress);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteDhcpOptions
-     */
-
-    public com.amazon.ec2.DeleteDhcpOptionsResponse deleteDhcpOptions(com.amazon.ec2.DeleteDhcpOptions deleteDhcpOptions);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeSpotDatafeedSubscription
-     */
-
-    public com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscription(
-        com.amazon.ec2.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeNetworkAcls
-     */
-
-    public com.amazon.ec2.DescribeNetworkAclsResponse describeNetworkAcls(com.amazon.ec2.DescribeNetworkAcls describeNetworkAcls);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param enableVolumeIO
-     */
-
-    public com.amazon.ec2.EnableVolumeIOResponse enableVolumeIO(com.amazon.ec2.EnableVolumeIO enableVolumeIO);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param attachVpnGateway
-     */
-
-    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.DescribeReservedInstancesListings describeReservedInstancesListings);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeInstanceStatus
-     */
-
-    public com.amazon.ec2.DescribeInstanceStatusResponse describeInstanceStatus(com.amazon.ec2.DescribeInstanceStatus describeInstanceStatus);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param modifyNetworkInterfaceAttribute
-     */
-
-    public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute(
-        com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param disableVgwRoutePropagation
-     */
-
-    public com.amazon.ec2.DisableVgwRoutePropagationResponse disableVgwRoutePropagation(com.amazon.ec2.DisableVgwRoutePropagation disableVgwRoutePropagation);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeVolumeStatus
-     */
-
-    public com.amazon.ec2.DescribeVolumeStatusResponse describeVolumeStatus(com.amazon.ec2.DescribeVolumeStatus describeVolumeStatus);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param detachNetworkInterface
-     */
-
-    public com.amazon.ec2.DetachNetworkInterfaceResponse detachNetworkInterface(com.amazon.ec2.DetachNetworkInterface detachNetworkInterface);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeSecurityGroups
-     */
-
-    public com.amazon.ec2.DescribeSecurityGroupsResponse describeSecurityGroups(com.amazon.ec2.DescribeSecurityGroups describeSecurityGroups);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeInstances
-     */
-
-    public com.amazon.ec2.DescribeInstancesResponse describeInstances(com.amazon.ec2.DescribeInstances describeInstances);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeNetworkInterfaces
-     */
-
-    public com.amazon.ec2.DescribeNetworkInterfacesResponse describeNetworkInterfaces(com.amazon.ec2.DescribeNetworkInterfaces describeNetworkInterfaces);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteKeyPair
-     */
-
-    public com.amazon.ec2.DeleteKeyPairResponse deleteKeyPair(com.amazon.ec2.DeleteKeyPair deleteKeyPair);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createSnapshot
-     */
-
-    public com.amazon.ec2.CreateSnapshotResponse createSnapshot(com.amazon.ec2.CreateSnapshot createSnapshot);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeVpnGateways
-     */
-
-    public com.amazon.ec2.DescribeVpnGatewaysResponse describeVpnGateways(com.amazon.ec2.DescribeVpnGateways describeVpnGateways);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteTags
-     */
-
-    public com.amazon.ec2.DeleteTagsResponse deleteTags(com.amazon.ec2.DeleteTags deleteTags);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteSnapshot
-     */
-
-    public com.amazon.ec2.DeleteSnapshotResponse deleteSnapshot(com.amazon.ec2.DeleteSnapshot deleteSnapshot);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteCustomerGateway
-     */
-
-    public com.amazon.ec2.DeleteCustomerGatewayResponse deleteCustomerGateway(com.amazon.ec2.DeleteCustomerGateway deleteCustomerGateway);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createVolume
-     */
-
-    public com.amazon.ec2.CreateVolumeResponse createVolume(com.amazon.ec2.CreateVolume createVolume);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param cancelExportTask
-     */
-
-    public com.amazon.ec2.CancelExportTaskResponse cancelExportTask(com.amazon.ec2.CancelExportTask cancelExportTask);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param registerImage
-     */
-
-    public com.amazon.ec2.RegisterImageResponse registerImage(com.amazon.ec2.RegisterImage registerImage);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param detachVolume
-     */
-
-    public com.amazon.ec2.DetachVolumeResponse detachVolume(com.amazon.ec2.DetachVolume detachVolume);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param stopInstances
-     */
-
-    public com.amazon.ec2.StopInstancesResponse stopInstances(com.amazon.ec2.StopInstances stopInstances);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createRoute
-     */
-
-    public com.amazon.ec2.CreateRouteResponse createRoute(com.amazon.ec2.CreateRoute createRoute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param releaseAddress
-     */
-
-    public com.amazon.ec2.ReleaseAddressResponse releaseAddress(com.amazon.ec2.ReleaseAddress releaseAddress);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeRouteTables
-     */
-
-    public com.amazon.ec2.DescribeRouteTablesResponse describeRouteTables(com.amazon.ec2.DescribeRouteTables describeRouteTables);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeCustomerGateways
-     */
-
-    public com.amazon.ec2.DescribeCustomerGatewaysResponse describeCustomerGateways(com.amazon.ec2.DescribeCustomerGateways describeCustomerGateways);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteNetworkAcl
-     */
-
-    public com.amazon.ec2.DeleteNetworkAclResponse deleteNetworkAcl(com.amazon.ec2.DeleteNetworkAcl deleteNetworkAcl);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteRoute
-     */
-
-    public com.amazon.ec2.DeleteRouteResponse deleteRoute(com.amazon.ec2.DeleteRoute deleteRoute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param rebootInstances
-     */
-
-    public com.amazon.ec2.RebootInstancesResponse rebootInstances(com.amazon.ec2.RebootInstances rebootInstances);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param modifyInstanceAttribute
-     */
-
-    public com.amazon.ec2.ModifyInstanceAttributeResponse modifyInstanceAttribute(com.amazon.ec2.ModifyInstanceAttribute modifyInstanceAttribute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param terminateInstances
-     */
-
-    public com.amazon.ec2.TerminateInstancesResponse terminateInstances(com.amazon.ec2.TerminateInstances terminateInstances);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createVpnConnectionRoute
-     */
-
-    public com.amazon.ec2.CreateVpnConnectionRouteResponse createVpnConnectionRoute(com.amazon.ec2.CreateVpnConnectionRoute createVpnConnectionRoute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeConversionTasks
-     */
-
-    public com.amazon.ec2.DescribeConversionTasksResponse describeConversionTasks(com.amazon.ec2.DescribeConversionTasks describeConversionTasks);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeAddresses
-     */
-
-    public com.amazon.ec2.DescribeAddressesResponse describeAddresses(com.amazon.ec2.DescribeAddresses describeAddresses);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeInstanceAttribute
-     */
-
-    public com.amazon.ec2.DescribeInstanceAttributeResponse describeInstanceAttribute(com.amazon.ec2.DescribeInstanceAttribute describeInstanceAttribute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param attachInternetGateway
-     */
-
-    public com.amazon.ec2.AttachInternetGatewayResponse attachInternetGateway(com.amazon.ec2.AttachInternetGateway attachInternetGateway);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createVpc
-     */
-
-    public com.amazon.ec2.CreateVpcResponse createVpc(com.amazon.ec2.CreateVpc createVpc);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param replaceRouteTableAssociation
-     */
-
-    public com.amazon.ec2.ReplaceRouteTableAssociationResponse replaceRouteTableAssociation(com.amazon.ec2.ReplaceRouteTableAssociation replaceRouteTableAssociation);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param associateRouteTable
-     */
-
-    public com.amazon.ec2.AssociateRouteTableResponse associateRouteTable(com.amazon.ec2.AssociateRouteTable associateRouteTable);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param detachInternetGateway
-     */
-
-    public com.amazon.ec2.DetachInternetGatewayResponse detachInternetGateway(com.amazon.ec2.DetachInternetGateway detachInternetGateway);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param purchaseReservedInstancesOffering
-     */
-
-    public com.amazon.ec2.PurchaseReservedInstancesOfferingResponse purchaseReservedInstancesOffering(
-        com.amazon.ec2.PurchaseReservedInstancesOffering purchaseReservedInstancesOffering);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param importVolume
-     */
-
-    public com.amazon.ec2.ImportVolumeResponse importVolume(com.amazon.ec2.ImportVolume importVolume);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeExportTasks
-     */
-
-    public com.amazon.ec2.DescribeExportTasksResponse describeExportTasks(com.amazon.ec2.DescribeExportTasks describeExportTasks);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createInstanceExportTask
-     */
-
-    public com.amazon.ec2.CreateInstanceExportTaskResponse createInstanceExportTask(com.amazon.ec2.CreateInstanceExportTask createInstanceExportTask);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param assignPrivateIpAddresses
-     */
-
-    public com.amazon.ec2.AssignPrivateIpAddressesResponse assignPrivateIpAddresses(com.amazon.ec2.AssignPrivateIpAddresses assignPrivateIpAddresses);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param reportInstanceStatus
-     */
-
-    public com.amazon.ec2.ReportInstanceStatusResponse reportInstanceStatus(com.amazon.ec2.ReportInstanceStatus reportInstanceStatus);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeReservedInstancesOfferings
-     */
-
-    public com.amazon.ec2.DescribeReservedInstancesOfferingsResponse describeReservedInstancesOfferings(
-        com.amazon.ec2.DescribeReservedInstancesOfferings describeReservedInstancesOfferings);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteVpnConnection
-     */
-
-    public com.amazon.ec2.DeleteVpnConnectionResponse deleteVpnConnection(com.amazon.ec2.DeleteVpnConnection deleteVpnConnection);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteInternetGateway
-     */
-
-    public com.amazon.ec2.DeleteInternetGatewayResponse deleteInternetGateway(com.amazon.ec2.DeleteInternetGateway deleteInternetGateway);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param deleteSpotDatafeedSubscription
-     */
-
-    public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription(
-        com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param attachNetworkInterface
-     */
-
-    public com.amazon.ec2.AttachNetworkInterfaceResponse attachNetworkInterface(com.amazon.ec2.AttachNetworkInterface attachNetworkInterface);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param createNetworkInterface
-     */
-
-    public com.amazon.ec2.CreateNetworkInterfaceResponse createNetworkInterface(com.amazon.ec2.CreateNetworkInterface createNetworkInterface);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param revokeSecurityGroupEgress
-     */
-
-    public com.amazon.ec2.RevokeSecurityGroupEgressResponse revokeSecurityGroupEgress(com.amazon.ec2.RevokeSecurityGroupEgress revokeSecurityGroupEgress);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param monitorInstances
-     */
-
-    public com.amazon.ec2.MonitorInstancesResponse monitorInstances(com.amazon.ec2.MonitorInstances monitorInstances);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param replaceRoute
-     */
-
-    public com.amazon.ec2.ReplaceRouteResponse replaceRoute(com.amazon.ec2.ReplaceRoute replaceRoute);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param attachVolume
-     */
-
-    public com.amazon.ec2.AttachVolumeResponse attachVolume(com.amazon.ec2.AttachVolume attachVolume);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param getConsoleOutput
-     */
-
-    public com.amazon.ec2.GetConsoleOutputResponse getConsoleOutput(com.amazon.ec2.GetConsoleOutput getConsoleOutput);
-
-    /**
-     * Auto generated method signature
-     *
-                                * @param describeRegions
-     */
-
-    public com.amazon.ec2.DescribeRegionsResponse describeRegions(com.amazon.ec2.DescribeRegions describeRegions);
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f07afd5..0000000
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddresses.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index dda95b4..0000000
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 960ad3a..0000000
--- a/awsapi/src/com/amazon/ec2/AssignPrivateIpAddressesResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[02/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index a21105c..0000000
--- a/awsapi/src/com/amazon/ec2/CreateVolumePermissionOperationType.java
+++ /dev/null
@@ -1,481 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateVolumePermissionOperationType bean class
-*/
-
-public class CreateVolumePermissionOperationType 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/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() {
-
-        localAddTracker = false;
-
-        localRemoveTracker = false;
-
-    }
-
-    /**
-    * field for Add
-    */
-
-    protected com.amazon.ec2.CreateVolumePermissionListType localAdd;
-
-    /*  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 localAddTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateVolumePermissionListType
-    */
-    public com.amazon.ec2.CreateVolumePermissionListType getAdd() {
-        return localAdd;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Add
-       */
-    public void setAdd(com.amazon.ec2.CreateVolumePermissionListType param) {
-
-        clearAllSettingTrackers();
-
-        if (param != null) {
-            //update the setting tracker
-            localAddTracker = true;
-        } else {
-            localAddTracker = false;
-
-        }
-
-        this.localAdd = param;
-
-    }
-
-    /**
-    * field for Remove
-    */
-
-    protected com.amazon.ec2.CreateVolumePermissionListType localRemove;
-
-    /*  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 localRemoveTracker = false;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateVolumePermissionListType
-    */
-    public com.amazon.ec2.CreateVolumePermissionListType getRemove() {
-        return localRemove;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Remove
-       */
-    public void setRemove(com.amazon.ec2.CreateVolumePermissionListType param) {
-
-        clearAllSettingTrackers();
-
-        if (param != null) {
-            //update the setting tracker
-            localRemoveTracker = true;
-        } else {
-            localRemoveTracker = false;
-
-        }
-
-        this.localRemove = 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 {
-                CreateVolumePermissionOperationType.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 + ":CreateVolumePermissionOperationType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateVolumePermissionOperationType", xmlWriter);
-            }
-
-        }
-        if (localAddTracker) {
-            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/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/2012-08-15/", "remove"), 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 (localAddTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "add"));
-
-            if (localAdd == null) {
-                throw new org.apache.axis2.databinding.ADBException("add cannot be null!!");
-            }
-            elementList.add(localAdd);
-        }
-        if (localRemoveTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "remove"));
-
-            if (localRemove == null) {
-                throw new org.apache.axis2.databinding.ADBException("remove cannot be null!!");
-            }
-            elementList.add(localRemove);
-        }
-
-        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 CreateVolumePermissionOperationType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateVolumePermissionOperationType object = new CreateVolumePermissionOperationType();
-
-            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 (!"CreateVolumePermissionOperationType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateVolumePermissionOperationType)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.isEndElement()) {
-                    if (reader.isStartElement()) {
-
-                        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));
-
-                            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/", "remove").equals(reader.getName())) {
-
-                            object.setRemove(com.amazon.ec2.CreateVolumePermissionListType.Factory.parse(reader));
-
-                            reader.next();
-
-                        }  // End of if for expected property start element
-
-                    } 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 530491a..0000000
--- a/awsapi/src/com/amazon/ec2/CreateVolumeResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateVolumeResponse bean class
-*/
-
-public class CreateVolumeResponse 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/", "CreateVolumeResponse", "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 CreateVolumeResponse
-    */
-
-    protected com.amazon.ec2.CreateVolumeResponseType localCreateVolumeResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateVolumeResponseType
-    */
-    public com.amazon.ec2.CreateVolumeResponseType getCreateVolumeResponse() {
-        return localCreateVolumeResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateVolumeResponse
-       */
-    public void setCreateVolumeResponse(com.amazon.ec2.CreateVolumeResponseType param) {
-
-        this.localCreateVolumeResponse = 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 {
-                CreateVolumeResponse.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 (localCreateVolumeResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateVolumeResponse.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 localCreateVolumeResponse.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 CreateVolumeResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateVolumeResponse object = new CreateVolumeResponse();
-
-            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/", "CreateVolumeResponse").equals(reader.getName())) {
-
-                            object.setCreateVolumeResponse(com.amazon.ec2.CreateVolumeResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 4663ef4..0000000
--- a/awsapi/src/com/amazon/ec2/CreateVolumeResponseType.java
+++ /dev/null
@@ -1,1091 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateVolumeResponseType bean class
-*/
-
-public class CreateVolumeResponseType 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/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 VolumeId
-    */
-
-    protected java.lang.String localVolumeId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getVolumeId() {
-        return localVolumeId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param VolumeId
-       */
-    public void setVolumeId(java.lang.String param) {
-
-        this.localVolumeId = param;
-
-    }
-
-    /**
-    * field for Size
-    */
-
-    protected java.lang.String localSize;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getSize() {
-        return localSize;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Size
-       */
-    public void setSize(java.lang.String param) {
-
-        this.localSize = param;
-
-    }
-
-    /**
-    * field for SnapshotId
-    */
-
-    protected java.lang.String localSnapshotId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getSnapshotId() {
-        return localSnapshotId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param SnapshotId
-       */
-    public void setSnapshotId(java.lang.String param) {
-
-        this.localSnapshotId = param;
-
-    }
-
-    /**
-    * field for AvailabilityZone
-    */
-
-    protected java.lang.String localAvailabilityZone;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getAvailabilityZone() {
-        return localAvailabilityZone;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AvailabilityZone
-       */
-    public void setAvailabilityZone(java.lang.String param) {
-
-        this.localAvailabilityZone = param;
-
-    }
-
-    /**
-    * field for Status
-    */
-
-    protected java.lang.String localStatus;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getStatus() {
-        return localStatus;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Status
-       */
-    public void setStatus(java.lang.String param) {
-
-        this.localStatus = param;
-
-    }
-
-    /**
-    * field for CreateTime
-    */
-
-    protected java.util.Calendar localCreateTime;
-
-    /**
-    * Auto generated getter method
-    * @return java.util.Calendar
-    */
-    public java.util.Calendar getCreateTime() {
-        return localCreateTime;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateTime
-       */
-    public void setCreateTime(java.util.Calendar param) {
-
-        this.localCreateTime = param;
-
-    }
-
-    /**
-    * 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
-    */
-    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 {
-                CreateVolumeResponseType.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 + ":CreateVolumeResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateVolumeResponseType", 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, "volumeId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "volumeId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("volumeId");
-        }
-
-        if (localVolumeId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localVolumeId);
-
-        }
-
-        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, "size", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "size");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("size");
-        }
-
-        if (localSize == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("size cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localSize);
-
-        }
-
-        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, "snapshotId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "snapshotId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("snapshotId");
-        }
-
-        if (localSnapshotId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("snapshotId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localSnapshotId);
-
-        }
-
-        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, "availabilityZone", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "availabilityZone");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("availabilityZone");
-        }
-
-        if (localAvailabilityZone == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("availabilityZone cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localAvailabilityZone);
-
-        }
-
-        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, "status", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "status");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("status");
-        }
-
-        if (localStatus == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localStatus);
-
-        }
-
-        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, "createTime", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "createTime");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("createTime");
-        }
-
-        if (localCreateTime == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("createTime cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localCreateTime));
-
-        }
-
-        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();
-
-    }
-
-    /**
-     * 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/", "volumeId"));
-
-        if (localVolumeId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVolumeId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "size"));
-
-        if (localSize != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSize));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("size cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "snapshotId"));
-
-        if (localSnapshotId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSnapshotId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("snapshotId cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "availabilityZone"));
-
-        if (localAvailabilityZone != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAvailabilityZone));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("availabilityZone cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "status"));
-
-        if (localStatus != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStatus));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "createTime"));
-
-        if (localCreateTime != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localCreateTime));
-        } else {
-            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());
-
-    }
-
-    /**
-     *  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 CreateVolumeResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateVolumeResponseType object = new CreateVolumeResponseType();
-
-            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 (!"CreateVolumeResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateVolumeResponseType)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/", "volumeId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setVolumeId(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/", "size").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setSize(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/", "snapshotId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setSnapshotId(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/", "availabilityZone").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setAvailabilityZone(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/", "status").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setStatus(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/", "createTime").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setCreateTime(org.apache.axis2.databinding.utils.ConverterUtil.convertToDateTime(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/", "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();
-
-                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
-
-}


[06/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 3a0453d..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotResponseType.java
+++ /dev/null
@@ -1,1095 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSnapshotResponseType bean class
-*/
-
-public class CreateSnapshotResponseType 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/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 SnapshotId
-    */
-
-    protected java.lang.String localSnapshotId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getSnapshotId() {
-        return localSnapshotId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param SnapshotId
-       */
-    public void setSnapshotId(java.lang.String param) {
-
-        this.localSnapshotId = param;
-
-    }
-
-    /**
-    * field for VolumeId
-    */
-
-    protected java.lang.String localVolumeId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getVolumeId() {
-        return localVolumeId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param VolumeId
-       */
-    public void setVolumeId(java.lang.String param) {
-
-        this.localVolumeId = param;
-
-    }
-
-    /**
-    * field for Status
-    */
-
-    protected java.lang.String localStatus;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getStatus() {
-        return localStatus;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Status
-       */
-    public void setStatus(java.lang.String param) {
-
-        this.localStatus = param;
-
-    }
-
-    /**
-    * field for StartTime
-    */
-
-    protected java.util.Calendar localStartTime;
-
-    /**
-    * Auto generated getter method
-    * @return java.util.Calendar
-    */
-    public java.util.Calendar getStartTime() {
-        return localStartTime;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param StartTime
-       */
-    public void setStartTime(java.util.Calendar param) {
-
-        this.localStartTime = param;
-
-    }
-
-    /**
-    * field for Progress
-    */
-
-    protected java.lang.String localProgress;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getProgress() {
-        return localProgress;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Progress
-       */
-    public void setProgress(java.lang.String param) {
-
-        this.localProgress = param;
-
-    }
-
-    /**
-    * field for OwnerId
-    */
-
-    protected java.lang.String localOwnerId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getOwnerId() {
-        return localOwnerId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param OwnerId
-       */
-    public void setOwnerId(java.lang.String param) {
-
-        this.localOwnerId = param;
-
-    }
-
-    /**
-    * field for VolumeSize
-    */
-
-    protected java.lang.String localVolumeSize;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getVolumeSize() {
-        return localVolumeSize;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param VolumeSize
-       */
-    public void setVolumeSize(java.lang.String param) {
-
-        this.localVolumeSize = 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;
-
-    }
-
-    /**
-    * 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 {
-                CreateSnapshotResponseType.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 + ":CreateSnapshotResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateSnapshotResponseType", 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, "snapshotId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "snapshotId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("snapshotId");
-        }
-
-        if (localSnapshotId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("snapshotId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localSnapshotId);
-
-        }
-
-        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, "volumeId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "volumeId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("volumeId");
-        }
-
-        if (localVolumeId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localVolumeId);
-
-        }
-
-        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, "status", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "status");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("status");
-        }
-
-        if (localStatus == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localStatus);
-
-        }
-
-        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, "startTime", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "startTime");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("startTime");
-        }
-
-        if (localStartTime == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("startTime cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStartTime));
-
-        }
-
-        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, "progress", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "progress");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("progress");
-        }
-
-        if (localProgress == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("progress cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localProgress);
-
-        }
-
-        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, "ownerId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "ownerId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("ownerId");
-        }
-
-        if (localOwnerId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("ownerId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localOwnerId);
-
-        }
-
-        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, "volumeSize", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "volumeSize");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("volumeSize");
-        }
-
-        if (localVolumeSize == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("volumeSize cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localVolumeSize);
-
-        }
-
-        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();
-        }
-        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/", "snapshotId"));
-
-        if (localSnapshotId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localSnapshotId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("snapshotId cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "volumeId"));
-
-        if (localVolumeId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVolumeId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "status"));
-
-        if (localStatus != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStatus));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "startTime"));
-
-        if (localStartTime != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStartTime));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("startTime cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "progress"));
-
-        if (localProgress != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localProgress));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("progress cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ownerId"));
-
-        if (localOwnerId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localOwnerId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("ownerId cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "volumeSize"));
-
-        if (localVolumeSize != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVolumeSize));
-        } else {
-            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/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!!");
-            }
-        }
-
-        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 CreateSnapshotResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSnapshotResponseType object = new CreateSnapshotResponseType();
-
-            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 (!"CreateSnapshotResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateSnapshotResponseType)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/", "snapshotId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setSnapshotId(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/", "volumeId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setVolumeId(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/", "status").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setStatus(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/", "startTime").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setStartTime(org.apache.axis2.databinding.utils.ConverterUtil.convertToDateTime(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/", "progress").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setProgress(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/", "ownerId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setOwnerId(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/", "volumeSize").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setVolumeSize(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())
-                    // 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 4278e08..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotType.java
+++ /dev/null
@@ -1,521 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSnapshotType bean class
-*/
-
-public class CreateSnapshotType 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/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 VolumeId
-    */
-
-    protected java.lang.String localVolumeId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getVolumeId() {
-        return localVolumeId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param VolumeId
-       */
-    public void setVolumeId(java.lang.String param) {
-
-        this.localVolumeId = 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;
-
-    }
-
-    /**
-    * 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 {
-                CreateSnapshotType.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 + ":CreateSnapshotType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateSnapshotType", 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, "volumeId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "volumeId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("volumeId");
-        }
-
-        if (localVolumeId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localVolumeId);
-
-        }
-
-        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();
-        }
-        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/", "volumeId"));
-
-        if (localVolumeId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVolumeId));
-        } else {
-            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/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!!");
-            }
-        }
-
-        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 CreateSnapshotType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSnapshotType object = new CreateSnapshotType();
-
-            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 (!"CreateSnapshotType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateSnapshotType)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/", "volumeId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setVolumeId(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())
-                    // 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f9ba576..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscription.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSpotDatafeedSubscription bean class
-*/
-
-public class CreateSpotDatafeedSubscription 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/", "CreateSpotDatafeedSubscription",
-        "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 CreateSpotDatafeedSubscription
-    */
-
-    protected com.amazon.ec2.CreateSpotDatafeedSubscriptionType localCreateSpotDatafeedSubscription;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateSpotDatafeedSubscriptionType
-    */
-    public com.amazon.ec2.CreateSpotDatafeedSubscriptionType getCreateSpotDatafeedSubscription() {
-        return localCreateSpotDatafeedSubscription;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateSpotDatafeedSubscription
-       */
-    public void setCreateSpotDatafeedSubscription(com.amazon.ec2.CreateSpotDatafeedSubscriptionType param) {
-
-        this.localCreateSpotDatafeedSubscription = 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 {
-                CreateSpotDatafeedSubscription.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 (localCreateSpotDatafeedSubscription == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateSpotDatafeedSubscription.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 localCreateSpotDatafeedSubscription.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 CreateSpotDatafeedSubscription parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSpotDatafeedSubscription object = new CreateSpotDatafeedSubscription();
-
-            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/", "CreateSpotDatafeedSubscription").equals(reader.getName())) {
-
-                            object.setCreateSpotDatafeedSubscription(com.amazon.ec2.CreateSpotDatafeedSubscriptionType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b52f495..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSpotDatafeedSubscriptionResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSpotDatafeedSubscriptionResponse bean class
-*/
-
-public class CreateSpotDatafeedSubscriptionResponse 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/",
-        "CreateSpotDatafeedSubscriptionResponse", "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 CreateSpotDatafeedSubscriptionResponse
-    */
-
-    protected com.amazon.ec2.CreateSpotDatafeedSubscriptionResponseType localCreateSpotDatafeedSubscriptionResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateSpotDatafeedSubscriptionResponseType
-    */
-    public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponseType getCreateSpotDatafeedSubscriptionResponse() {
-        return localCreateSpotDatafeedSubscriptionResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateSpotDatafeedSubscriptionResponse
-       */
-    public void setCreateSpotDatafeedSubscriptionResponse(com.amazon.ec2.CreateSpotDatafeedSubscriptionResponseType param) {
-
-        this.localCreateSpotDatafeedSubscriptionResponse = 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 {
-                CreateSpotDatafeedSubscriptionResponse.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 (localCreateSpotDatafeedSubscriptionResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateSpotDatafeedSubscriptionResponse.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 localCreateSpotDatafeedSubscriptionResponse.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 CreateSpotDatafeedSubscriptionResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSpotDatafeedSubscriptionResponse object = new CreateSpotDatafeedSubscriptionResponse();
-
-            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/", "CreateSpotDatafeedSubscriptionResponse").equals(reader.getName())) {
-
-                            object.setCreateSpotDatafeedSubscriptionResponse(com.amazon.ec2.CreateSpotDatafeedSubscriptionResponseType.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
-
-}


[07/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 27bb0fd..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupResponseType.java
+++ /dev/null
@@ -1,582 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSecurityGroupResponseType bean class
-*/
-
-public class CreateSecurityGroupResponseType 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/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;
-
-    }
-
-    /**
-    * 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
-    */
-    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 {
-                CreateSecurityGroupResponseType.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 + ":CreateSecurityGroupResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateSecurityGroupResponseType", 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();
-
-        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();
-
-    }
-
-    /**
-     * 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));
-
-        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());
-
-    }
-
-    /**
-     *  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 CreateSecurityGroupResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSecurityGroupResponseType object = new CreateSecurityGroupResponseType();
-
-            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 (!"CreateSecurityGroupResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateSecurityGroupResponseType)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() && 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())
-                    // 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 52ebace..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSecurityGroupType.java
+++ /dev/null
@@ -1,603 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSecurityGroupType bean class
-*/
-
-public class CreateSecurityGroupType 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/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 GroupName
-    */
-
-    protected java.lang.String localGroupName;
-
-    /**
-    * 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) {
-
-        this.localGroupName = param;
-
-    }
-
-    /**
-    * field for GroupDescription
-    */
-
-    protected java.lang.String localGroupDescription;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getGroupDescription() {
-        return localGroupDescription;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param GroupDescription
-       */
-    public void setGroupDescription(java.lang.String param) {
-
-        this.localGroupDescription = param;
-
-    }
-
-    /**
-    * 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
-    */
-    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 {
-                CreateSecurityGroupType.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 + ":CreateSecurityGroupType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreateSecurityGroupType", 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, "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();
-
-        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, "groupDescription", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "groupDescription");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("groupDescription");
-        }
-
-        if (localGroupDescription == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("groupDescription cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localGroupDescription);
-
-        }
-
-        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();
-
-    }
-
-    /**
-     * 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/", "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/2012-08-15/", "groupDescription"));
-
-        if (localGroupDescription != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localGroupDescription));
-        } 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());
-
-    }
-
-    /**
-     *  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 CreateSecurityGroupType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSecurityGroupType object = new CreateSecurityGroupType();
-
-            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 (!"CreateSecurityGroupType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreateSecurityGroupType)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/", "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
-
-                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/", "groupDescription").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setGroupDescription(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 {
-
-                }
-
-                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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 1d32912..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSnapshot.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSnapshot bean class
-*/
-
-public class CreateSnapshot 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/", "CreateSnapshot", "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 CreateSnapshot
-    */
-
-    protected com.amazon.ec2.CreateSnapshotType localCreateSnapshot;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateSnapshotType
-    */
-    public com.amazon.ec2.CreateSnapshotType getCreateSnapshot() {
-        return localCreateSnapshot;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateSnapshot
-       */
-    public void setCreateSnapshot(com.amazon.ec2.CreateSnapshotType param) {
-
-        this.localCreateSnapshot = 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 {
-                CreateSnapshot.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 (localCreateSnapshot == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateSnapshot.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 localCreateSnapshot.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 CreateSnapshot parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSnapshot object = new CreateSnapshot();
-
-            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/", "CreateSnapshot").equals(reader.getName())) {
-
-                            object.setCreateSnapshot(com.amazon.ec2.CreateSnapshotType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 93a1e5c..0000000
--- a/awsapi/src/com/amazon/ec2/CreateSnapshotResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreateSnapshotResponse bean class
-*/
-
-public class CreateSnapshotResponse 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/", "CreateSnapshotResponse", "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 CreateSnapshotResponse
-    */
-
-    protected com.amazon.ec2.CreateSnapshotResponseType localCreateSnapshotResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreateSnapshotResponseType
-    */
-    public com.amazon.ec2.CreateSnapshotResponseType getCreateSnapshotResponse() {
-        return localCreateSnapshotResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreateSnapshotResponse
-       */
-    public void setCreateSnapshotResponse(com.amazon.ec2.CreateSnapshotResponseType param) {
-
-        this.localCreateSnapshotResponse = 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 {
-                CreateSnapshotResponse.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 (localCreateSnapshotResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreateSnapshotResponse.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 localCreateSnapshotResponse.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 CreateSnapshotResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreateSnapshotResponse object = new CreateSnapshotResponse();
-
-            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/", "CreateSnapshotResponse").equals(reader.getName())) {
-
-                            object.setCreateSnapshotResponse(com.amazon.ec2.CreateSnapshotResponseType.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
-
-}


[26/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index de66899..0000000
--- a/awsapi/src/com/amazon/ec2/CancelBundleTaskType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelBundleTaskType bean class
-*/
-
-public class CancelBundleTaskType 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/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 BundleId
-    */
-
-    protected java.lang.String localBundleId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getBundleId() {
-        return localBundleId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param BundleId
-       */
-    public void setBundleId(java.lang.String param) {
-
-        this.localBundleId = 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 {
-                CancelBundleTaskType.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 + ":CancelBundleTaskType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CancelBundleTaskType", 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, "bundleId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "bundleId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("bundleId");
-        }
-
-        if (localBundleId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("bundleId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localBundleId);
-
-        }
-
-        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/", "bundleId"));
-
-        if (localBundleId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localBundleId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("bundleId 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 CancelBundleTaskType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelBundleTaskType object = new CancelBundleTaskType();
-
-            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 (!"CancelBundleTaskType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CancelBundleTaskType)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/", "bundleId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setBundleId(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 6b5a883..0000000
--- a/awsapi/src/com/amazon/ec2/CancelConversionTask.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelConversionTask bean class
-*/
-
-public class CancelConversionTask 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/", "CancelConversionTask", "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 CancelConversionTask
-    */
-
-    protected com.amazon.ec2.CancelConversionTaskType localCancelConversionTask;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CancelConversionTaskType
-    */
-    public com.amazon.ec2.CancelConversionTaskType getCancelConversionTask() {
-        return localCancelConversionTask;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CancelConversionTask
-       */
-    public void setCancelConversionTask(com.amazon.ec2.CancelConversionTaskType param) {
-
-        this.localCancelConversionTask = 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 {
-                CancelConversionTask.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 (localCancelConversionTask == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCancelConversionTask.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 localCancelConversionTask.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 CancelConversionTask parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelConversionTask object = new CancelConversionTask();
-
-            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/", "CancelConversionTask").equals(reader.getName())) {
-
-                            object.setCancelConversionTask(com.amazon.ec2.CancelConversionTaskType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 97dab3b..0000000
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelConversionTaskResponse bean class
-*/
-
-public class CancelConversionTaskResponse 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/", "CancelConversionTaskResponse",
-        "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 CancelConversionTaskResponse
-    */
-
-    protected com.amazon.ec2.CancelConversionTaskResponseType localCancelConversionTaskResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CancelConversionTaskResponseType
-    */
-    public com.amazon.ec2.CancelConversionTaskResponseType getCancelConversionTaskResponse() {
-        return localCancelConversionTaskResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CancelConversionTaskResponse
-       */
-    public void setCancelConversionTaskResponse(com.amazon.ec2.CancelConversionTaskResponseType param) {
-
-        this.localCancelConversionTaskResponse = 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 {
-                CancelConversionTaskResponse.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 (localCancelConversionTaskResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCancelConversionTaskResponse.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 localCancelConversionTaskResponse.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 CancelConversionTaskResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelConversionTaskResponse object = new CancelConversionTaskResponse();
-
-            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/", "CancelConversionTaskResponse").equals(reader.getName())) {
-
-                            object.setCancelConversionTaskResponse(com.amazon.ec2.CancelConversionTaskResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 00b35f2..0000000
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelConversionTaskResponseType bean class
-*/
-
-public class CancelConversionTaskResponseType 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/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 {
-                CancelConversionTaskResponseType.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 + ":CancelConversionTaskResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CancelConversionTaskResponseType", 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 CancelConversionTaskResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelConversionTaskResponseType object = new CancelConversionTaskResponseType();
-
-            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 (!"CancelConversionTaskResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CancelConversionTaskResponseType)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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 2248fb3..0000000
--- a/awsapi/src/com/amazon/ec2/CancelConversionTaskType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CancelConversionTaskType bean class
-*/
-
-public class CancelConversionTaskType 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/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 ConversionTaskId
-    */
-
-    protected java.lang.String localConversionTaskId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getConversionTaskId() {
-        return localConversionTaskId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param ConversionTaskId
-       */
-    public void setConversionTaskId(java.lang.String param) {
-
-        this.localConversionTaskId = 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 {
-                CancelConversionTaskType.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 + ":CancelConversionTaskType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CancelConversionTaskType", 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, "conversionTaskId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "conversionTaskId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("conversionTaskId");
-        }
-
-        if (localConversionTaskId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("conversionTaskId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localConversionTaskId);
-
-        }
-
-        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/", "conversionTaskId"));
-
-        if (localConversionTaskId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localConversionTaskId));
-        } 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());
-
-    }
-
-    /**
-     *  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 CancelConversionTaskType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CancelConversionTaskType object = new CancelConversionTaskType();
-
-            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 (!"CancelConversionTaskType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CancelConversionTaskType)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/", "conversionTaskId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setConversionTaskId(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
-
-}


[44/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 99834a4..0000000
--- a/awsapi/src/com/amazon/ec2/AmazonEC2Skeleton.java
+++ /dev/null
@@ -1,1627 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:00:16 CEST)
- */
-package com.amazon.ec2;
-
-/**
- *  AmazonEC2Skeleton java skeleton for the axisService
- */
-public class AmazonEC2Skeleton implements AmazonEC2SkeletonInterface {
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describePlacementGroups0
-     */
-
-    public com.amazon.ec2.DescribePlacementGroupsResponse describePlacementGroups(com.amazon.ec2.DescribePlacementGroups describePlacementGroups0) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describePlacementGroups");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createSecurityGroup2
-     */
-
-    public com.amazon.ec2.CreateSecurityGroupResponse createSecurityGroup(com.amazon.ec2.CreateSecurityGroup createSecurityGroup2) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSecurityGroup");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param resetNetworkInterfaceAttribute4
-     */
-
-    public com.amazon.ec2.ResetNetworkInterfaceAttributeResponse resetNetworkInterfaceAttribute(
-        com.amazon.ec2.ResetNetworkInterfaceAttribute resetNetworkInterfaceAttribute4) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#resetNetworkInterfaceAttribute");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createDhcpOptions6
-     */
-
-    public com.amazon.ec2.CreateDhcpOptionsResponse createDhcpOptions(com.amazon.ec2.CreateDhcpOptions createDhcpOptions6) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createDhcpOptions");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createRouteTable8
-     */
-
-    public com.amazon.ec2.CreateRouteTableResponse createRouteTable(com.amazon.ec2.CreateRouteTable createRouteTable8) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createRouteTable");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeSubnets10
-     */
-
-    public com.amazon.ec2.DescribeSubnetsResponse describeSubnets(com.amazon.ec2.DescribeSubnets describeSubnets10) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSubnets");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deactivateLicense12
-     */
-
-    public com.amazon.ec2.DeactivateLicenseResponse deactivateLicense(com.amazon.ec2.DeactivateLicense deactivateLicense12) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deactivateLicense");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteVpc14
-     */
-
-    public com.amazon.ec2.DeleteVpcResponse deleteVpc(com.amazon.ec2.DeleteVpc deleteVpc14) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVpc");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param cancelSpotInstanceRequests16
-     */
-
-    public com.amazon.ec2.CancelSpotInstanceRequestsResponse cancelSpotInstanceRequests(com.amazon.ec2.CancelSpotInstanceRequests cancelSpotInstanceRequests16) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelSpotInstanceRequests");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createSubnet18
-     */
-
-    public com.amazon.ec2.CreateSubnetResponse createSubnet(com.amazon.ec2.CreateSubnet createSubnet18) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSubnet");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteVpnGateway20
-     */
-
-    public com.amazon.ec2.DeleteVpnGatewayResponse deleteVpnGateway(com.amazon.ec2.DeleteVpnGateway deleteVpnGateway20) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVpnGateway");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createNetworkAclEntry22
-     */
-
-    public com.amazon.ec2.CreateNetworkAclEntryResponse createNetworkAclEntry(com.amazon.ec2.CreateNetworkAclEntry createNetworkAclEntry22) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createNetworkAclEntry");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param requestSpotInstances24
-     */
-
-    public com.amazon.ec2.RequestSpotInstancesResponse requestSpotInstances(com.amazon.ec2.RequestSpotInstances requestSpotInstances24) {
-        //TODO : fill this with the necessary business logic
-        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 describeVpcs36
-     */
-
-    public com.amazon.ec2.DescribeVpcsResponse describeVpcs(com.amazon.ec2.DescribeVpcs describeVpcs36) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeVpcs");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeLicenses38
-     */
-
-    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.DeleteSubnet deleteSubnet126) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSubnet");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeBundleTasks128
-     */
-
-    public com.amazon.ec2.DescribeBundleTasksResponse describeBundleTasks(com.amazon.ec2.DescribeBundleTasks describeBundleTasks128) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeBundleTasks");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createKeyPair130
-     */
-
-    public com.amazon.ec2.CreateKeyPairResponse createKeyPair(com.amazon.ec2.CreateKeyPair createKeyPair130) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createKeyPair");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createImage132
-     */
-
-    public com.amazon.ec2.CreateImageResponse createImage(com.amazon.ec2.CreateImage createImage132) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createImage");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param enableVgwRoutePropagation134
-     */
-
-    public com.amazon.ec2.EnableVgwRoutePropagationResponse enableVgwRoutePropagation(com.amazon.ec2.EnableVgwRoutePropagation enableVgwRoutePropagation134) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#enableVgwRoutePropagation");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param unassignPrivateIpAddresses136
-     */
-
-    public com.amazon.ec2.UnassignPrivateIpAddressesResponse unassignPrivateIpAddresses(com.amazon.ec2.UnassignPrivateIpAddresses unassignPrivateIpAddresses136) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#unassignPrivateIpAddresses");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deregisterImage138
-     */
-
-    public com.amazon.ec2.DeregisterImageResponse deregisterImage(com.amazon.ec2.DeregisterImage deregisterImage138) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deregisterImage");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteVpnConnectionRoute140
-     */
-
-    public com.amazon.ec2.DeleteVpnConnectionRouteResponse deleteVpnConnectionRoute(com.amazon.ec2.DeleteVpnConnectionRoute deleteVpnConnectionRoute140) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVpnConnectionRoute");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param modifyImageAttribute142
-     */
-
-    public com.amazon.ec2.ModifyImageAttributeResponse modifyImageAttribute(com.amazon.ec2.ModifyImageAttribute modifyImageAttribute142) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#modifyImageAttribute");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param cancelConversionTask144
-     */
-
-    public com.amazon.ec2.CancelConversionTaskResponse cancelConversionTask(com.amazon.ec2.CancelConversionTask cancelConversionTask144) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelConversionTask");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeVolumes146
-     */
-
-    public com.amazon.ec2.DescribeVolumesResponse describeVolumes(com.amazon.ec2.DescribeVolumes describeVolumes146) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeVolumes");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param cancelReservedInstancesListing148
-     */
-
-    public com.amazon.ec2.CancelReservedInstancesListingResponse cancelReservedInstancesListing(
-        com.amazon.ec2.CancelReservedInstancesListing cancelReservedInstancesListing148) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelReservedInstancesListing");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param getPasswordData150
-     */
-
-    public com.amazon.ec2.GetPasswordDataResponse getPasswordData(com.amazon.ec2.GetPasswordData getPasswordData150) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#getPasswordData");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param allocateAddress152
-     */
-
-    public com.amazon.ec2.AllocateAddressResponse allocateAddress(com.amazon.ec2.AllocateAddress allocateAddress152) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#allocateAddress");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteSecurityGroup154
-     */
-
-    public com.amazon.ec2.DeleteSecurityGroupResponse deleteSecurityGroup(com.amazon.ec2.DeleteSecurityGroup deleteSecurityGroup154) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSecurityGroup");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deletePlacementGroup156
-     */
-
-    public com.amazon.ec2.DeletePlacementGroupResponse deletePlacementGroup(com.amazon.ec2.DeletePlacementGroup deletePlacementGroup156) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deletePlacementGroup");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param disassociateAddress158
-     */
-
-    public com.amazon.ec2.DisassociateAddressResponse disassociateAddress(com.amazon.ec2.DisassociateAddress disassociateAddress158) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#disassociateAddress");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteDhcpOptions160
-     */
-
-    public com.amazon.ec2.DeleteDhcpOptionsResponse deleteDhcpOptions(com.amazon.ec2.DeleteDhcpOptions deleteDhcpOptions160) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteDhcpOptions");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeSpotDatafeedSubscription162
-     */
-
-    public com.amazon.ec2.DescribeSpotDatafeedSubscriptionResponse describeSpotDatafeedSubscription(
-        com.amazon.ec2.DescribeSpotDatafeedSubscription describeSpotDatafeedSubscription162) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSpotDatafeedSubscription");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeNetworkAcls164
-     */
-
-    public com.amazon.ec2.DescribeNetworkAclsResponse describeNetworkAcls(com.amazon.ec2.DescribeNetworkAcls describeNetworkAcls164) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeNetworkAcls");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param enableVolumeIO166
-     */
-
-    public com.amazon.ec2.EnableVolumeIOResponse enableVolumeIO(com.amazon.ec2.EnableVolumeIO enableVolumeIO166) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#enableVolumeIO");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param attachVpnGateway168
-     */
-
-    public com.amazon.ec2.AttachVpnGatewayResponse attachVpnGateway(com.amazon.ec2.AttachVpnGateway attachVpnGateway168) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#attachVpnGateway");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeInternetGateways170
-     */
-
-    public com.amazon.ec2.DescribeInternetGatewaysResponse describeInternetGateways(com.amazon.ec2.DescribeInternetGateways describeInternetGateways170) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeInternetGateways");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeDhcpOptions172
-     */
-
-    public com.amazon.ec2.DescribeDhcpOptionsResponse describeDhcpOptions(com.amazon.ec2.DescribeDhcpOptions describeDhcpOptions172) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeDhcpOptions");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createSpotDatafeedSubscription174
-     */
-
-    public com.amazon.ec2.CreateSpotDatafeedSubscriptionResponse createSpotDatafeedSubscription(
-        com.amazon.ec2.CreateSpotDatafeedSubscription createSpotDatafeedSubscription174) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSpotDatafeedSubscription");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeReservedInstancesListings176
-     */
-
-    public com.amazon.ec2.DescribeReservedInstancesListingsResponse describeReservedInstancesListings(
-        com.amazon.ec2.DescribeReservedInstancesListings describeReservedInstancesListings176) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeReservedInstancesListings");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeInstanceStatus178
-     */
-
-    public com.amazon.ec2.DescribeInstanceStatusResponse describeInstanceStatus(com.amazon.ec2.DescribeInstanceStatus describeInstanceStatus178) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeInstanceStatus");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param modifyNetworkInterfaceAttribute180
-     */
-
-    public com.amazon.ec2.ModifyNetworkInterfaceAttributeResponse modifyNetworkInterfaceAttribute(
-        com.amazon.ec2.ModifyNetworkInterfaceAttribute modifyNetworkInterfaceAttribute180) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#modifyNetworkInterfaceAttribute");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param disableVgwRoutePropagation182
-     */
-
-    public com.amazon.ec2.DisableVgwRoutePropagationResponse disableVgwRoutePropagation(com.amazon.ec2.DisableVgwRoutePropagation disableVgwRoutePropagation182) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#disableVgwRoutePropagation");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeVolumeStatus184
-     */
-
-    public com.amazon.ec2.DescribeVolumeStatusResponse describeVolumeStatus(com.amazon.ec2.DescribeVolumeStatus describeVolumeStatus184) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeVolumeStatus");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param detachNetworkInterface186
-     */
-
-    public com.amazon.ec2.DetachNetworkInterfaceResponse detachNetworkInterface(com.amazon.ec2.DetachNetworkInterface detachNetworkInterface186) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#detachNetworkInterface");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeSecurityGroups188
-     */
-
-    public com.amazon.ec2.DescribeSecurityGroupsResponse describeSecurityGroups(com.amazon.ec2.DescribeSecurityGroups describeSecurityGroups188) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeSecurityGroups");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeInstances190
-     */
-
-    public com.amazon.ec2.DescribeInstancesResponse describeInstances(com.amazon.ec2.DescribeInstances describeInstances190) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeInstances");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeNetworkInterfaces192
-     */
-
-    public com.amazon.ec2.DescribeNetworkInterfacesResponse describeNetworkInterfaces(com.amazon.ec2.DescribeNetworkInterfaces describeNetworkInterfaces192) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeNetworkInterfaces");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteKeyPair194
-     */
-
-    public com.amazon.ec2.DeleteKeyPairResponse deleteKeyPair(com.amazon.ec2.DeleteKeyPair deleteKeyPair194) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteKeyPair");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createSnapshot196
-     */
-
-    public com.amazon.ec2.CreateSnapshotResponse createSnapshot(com.amazon.ec2.CreateSnapshot createSnapshot196) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createSnapshot");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeVpnGateways198
-     */
-
-    public com.amazon.ec2.DescribeVpnGatewaysResponse describeVpnGateways(com.amazon.ec2.DescribeVpnGateways describeVpnGateways198) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeVpnGateways");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteTags200
-     */
-
-    public com.amazon.ec2.DeleteTagsResponse deleteTags(com.amazon.ec2.DeleteTags deleteTags200) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteTags");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteSnapshot202
-     */
-
-    public com.amazon.ec2.DeleteSnapshotResponse deleteSnapshot(com.amazon.ec2.DeleteSnapshot deleteSnapshot202) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSnapshot");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteCustomerGateway204
-     */
-
-    public com.amazon.ec2.DeleteCustomerGatewayResponse deleteCustomerGateway(com.amazon.ec2.DeleteCustomerGateway deleteCustomerGateway204) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteCustomerGateway");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createVolume206
-     */
-
-    public com.amazon.ec2.CreateVolumeResponse createVolume(com.amazon.ec2.CreateVolume createVolume206) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createVolume");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param cancelExportTask208
-     */
-
-    public com.amazon.ec2.CancelExportTaskResponse cancelExportTask(com.amazon.ec2.CancelExportTask cancelExportTask208) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#cancelExportTask");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param registerImage210
-     */
-
-    public com.amazon.ec2.RegisterImageResponse registerImage(com.amazon.ec2.RegisterImage registerImage210) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#registerImage");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param detachVolume212
-     */
-
-    public com.amazon.ec2.DetachVolumeResponse detachVolume(com.amazon.ec2.DetachVolume detachVolume212) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#detachVolume");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param stopInstances214
-     */
-
-    public com.amazon.ec2.StopInstancesResponse stopInstances(com.amazon.ec2.StopInstances stopInstances214) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#stopInstances");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createRoute216
-     */
-
-    public com.amazon.ec2.CreateRouteResponse createRoute(com.amazon.ec2.CreateRoute createRoute216) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createRoute");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param releaseAddress218
-     */
-
-    public com.amazon.ec2.ReleaseAddressResponse releaseAddress(com.amazon.ec2.ReleaseAddress releaseAddress218) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#releaseAddress");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeRouteTables220
-     */
-
-    public com.amazon.ec2.DescribeRouteTablesResponse describeRouteTables(com.amazon.ec2.DescribeRouteTables describeRouteTables220) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeRouteTables");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeCustomerGateways222
-     */
-
-    public com.amazon.ec2.DescribeCustomerGatewaysResponse describeCustomerGateways(com.amazon.ec2.DescribeCustomerGateways describeCustomerGateways222) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeCustomerGateways");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteNetworkAcl224
-     */
-
-    public com.amazon.ec2.DeleteNetworkAclResponse deleteNetworkAcl(com.amazon.ec2.DeleteNetworkAcl deleteNetworkAcl224) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteNetworkAcl");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteRoute226
-     */
-
-    public com.amazon.ec2.DeleteRouteResponse deleteRoute(com.amazon.ec2.DeleteRoute deleteRoute226) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteRoute");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param rebootInstances228
-     */
-
-    public com.amazon.ec2.RebootInstancesResponse rebootInstances(com.amazon.ec2.RebootInstances rebootInstances228) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#rebootInstances");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param modifyInstanceAttribute230
-     */
-
-    public com.amazon.ec2.ModifyInstanceAttributeResponse modifyInstanceAttribute(com.amazon.ec2.ModifyInstanceAttribute modifyInstanceAttribute230) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#modifyInstanceAttribute");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param terminateInstances232
-     */
-
-    public com.amazon.ec2.TerminateInstancesResponse terminateInstances(com.amazon.ec2.TerminateInstances terminateInstances232) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#terminateInstances");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createVpnConnectionRoute234
-     */
-
-    public com.amazon.ec2.CreateVpnConnectionRouteResponse createVpnConnectionRoute(com.amazon.ec2.CreateVpnConnectionRoute createVpnConnectionRoute234) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createVpnConnectionRoute");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeConversionTasks236
-     */
-
-    public com.amazon.ec2.DescribeConversionTasksResponse describeConversionTasks(com.amazon.ec2.DescribeConversionTasks describeConversionTasks236) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeConversionTasks");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeAddresses238
-     */
-
-    public com.amazon.ec2.DescribeAddressesResponse describeAddresses(com.amazon.ec2.DescribeAddresses describeAddresses238) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeAddresses");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeInstanceAttribute240
-     */
-
-    public com.amazon.ec2.DescribeInstanceAttributeResponse describeInstanceAttribute(com.amazon.ec2.DescribeInstanceAttribute describeInstanceAttribute240) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeInstanceAttribute");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param attachInternetGateway242
-     */
-
-    public com.amazon.ec2.AttachInternetGatewayResponse attachInternetGateway(com.amazon.ec2.AttachInternetGateway attachInternetGateway242) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#attachInternetGateway");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createVpc244
-     */
-
-    public com.amazon.ec2.CreateVpcResponse createVpc(com.amazon.ec2.CreateVpc createVpc244) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createVpc");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param replaceRouteTableAssociation246
-     */
-
-    public com.amazon.ec2.ReplaceRouteTableAssociationResponse replaceRouteTableAssociation(com.amazon.ec2.ReplaceRouteTableAssociation replaceRouteTableAssociation246) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#replaceRouteTableAssociation");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param associateRouteTable248
-     */
-
-    public com.amazon.ec2.AssociateRouteTableResponse associateRouteTable(com.amazon.ec2.AssociateRouteTable associateRouteTable248) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#associateRouteTable");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param detachInternetGateway250
-     */
-
-    public com.amazon.ec2.DetachInternetGatewayResponse detachInternetGateway(com.amazon.ec2.DetachInternetGateway detachInternetGateway250) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#detachInternetGateway");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param purchaseReservedInstancesOffering252
-     */
-
-    public com.amazon.ec2.PurchaseReservedInstancesOfferingResponse purchaseReservedInstancesOffering(
-        com.amazon.ec2.PurchaseReservedInstancesOffering purchaseReservedInstancesOffering252) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#purchaseReservedInstancesOffering");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param importVolume254
-     */
-
-    public com.amazon.ec2.ImportVolumeResponse importVolume(com.amazon.ec2.ImportVolume importVolume254) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#importVolume");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeExportTasks256
-     */
-
-    public com.amazon.ec2.DescribeExportTasksResponse describeExportTasks(com.amazon.ec2.DescribeExportTasks describeExportTasks256) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeExportTasks");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createInstanceExportTask258
-     */
-
-    public com.amazon.ec2.CreateInstanceExportTaskResponse createInstanceExportTask(com.amazon.ec2.CreateInstanceExportTask createInstanceExportTask258) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createInstanceExportTask");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param assignPrivateIpAddresses260
-     */
-
-    public com.amazon.ec2.AssignPrivateIpAddressesResponse assignPrivateIpAddresses(com.amazon.ec2.AssignPrivateIpAddresses assignPrivateIpAddresses260) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#assignPrivateIpAddresses");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param reportInstanceStatus262
-     */
-
-    public com.amazon.ec2.ReportInstanceStatusResponse reportInstanceStatus(com.amazon.ec2.ReportInstanceStatus reportInstanceStatus262) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#reportInstanceStatus");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeReservedInstancesOfferings264
-     */
-
-    public com.amazon.ec2.DescribeReservedInstancesOfferingsResponse describeReservedInstancesOfferings(
-        com.amazon.ec2.DescribeReservedInstancesOfferings describeReservedInstancesOfferings264) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeReservedInstancesOfferings");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteVpnConnection266
-     */
-
-    public com.amazon.ec2.DeleteVpnConnectionResponse deleteVpnConnection(com.amazon.ec2.DeleteVpnConnection deleteVpnConnection266) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteVpnConnection");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteInternetGateway268
-     */
-
-    public com.amazon.ec2.DeleteInternetGatewayResponse deleteInternetGateway(com.amazon.ec2.DeleteInternetGateway deleteInternetGateway268) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteInternetGateway");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param deleteSpotDatafeedSubscription270
-     */
-
-    public com.amazon.ec2.DeleteSpotDatafeedSubscriptionResponse deleteSpotDatafeedSubscription(
-        com.amazon.ec2.DeleteSpotDatafeedSubscription deleteSpotDatafeedSubscription270) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#deleteSpotDatafeedSubscription");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param attachNetworkInterface272
-     */
-
-    public com.amazon.ec2.AttachNetworkInterfaceResponse attachNetworkInterface(com.amazon.ec2.AttachNetworkInterface attachNetworkInterface272) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#attachNetworkInterface");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param createNetworkInterface274
-     */
-
-    public com.amazon.ec2.CreateNetworkInterfaceResponse createNetworkInterface(com.amazon.ec2.CreateNetworkInterface createNetworkInterface274) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#createNetworkInterface");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param revokeSecurityGroupEgress276
-     */
-
-    public com.amazon.ec2.RevokeSecurityGroupEgressResponse revokeSecurityGroupEgress(com.amazon.ec2.RevokeSecurityGroupEgress revokeSecurityGroupEgress276) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#revokeSecurityGroupEgress");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param monitorInstances278
-     */
-
-    public com.amazon.ec2.MonitorInstancesResponse monitorInstances(com.amazon.ec2.MonitorInstances monitorInstances278) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#monitorInstances");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param replaceRoute280
-     */
-
-    public com.amazon.ec2.ReplaceRouteResponse replaceRoute(com.amazon.ec2.ReplaceRoute replaceRoute280) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#replaceRoute");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param attachVolume282
-     */
-
-    public com.amazon.ec2.AttachVolumeResponse attachVolume(com.amazon.ec2.AttachVolume attachVolume282) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#attachVolume");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param getConsoleOutput284
-     */
-
-    public com.amazon.ec2.GetConsoleOutputResponse getConsoleOutput(com.amazon.ec2.GetConsoleOutput getConsoleOutput284) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#getConsoleOutput");
-    }
-
-    /**
-     * Auto generated method signature
-     *
-                                 * @param describeRegions286
-     */
-
-    public com.amazon.ec2.DescribeRegionsResponse describeRegions(com.amazon.ec2.DescribeRegions describeRegions286) {
-        //TODO : fill this with the necessary business logic
-        throw new java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#describeRegions");
-    }
-
-}


[32/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index e84d54f..0000000
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngress.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AuthorizeSecurityGroupIngress bean class
-*/
-
-public class AuthorizeSecurityGroupIngress 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/", "AuthorizeSecurityGroupIngress",
-        "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 AuthorizeSecurityGroupIngress
-    */
-
-    protected com.amazon.ec2.AuthorizeSecurityGroupIngressType localAuthorizeSecurityGroupIngress;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AuthorizeSecurityGroupIngressType
-    */
-    public com.amazon.ec2.AuthorizeSecurityGroupIngressType getAuthorizeSecurityGroupIngress() {
-        return localAuthorizeSecurityGroupIngress;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AuthorizeSecurityGroupIngress
-       */
-    public void setAuthorizeSecurityGroupIngress(com.amazon.ec2.AuthorizeSecurityGroupIngressType param) {
-
-        this.localAuthorizeSecurityGroupIngress = 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 {
-                AuthorizeSecurityGroupIngress.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 (localAuthorizeSecurityGroupIngress == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAuthorizeSecurityGroupIngress.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 localAuthorizeSecurityGroupIngress.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 AuthorizeSecurityGroupIngress parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AuthorizeSecurityGroupIngress object = new AuthorizeSecurityGroupIngress();
-
-            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/", "AuthorizeSecurityGroupIngress").equals(reader.getName())) {
-
-                            object.setAuthorizeSecurityGroupIngress(com.amazon.ec2.AuthorizeSecurityGroupIngressType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 42041c3..0000000
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AuthorizeSecurityGroupIngressResponse bean class
-*/
-
-public class AuthorizeSecurityGroupIngressResponse 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/",
-        "AuthorizeSecurityGroupIngressResponse", "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 AuthorizeSecurityGroupIngressResponse
-    */
-
-    protected com.amazon.ec2.AuthorizeSecurityGroupIngressResponseType localAuthorizeSecurityGroupIngressResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AuthorizeSecurityGroupIngressResponseType
-    */
-    public com.amazon.ec2.AuthorizeSecurityGroupIngressResponseType getAuthorizeSecurityGroupIngressResponse() {
-        return localAuthorizeSecurityGroupIngressResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AuthorizeSecurityGroupIngressResponse
-       */
-    public void setAuthorizeSecurityGroupIngressResponse(com.amazon.ec2.AuthorizeSecurityGroupIngressResponseType param) {
-
-        this.localAuthorizeSecurityGroupIngressResponse = 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 {
-                AuthorizeSecurityGroupIngressResponse.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 (localAuthorizeSecurityGroupIngressResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAuthorizeSecurityGroupIngressResponse.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 localAuthorizeSecurityGroupIngressResponse.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 AuthorizeSecurityGroupIngressResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AuthorizeSecurityGroupIngressResponse object = new AuthorizeSecurityGroupIngressResponse();
-
-            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/", "AuthorizeSecurityGroupIngressResponse").equals(reader.getName())) {
-
-                            object.setAuthorizeSecurityGroupIngressResponse(com.amazon.ec2.AuthorizeSecurityGroupIngressResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f94d429..0000000
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AuthorizeSecurityGroupIngressResponseType bean class
-*/
-
-public class AuthorizeSecurityGroupIngressResponseType 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/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 {
-                AuthorizeSecurityGroupIngressResponseType.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 + ":AuthorizeSecurityGroupIngressResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AuthorizeSecurityGroupIngressResponseType", 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 AuthorizeSecurityGroupIngressResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AuthorizeSecurityGroupIngressResponseType object = new AuthorizeSecurityGroupIngressResponseType();
-
-            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 (!"AuthorizeSecurityGroupIngressResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AuthorizeSecurityGroupIngressResponseType)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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index ef3e801..0000000
--- a/awsapi/src/com/amazon/ec2/AuthorizeSecurityGroupIngressType.java
+++ /dev/null
@@ -1,536 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AuthorizeSecurityGroupIngressType bean class
-*/
-
-public class AuthorizeSecurityGroupIngressType 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/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 UserId
-    */
-
-    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
-    * @return java.lang.String
-    */
-    public java.lang.String getUserId() {
-        return localUserId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param UserId
-       */
-    public void setUserId(java.lang.String param) {
-
-        if (param != null) {
-            //update the setting tracker
-            localUserIdTracker = true;
-        } else {
-            localUserIdTracker = false;
-
-        }
-
-        this.localUserId = param;
-
-    }
-
-    /**
-    * field for AuthorizeSecurityGroupIngressTypeChoice_type0
-    */
-
-    protected com.amazon.ec2.AuthorizeSecurityGroupIngressTypeChoice_type0 localAuthorizeSecurityGroupIngressTypeChoice_type0;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AuthorizeSecurityGroupIngressTypeChoice_type0
-    */
-    public com.amazon.ec2.AuthorizeSecurityGroupIngressTypeChoice_type0 getAuthorizeSecurityGroupIngressTypeChoice_type0() {
-        return localAuthorizeSecurityGroupIngressTypeChoice_type0;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AuthorizeSecurityGroupIngressTypeChoice_type0
-       */
-    public void setAuthorizeSecurityGroupIngressTypeChoice_type0(com.amazon.ec2.AuthorizeSecurityGroupIngressTypeChoice_type0 param) {
-
-        this.localAuthorizeSecurityGroupIngressTypeChoice_type0 = 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 {
-                AuthorizeSecurityGroupIngressType.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 + ":AuthorizeSecurityGroupIngressType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AuthorizeSecurityGroupIngressType", xmlWriter);
-            }
-
-        }
-        if (localUserIdTracker) {
-            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, "userId", namespace);
-                    xmlWriter.writeNamespace(prefix, namespace);
-                    xmlWriter.setPrefix(prefix, namespace);
-
-                } else {
-                    xmlWriter.writeStartElement(namespace, "userId");
-                }
-
-            } else {
-                xmlWriter.writeStartElement("userId");
-            }
-
-            if (localUserId == null) {
-                // write the nil attribute
-
-                throw new org.apache.axis2.databinding.ADBException("userId cannot be null!!");
-
-            } else {
-
-                xmlWriter.writeCharacters(localUserId);
-
-            }
-
-            xmlWriter.writeEndElement();
-        }
-        if (localAuthorizeSecurityGroupIngressTypeChoice_type0 == null) {
-            throw new org.apache.axis2.databinding.ADBException("AuthorizeSecurityGroupIngressTypeChoice_type0 cannot be null!!");
-        }
-        localAuthorizeSecurityGroupIngressTypeChoice_type0.serialize(null, factory, xmlWriter);
-
-        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();
-
-        if (localUserIdTracker) {
-            elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "userId"));
-
-            if (localUserId != null) {
-                elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localUserId));
-            } else {
-                throw new org.apache.axis2.databinding.ADBException("userId cannot be null!!");
-            }
-        }
-        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"));
-
-        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 AuthorizeSecurityGroupIngressType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AuthorizeSecurityGroupIngressType object = new AuthorizeSecurityGroupIngressType();
-
-            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 (!"AuthorizeSecurityGroupIngressType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AuthorizeSecurityGroupIngressType)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/", "userId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setUserId(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()) {
-
-                    object.setAuthorizeSecurityGroupIngressTypeChoice_type0(com.amazon.ec2.AuthorizeSecurityGroupIngressTypeChoice_type0.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/", "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
-
-}


[37/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index ead4599..0000000
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponseType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index ba69236..0000000
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceType.java
+++ /dev/null
@@ -1,582 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 9e03b33..0000000
--- a/awsapi/src/com/amazon/ec2/AttachVolume.java
+++ /dev/null
@@ -1,322 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachVolume bean class
-*/
-
-public class AttachVolume 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/", "AttachVolume", "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 AttachVolume
-    */
-
-    protected com.amazon.ec2.AttachVolumeType localAttachVolume;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AttachVolumeType
-    */
-    public com.amazon.ec2.AttachVolumeType getAttachVolume() {
-        return localAttachVolume;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AttachVolume
-       */
-    public void setAttachVolume(com.amazon.ec2.AttachVolumeType param) {
-
-        this.localAttachVolume = 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 {
-                AttachVolume.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 (localAttachVolume == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAttachVolume.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 localAttachVolume.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 AttachVolume parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachVolume object = new AttachVolume();
-
-            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/", "AttachVolume").equals(reader.getName())) {
-
-                            object.setAttachVolume(com.amazon.ec2.AttachVolumeType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b459466..0000000
--- a/awsapi/src/com/amazon/ec2/AttachVolumeResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachVolumeResponse bean class
-*/
-
-public class AttachVolumeResponse 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/", "AttachVolumeResponse", "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 AttachVolumeResponse
-    */
-
-    protected com.amazon.ec2.AttachVolumeResponseType localAttachVolumeResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AttachVolumeResponseType
-    */
-    public com.amazon.ec2.AttachVolumeResponseType getAttachVolumeResponse() {
-        return localAttachVolumeResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AttachVolumeResponse
-       */
-    public void setAttachVolumeResponse(com.amazon.ec2.AttachVolumeResponseType param) {
-
-        this.localAttachVolumeResponse = 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 {
-                AttachVolumeResponse.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 (localAttachVolumeResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAttachVolumeResponse.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 localAttachVolumeResponse.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 AttachVolumeResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachVolumeResponse object = new AttachVolumeResponse();
-
-            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/", "AttachVolumeResponse").equals(reader.getName())) {
-
-                            object.setAttachVolumeResponse(com.amazon.ec2.AttachVolumeResponseType.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
-
-}


[11/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 404fec2..0000000
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroup.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreatePlacementGroup bean class
-*/
-
-public class CreatePlacementGroup 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/", "CreatePlacementGroup", "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 CreatePlacementGroup
-    */
-
-    protected com.amazon.ec2.CreatePlacementGroupType localCreatePlacementGroup;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreatePlacementGroupType
-    */
-    public com.amazon.ec2.CreatePlacementGroupType getCreatePlacementGroup() {
-        return localCreatePlacementGroup;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreatePlacementGroup
-       */
-    public void setCreatePlacementGroup(com.amazon.ec2.CreatePlacementGroupType param) {
-
-        this.localCreatePlacementGroup = 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 {
-                CreatePlacementGroup.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 (localCreatePlacementGroup == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreatePlacementGroup.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 localCreatePlacementGroup.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 CreatePlacementGroup parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreatePlacementGroup object = new CreatePlacementGroup();
-
-            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/", "CreatePlacementGroup").equals(reader.getName())) {
-
-                            object.setCreatePlacementGroup(com.amazon.ec2.CreatePlacementGroupType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 19e8964..0000000
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreatePlacementGroupResponse bean class
-*/
-
-public class CreatePlacementGroupResponse 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/", "CreatePlacementGroupResponse",
-        "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 CreatePlacementGroupResponse
-    */
-
-    protected com.amazon.ec2.CreatePlacementGroupResponseType localCreatePlacementGroupResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.CreatePlacementGroupResponseType
-    */
-    public com.amazon.ec2.CreatePlacementGroupResponseType getCreatePlacementGroupResponse() {
-        return localCreatePlacementGroupResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param CreatePlacementGroupResponse
-       */
-    public void setCreatePlacementGroupResponse(com.amazon.ec2.CreatePlacementGroupResponseType param) {
-
-        this.localCreatePlacementGroupResponse = 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 {
-                CreatePlacementGroupResponse.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 (localCreatePlacementGroupResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localCreatePlacementGroupResponse.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 localCreatePlacementGroupResponse.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 CreatePlacementGroupResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreatePlacementGroupResponse object = new CreatePlacementGroupResponse();
-
-            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/", "CreatePlacementGroupResponse").equals(reader.getName())) {
-
-                            object.setCreatePlacementGroupResponse(com.amazon.ec2.CreatePlacementGroupResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 86c5b43..0000000
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreatePlacementGroupResponseType bean class
-*/
-
-public class CreatePlacementGroupResponseType 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/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 {
-                CreatePlacementGroupResponseType.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 + ":CreatePlacementGroupResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreatePlacementGroupResponseType", 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 CreatePlacementGroupResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreatePlacementGroupResponseType object = new CreatePlacementGroupResponseType();
-
-            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 (!"CreatePlacementGroupResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreatePlacementGroupResponseType)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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 7cfc46e..0000000
--- a/awsapi/src/com/amazon/ec2/CreatePlacementGroupType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  CreatePlacementGroupType bean class
-*/
-
-public class CreatePlacementGroupType 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/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 GroupName
-    */
-
-    protected java.lang.String localGroupName;
-
-    /**
-    * 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) {
-
-        this.localGroupName = param;
-
-    }
-
-    /**
-    * field for Strategy
-    */
-
-    protected java.lang.String localStrategy;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getStrategy() {
-        return localStrategy;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Strategy
-       */
-    public void setStrategy(java.lang.String param) {
-
-        this.localStrategy = 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 {
-                CreatePlacementGroupType.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 + ":CreatePlacementGroupType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "CreatePlacementGroupType", 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, "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();
-
-        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, "strategy", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "strategy");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("strategy");
-        }
-
-        if (localStrategy == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("strategy cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localStrategy);
-
-        }
-
-        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/", "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/2012-08-15/", "strategy"));
-
-        if (localStrategy != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStrategy));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("strategy 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 CreatePlacementGroupType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            CreatePlacementGroupType object = new CreatePlacementGroupType();
-
-            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 (!"CreatePlacementGroupType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (CreatePlacementGroupType)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/", "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
-
-                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/", "strategy").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setStrategy(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index d2d441c..0000000
--- a/awsapi/src/com/amazon/ec2/CreateReservedInstancesListing.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[13/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index b98823d..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclEntryType.java
+++ /dev/null
@@ -1,954 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index a80bf81..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 0dcac84..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 2bb15c2..0000000
--- a/awsapi/src/com/amazon/ec2/CreateNetworkAclType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[35/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 337f7a4..0000000
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayResponseType.java
+++ /dev/null
@@ -1,477 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachVpnGatewayResponseType bean class
-*/
-
-public class AttachVpnGatewayResponseType 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/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 Attachment
-    */
-
-    protected com.amazon.ec2.AttachmentType localAttachment;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AttachmentType
-    */
-    public com.amazon.ec2.AttachmentType getAttachment() {
-        return localAttachment;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Attachment
-       */
-    public void setAttachment(com.amazon.ec2.AttachmentType param) {
-
-        this.localAttachment = 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 {
-                AttachVpnGatewayResponseType.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 + ":AttachVpnGatewayResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AttachVpnGatewayResponseType", 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 (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/2012-08-15/", "attachment"), 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/", "attachment"));
-
-        if (localAttachment == null) {
-            throw new org.apache.axis2.databinding.ADBException("attachment cannot be null!!");
-        }
-        elementList.add(localAttachment);
-
-        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 AttachVpnGatewayResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachVpnGatewayResponseType object = new AttachVpnGatewayResponseType();
-
-            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 (!"AttachVpnGatewayResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AttachVpnGatewayResponseType)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/", "attachment").equals(reader.getName())) {
-
-                    object.setAttachment(com.amazon.ec2.AttachmentType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index a96e5da..0000000
--- a/awsapi/src/com/amazon/ec2/AttachVpnGatewayType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachVpnGatewayType bean class
-*/
-
-public class AttachVpnGatewayType 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/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 VpnGatewayId
-    */
-
-    protected java.lang.String localVpnGatewayId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getVpnGatewayId() {
-        return localVpnGatewayId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param VpnGatewayId
-       */
-    public void setVpnGatewayId(java.lang.String param) {
-
-        this.localVpnGatewayId = 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 {
-                AttachVpnGatewayType.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 + ":AttachVpnGatewayType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AttachVpnGatewayType", 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, "vpnGatewayId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "vpnGatewayId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("vpnGatewayId");
-        }
-
-        if (localVpnGatewayId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("vpnGatewayId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localVpnGatewayId);
-
-        }
-
-        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/", "vpnGatewayId"));
-
-        if (localVpnGatewayId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVpnGatewayId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("vpnGatewayId 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 AttachVpnGatewayType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachVpnGatewayType object = new AttachVpnGatewayType();
-
-            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 (!"AttachVpnGatewayType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AttachVpnGatewayType)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/", "vpnGatewayId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setVpnGatewayId(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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index d675c96..0000000
--- a/awsapi/src/com/amazon/ec2/AttachmentSetItemResponseType.java
+++ /dev/null
@@ -1,828 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AttachmentSetItemResponseType bean class
-*/
-
-public class AttachmentSetItemResponseType 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/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 VolumeId
-    */
-
-    protected java.lang.String localVolumeId;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getVolumeId() {
-        return localVolumeId;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param VolumeId
-       */
-    public void setVolumeId(java.lang.String param) {
-
-        this.localVolumeId = 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 Device
-    */
-
-    protected java.lang.String localDevice;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getDevice() {
-        return localDevice;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Device
-       */
-    public void setDevice(java.lang.String param) {
-
-        this.localDevice = param;
-
-    }
-
-    /**
-    * field for Status
-    */
-
-    protected java.lang.String localStatus;
-
-    /**
-    * Auto generated getter method
-    * @return java.lang.String
-    */
-    public java.lang.String getStatus() {
-        return localStatus;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param Status
-       */
-    public void setStatus(java.lang.String param) {
-
-        this.localStatus = param;
-
-    }
-
-    /**
-    * field for AttachTime
-    */
-
-    protected java.util.Calendar localAttachTime;
-
-    /**
-    * Auto generated getter method
-    * @return java.util.Calendar
-    */
-    public java.util.Calendar getAttachTime() {
-        return localAttachTime;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AttachTime
-       */
-    public void setAttachTime(java.util.Calendar param) {
-
-        this.localAttachTime = param;
-
-    }
-
-    /**
-    * field for DeleteOnTermination
-    */
-
-    protected boolean localDeleteOnTermination;
-
-    /**
-    * Auto generated getter method
-    * @return boolean
-    */
-    public boolean getDeleteOnTermination() {
-        return localDeleteOnTermination;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param DeleteOnTermination
-       */
-    public void setDeleteOnTermination(boolean param) {
-
-        this.localDeleteOnTermination = 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 {
-                AttachmentSetItemResponseType.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 + ":AttachmentSetItemResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AttachmentSetItemResponseType", 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, "volumeId", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "volumeId");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("volumeId");
-        }
-
-        if (localVolumeId == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("volumeId cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localVolumeId);
-
-        }
-
-        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, "device", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "device");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("device");
-        }
-
-        if (localDevice == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("device cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localDevice);
-
-        }
-
-        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, "status", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "status");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("status");
-        }
-
-        if (localStatus == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(localStatus);
-
-        }
-
-        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, "attachTime", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "attachTime");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("attachTime");
-        }
-
-        if (localAttachTime == null) {
-            // write the nil attribute
-
-            throw new org.apache.axis2.databinding.ADBException("attachTime cannot be null!!");
-
-        } else {
-
-            xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAttachTime));
-
-        }
-
-        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, "deleteOnTermination", namespace);
-                xmlWriter.writeNamespace(prefix, namespace);
-                xmlWriter.setPrefix(prefix, namespace);
-
-            } else {
-                xmlWriter.writeStartElement(namespace, "deleteOnTermination");
-            }
-
-        } else {
-            xmlWriter.writeStartElement("deleteOnTermination");
-        }
-
-        if (false) {
-
-            throw new org.apache.axis2.databinding.ADBException("deleteOnTermination cannot be null!!");
-
-        } else {
-            xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDeleteOnTermination));
-        }
-
-        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/", "volumeId"));
-
-        if (localVolumeId != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localVolumeId));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("volumeId 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/", "device"));
-
-        if (localDevice != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDevice));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("device cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "status"));
-
-        if (localStatus != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localStatus));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("status cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "attachTime"));
-
-        if (localAttachTime != null) {
-            elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localAttachTime));
-        } else {
-            throw new org.apache.axis2.databinding.ADBException("attachTime cannot be null!!");
-        }
-
-        elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "deleteOnTermination"));
-
-        elementList.add(org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localDeleteOnTermination));
-
-        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 AttachmentSetItemResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AttachmentSetItemResponseType object = new AttachmentSetItemResponseType();
-
-            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 (!"AttachmentSetItemResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AttachmentSetItemResponseType)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/", "volumeId").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setVolumeId(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/", "device").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setDevice(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/", "status").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setStatus(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/", "attachTime").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setAttachTime(org.apache.axis2.databinding.utils.ConverterUtil.convertToDateTime(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/", "deleteOnTermination").equals(reader.getName())) {
-
-                    java.lang.String content = reader.getElementText();
-
-                    object.setDeleteOnTermination(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
-
-}


[47/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index bfec997..0000000
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponse.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AllocateAddressResponse bean class
-*/
-
-public class AllocateAddressResponse 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/", "AllocateAddressResponse", "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 AllocateAddressResponse
-    */
-
-    protected com.amazon.ec2.AllocateAddressResponseType localAllocateAddressResponse;
-
-    /**
-    * Auto generated getter method
-    * @return com.amazon.ec2.AllocateAddressResponseType
-    */
-    public com.amazon.ec2.AllocateAddressResponseType getAllocateAddressResponse() {
-        return localAllocateAddressResponse;
-    }
-
-    /**
-       * Auto generated setter method
-       * @param param AllocateAddressResponse
-       */
-    public void setAllocateAddressResponse(com.amazon.ec2.AllocateAddressResponseType param) {
-
-        this.localAllocateAddressResponse = 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 {
-                AllocateAddressResponse.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 (localAllocateAddressResponse == null) {
-            throw new org.apache.axis2.databinding.ADBException("Property cannot be null!");
-        }
-        localAllocateAddressResponse.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 localAllocateAddressResponse.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 AllocateAddressResponse parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AllocateAddressResponse object = new AllocateAddressResponse();
-
-            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/", "AllocateAddressResponse").equals(reader.getName())) {
-
-                            object.setAllocateAddressResponse(com.amazon.ec2.AllocateAddressResponseType.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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 57aa866..0000000
--- a/awsapi/src/com/amazon/ec2/AllocateAddressResponseType.java
+++ /dev/null
@@ -1,685 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AllocateAddressResponseType bean class
-*/
-
-public class AllocateAddressResponseType 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/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 PublicIp
-    */
-
-    protected java.lang.String localPublicIp;
-
-    /**
-    * 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) {
-
-        this.localPublicIp = 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 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
-    */
-    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 {
-                AllocateAddressResponseType.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 + ":AllocateAddressResponseType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AllocateAddressResponseType", 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, "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();
-
-        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();
-
-    }
-
-    /**
-     * 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/", "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!!");
-        }
-
-        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());
-
-    }
-
-    /**
-     *  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 AllocateAddressResponseType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AllocateAddressResponseType object = new AllocateAddressResponseType();
-
-            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 (!"AllocateAddressResponseType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AllocateAddressResponseType)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/", "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 {
-                    // 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();
-
-                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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 52b183c..0000000
--- a/awsapi/src/com/amazon/ec2/AllocateAddressType.java
+++ /dev/null
@@ -1,440 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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.6  Built on : Aug 30, 2011 (10:01:01 CEST)
- */
-
-package com.amazon.ec2;
-
-/**
-*  AllocateAddressType bean class
-*/
-
-public class AllocateAddressType 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/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 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
-    */
-    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 {
-                AllocateAddressType.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 + ":AllocateAddressType", xmlWriter);
-            } else {
-                writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "type", "AllocateAddressType", xmlWriter);
-            }
-
-        }
-        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();
-
-    }
-
-    /**
-     * 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 (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());
-
-    }
-
-    /**
-     *  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 AllocateAddressType parse(javax.xml.stream.XMLStreamReader reader) throws java.lang.Exception {
-            AllocateAddressType object = new AllocateAddressType();
-
-            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 (!"AllocateAddressType".equals(type)) {
-                            //find namespace for the prefix
-                            java.lang.String nsUri = reader.getNamespaceContext().getNamespaceURI(nsPrefix);
-                            return (AllocateAddressType)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/", "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());
-
-            } catch (javax.xml.stream.XMLStreamException e) {
-                throw new java.lang.Exception(e);
-            }
-
-            return object;
-        }
-
-    }//end of factory class
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 5777160..0000000
--- a/awsapi/src/com/amazon/ec2/AllocationIdSetItemType.java
+++ /dev/null
@@ -1,425 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}


[38/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index a765ed6..0000000
--- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index f3dee0e..0000000
--- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayResponseType.java
+++ /dev/null
@@ -1,500 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 1d2b5b0..0000000
--- a/awsapi/src/com/amazon/ec2/AttachInternetGatewayType.java
+++ /dev/null
@@ -1,507 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 2e4ae98..0000000
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterface.java
+++ /dev/null
@@ -1,323 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84042f2c/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
deleted file mode 100644
index 12f0954..0000000
--- a/awsapi/src/com/amazon/ec2/AttachNetworkInterfaceResponse.java
+++ /dev/null
@@ -1,324 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT 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
- *
- * 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
-
-}