cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject [30/51] [partial] git commit: updated refs/heads/noawsapi to 84042f2
Date Mon, 24 Nov 2014 10:39:17 GMT
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
-
-}


Mime
View raw message