Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EE36AC196 for ; Fri, 28 Jun 2013 05:34:02 +0000 (UTC) Received: (qmail 46522 invoked by uid 500); 28 Jun 2013 05:33:49 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 46460 invoked by uid 500); 28 Jun 2013 05:33:49 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 42069 invoked by uid 99); 28 Jun 2013 05:33:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jun 2013 05:33:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 77FBD3A0E1; Fri, 28 Jun 2013 05:33:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: likithas@apache.org To: commits@cloudstack.apache.org Date: Fri, 28 Jun 2013 05:33:48 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [30/55] [abbrv] [partial] CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15] http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java index 1334e03..d0676bc 100644 --- a/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java +++ b/awsapi/src/com/amazon/ec2/ConversionTaskTypeChoice_type0.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * ConversionTaskTypeChoice_type0.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,13 +17,13 @@ implements org.apache.axis2.databinding.ADBBean{ /* This type was generated from the piece of schema that had name = ConversionTaskTypeChoice_type0 - Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/ + Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/ Namespace Prefix = ns1 */ private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -212,7 +196,7 @@ if (serializeType){ - java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/"); + java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type", namespacePrefix+":ConversionTaskTypeChoice_type0", @@ -229,13 +213,13 @@ if (localImportVolume==null){ throw new org.apache.axis2.databinding.ADBException("importVolume cannot be null!!"); } - localImportVolume.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","importVolume"), + localImportVolume.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","importVolume"), factory,xmlWriter); } if (localImportInstanceTracker){ if (localImportInstance==null){ throw new org.apache.axis2.databinding.ADBException("importInstance cannot be null!!"); } - localImportInstance.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","importInstance"), + localImportInstance.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","importInstance"), factory,xmlWriter); } @@ -398,7 +382,7 @@ java.util.ArrayList attribList = new java.util.ArrayList(); if (localImportVolumeTracker){ - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "importVolume")); @@ -407,7 +391,7 @@ } elementList.add(localImportVolume); } if (localImportInstanceTracker){ - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "importInstance")); @@ -462,7 +446,7 @@ - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","importVolume").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","importVolume").equals(reader.getName())){ object.setImportVolume(com.amazon.ec2.ImportVolumeTaskDetailsType.Factory.parse(reader)); @@ -472,7 +456,7 @@ else - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","importInstance").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","importInstance").equals(reader.getName())){ object.setImportInstance(com.amazon.ec2.ImportInstanceTaskDetailsType.Factory.parse(reader)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java index 3f3fead..c426e35 100644 --- a/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java +++ b/awsapi/src/com/amazon/ec2/CreateCustomerGateway.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateCustomerGateway.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,14 +17,14 @@ implements org.apache.axis2.databinding.ADBBean{ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2010-11-15/", + "http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGateway", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -343,7 +327,7 @@ while(!reader.isEndElement()) { if (reader.isStartElement() ){ - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateCustomerGateway").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateCustomerGateway").equals(reader.getName())){ object.setCreateCustomerGateway(com.amazon.ec2.CreateCustomerGatewayType.Factory.parse(reader)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java index 7db1f8b..69e485a 100644 --- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponse.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateCustomerGatewayResponse.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,14 +17,14 @@ implements org.apache.axis2.databinding.ADBBean{ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2010-11-15/", + "http://ec2.amazonaws.com/doc/2012-08-15/", "CreateCustomerGatewayResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -343,7 +327,7 @@ while(!reader.isEndElement()) { if (reader.isStartElement() ){ - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateCustomerGatewayResponse").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateCustomerGatewayResponse").equals(reader.getName())){ object.setCreateCustomerGatewayResponse(com.amazon.ec2.CreateCustomerGatewayResponseType.Factory.parse(reader)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java index 29956db..4ad9835 100644 --- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayResponseType.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateCustomerGatewayResponseType.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,13 +17,13 @@ implements org.apache.axis2.databinding.ADBBean{ /* This type was generated from the piece of schema that had name = CreateCustomerGatewayResponseType - Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/ + Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/ Namespace Prefix = ns1 */ private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -190,7 +174,7 @@ if (serializeType){ - java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/"); + java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type", namespacePrefix+":CreateCustomerGatewayResponseType", @@ -204,7 +188,7 @@ } - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -241,7 +225,7 @@ if (localCustomerGateway==null){ throw new org.apache.axis2.databinding.ADBException("customerGateway cannot be null!!"); } - localCustomerGateway.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","customerGateway"), + localCustomerGateway.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","customerGateway"), factory,xmlWriter); xmlWriter.writeEndElement(); @@ -406,7 +390,7 @@ java.util.ArrayList attribList = new java.util.ArrayList(); - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "requestId")); if (localRequestId != null){ @@ -415,7 +399,7 @@ throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!"); } - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "customerGateway")); @@ -502,7 +486,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){ java.lang.String content = reader.getElementText(); @@ -521,7 +505,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","customerGateway").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","customerGateway").equals(reader.getName())){ object.setCustomerGateway(com.amazon.ec2.CustomerGatewayType.Factory.parse(reader)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java index f183a61..086ccbf 100644 --- a/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java +++ b/awsapi/src/com/amazon/ec2/CreateCustomerGatewayType.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateCustomerGatewayType.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,13 +17,13 @@ implements org.apache.axis2.databinding.ADBBean{ /* This type was generated from the piece of schema that had name = CreateCustomerGatewayType - Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/ + Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/ Namespace Prefix = ns1 */ private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -114,6 +98,12 @@ protected int localBgpAsn ; + /* This tracker boolean wil be used to detect whether the user called the set method + * for this attribute. It will be used to determine whether to include this field + * in the serialized XML + */ + protected boolean localBgpAsnTracker = false ; + /** * Auto generated getter method @@ -131,6 +121,15 @@ */ public void setBgpAsn(int param){ + // setting primitive attribute tracker to true + + if (param==java.lang.Integer.MIN_VALUE) { + localBgpAsnTracker = false; + + } else { + localBgpAsnTracker = true; + } + this.localBgpAsn=param; @@ -220,7 +219,7 @@ if (serializeType){ - java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/"); + java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type", namespacePrefix+":CreateCustomerGatewayType", @@ -234,7 +233,7 @@ } - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -268,7 +267,7 @@ xmlWriter.writeEndElement(); - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -301,8 +300,8 @@ } xmlWriter.writeEndElement(); - - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + if (localBgpAsnTracker){ + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -330,7 +329,7 @@ } xmlWriter.writeEndElement(); - + } xmlWriter.writeEndElement(); @@ -493,7 +492,7 @@ java.util.ArrayList attribList = new java.util.ArrayList(); - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "type")); if (localType != null){ @@ -502,7 +501,7 @@ throw new org.apache.axis2.databinding.ADBException("type cannot be null!!"); } - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "ipAddress")); if (localIpAddress != null){ @@ -510,13 +509,13 @@ } else { throw new org.apache.axis2.databinding.ADBException("ipAddress cannot be null!!"); } - - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + if (localBgpAsnTracker){ + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "bgpAsn")); elementList.add( org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localBgpAsn)); - + } return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray()); @@ -595,7 +594,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","type").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","type").equals(reader.getName())){ java.lang.String content = reader.getElementText(); @@ -614,7 +613,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","ipAddress").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","ipAddress").equals(reader.getName())){ java.lang.String content = reader.getElementText(); @@ -633,7 +632,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","bgpAsn").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","bgpAsn").equals(reader.getName())){ java.lang.String content = reader.getElementText(); @@ -644,11 +643,12 @@ } // End of if for expected property start element - else{ - // A start element we are not expecting indicates an invalid parameter was passed - throw new org.apache.axis2.databinding.ADBException("Unexpected subelement " + reader.getLocalName()); - } - + else { + + object.setBgpAsn(java.lang.Integer.MIN_VALUE); + + } + while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java index 5ffeb59..f98ca97 100644 --- a/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java +++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptions.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateDhcpOptions.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,14 +17,14 @@ implements org.apache.axis2.databinding.ADBBean{ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2010-11-15/", + "http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptions", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -343,7 +327,7 @@ while(!reader.isEndElement()) { if (reader.isStartElement() ){ - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateDhcpOptions").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateDhcpOptions").equals(reader.getName())){ object.setCreateDhcpOptions(com.amazon.ec2.CreateDhcpOptionsType.Factory.parse(reader)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java index ac7fe08..c15a47e 100644 --- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponse.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateDhcpOptionsResponse.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,14 +17,14 @@ implements org.apache.axis2.databinding.ADBBean{ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2010-11-15/", + "http://ec2.amazonaws.com/doc/2012-08-15/", "CreateDhcpOptionsResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -343,7 +327,7 @@ while(!reader.isEndElement()) { if (reader.isStartElement() ){ - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateDhcpOptionsResponse").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateDhcpOptionsResponse").equals(reader.getName())){ object.setCreateDhcpOptionsResponse(com.amazon.ec2.CreateDhcpOptionsResponseType.Factory.parse(reader)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java index d63ca78..282d7d8 100644 --- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsResponseType.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateDhcpOptionsResponseType.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,13 +17,13 @@ implements org.apache.axis2.databinding.ADBBean{ /* This type was generated from the piece of schema that had name = CreateDhcpOptionsResponseType - Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/ + Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/ Namespace Prefix = ns1 */ private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -190,7 +174,7 @@ if (serializeType){ - java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/"); + java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type", namespacePrefix+":CreateDhcpOptionsResponseType", @@ -204,7 +188,7 @@ } - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -241,7 +225,7 @@ if (localDhcpOptions==null){ throw new org.apache.axis2.databinding.ADBException("dhcpOptions cannot be null!!"); } - localDhcpOptions.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","dhcpOptions"), + localDhcpOptions.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","dhcpOptions"), factory,xmlWriter); xmlWriter.writeEndElement(); @@ -406,7 +390,7 @@ java.util.ArrayList attribList = new java.util.ArrayList(); - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "requestId")); if (localRequestId != null){ @@ -415,7 +399,7 @@ throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!"); } - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "dhcpOptions")); @@ -502,7 +486,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){ java.lang.String content = reader.getElementText(); @@ -521,7 +505,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","dhcpOptions").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","dhcpOptions").equals(reader.getName())){ object.setDhcpOptions(com.amazon.ec2.DhcpOptionsType.Factory.parse(reader)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java index 7462820..ad5b13d 100644 --- a/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java +++ b/awsapi/src/com/amazon/ec2/CreateDhcpOptionsType.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateDhcpOptionsType.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,13 +17,13 @@ implements org.apache.axis2.databinding.ADBBean{ /* This type was generated from the piece of schema that had name = CreateDhcpOptionsType - Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/ + Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/ Namespace Prefix = ns1 */ private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -160,7 +144,7 @@ if (serializeType){ - java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/"); + java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type", namespacePrefix+":CreateDhcpOptionsType", @@ -177,7 +161,7 @@ if (localDhcpConfigurationSet==null){ throw new org.apache.axis2.databinding.ADBException("dhcpConfigurationSet cannot be null!!"); } - localDhcpConfigurationSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","dhcpConfigurationSet"), + localDhcpConfigurationSet.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","dhcpConfigurationSet"), factory,xmlWriter); xmlWriter.writeEndElement(); @@ -342,7 +326,7 @@ java.util.ArrayList attribList = new java.util.ArrayList(); - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "dhcpConfigurationSet")); @@ -429,7 +413,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","dhcpConfigurationSet").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","dhcpConfigurationSet").equals(reader.getName())){ object.setDhcpConfigurationSet(com.amazon.ec2.DhcpConfigurationItemSetType.Factory.parse(reader)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateImage.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateImage.java b/awsapi/src/com/amazon/ec2/CreateImage.java index efdbdc2..0c089dd 100644 --- a/awsapi/src/com/amazon/ec2/CreateImage.java +++ b/awsapi/src/com/amazon/ec2/CreateImage.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateImage.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,14 +17,14 @@ implements org.apache.axis2.databinding.ADBBean{ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2010-11-15/", + "http://ec2.amazonaws.com/doc/2012-08-15/", "CreateImage", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -343,7 +327,7 @@ while(!reader.isEndElement()) { if (reader.isStartElement() ){ - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateImage").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateImage").equals(reader.getName())){ object.setCreateImage(com.amazon.ec2.CreateImageType.Factory.parse(reader)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateImageResponse.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateImageResponse.java b/awsapi/src/com/amazon/ec2/CreateImageResponse.java index c90e1e4..19e7a34 100644 --- a/awsapi/src/com/amazon/ec2/CreateImageResponse.java +++ b/awsapi/src/com/amazon/ec2/CreateImageResponse.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateImageResponse.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,14 +17,14 @@ implements org.apache.axis2.databinding.ADBBean{ public static final javax.xml.namespace.QName MY_QNAME = new javax.xml.namespace.QName( - "http://ec2.amazonaws.com/doc/2010-11-15/", + "http://ec2.amazonaws.com/doc/2012-08-15/", "CreateImageResponse", "ns1"); private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -343,7 +327,7 @@ while(!reader.isEndElement()) { if (reader.isStartElement() ){ - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","CreateImageResponse").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","CreateImageResponse").equals(reader.getName())){ object.setCreateImageResponse(com.amazon.ec2.CreateImageResponseType.Factory.parse(reader)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateImageResponseType.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java index dbcaca0..4a816b1 100644 --- a/awsapi/src/com/amazon/ec2/CreateImageResponseType.java +++ b/awsapi/src/com/amazon/ec2/CreateImageResponseType.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateImageResponseType.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,13 +17,13 @@ implements org.apache.axis2.databinding.ADBBean{ /* This type was generated from the piece of schema that had name = CreateImageResponseType - Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/ + Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/ Namespace Prefix = ns1 */ private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -190,7 +174,7 @@ if (serializeType){ - java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/"); + java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type", namespacePrefix+":CreateImageResponseType", @@ -204,7 +188,7 @@ } - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -238,7 +222,7 @@ xmlWriter.writeEndElement(); - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -434,7 +418,7 @@ java.util.ArrayList attribList = new java.util.ArrayList(); - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "requestId")); if (localRequestId != null){ @@ -443,7 +427,7 @@ throw new org.apache.axis2.databinding.ADBException("requestId cannot be null!!"); } - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "imageId")); if (localImageId != null){ @@ -530,7 +514,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","requestId").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","requestId").equals(reader.getName())){ java.lang.String content = reader.getElementText(); @@ -549,7 +533,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","imageId").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","imageId").equals(reader.getName())){ java.lang.String content = reader.getElementText(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cefe9491/awsapi/src/com/amazon/ec2/CreateImageType.java ---------------------------------------------------------------------- diff --git a/awsapi/src/com/amazon/ec2/CreateImageType.java b/awsapi/src/com/amazon/ec2/CreateImageType.java index 7add5f6..9dc92c5 100644 --- a/awsapi/src/com/amazon/ec2/CreateImageType.java +++ b/awsapi/src/com/amazon/ec2/CreateImageType.java @@ -1,25 +1,9 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. /** * CreateImageType.java * * This file was auto-generated from WSDL - * by the Apache Axis2 version: 1.5.1 Built on : Oct 19, 2009 (10:59:34 EDT) + * by the Apache Axis2 version: 1.5.6 Built on : Aug 30, 2011 (10:01:01 CEST) */ package com.amazon.ec2; @@ -33,13 +17,13 @@ implements org.apache.axis2.databinding.ADBBean{ /* This type was generated from the piece of schema that had name = CreateImageType - Namespace URI = http://ec2.amazonaws.com/doc/2010-11-15/ + Namespace URI = http://ec2.amazonaws.com/doc/2012-08-15/ Namespace Prefix = ns1 */ private static java.lang.String generatePrefix(java.lang.String namespace) { - if(namespace.equals("http://ec2.amazonaws.com/doc/2010-11-15/")){ + if(namespace.equals("http://ec2.amazonaws.com/doc/2012-08-15/")){ return "ns1"; } return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix(); @@ -196,6 +180,50 @@ } + /** + * field for BlockDeviceMapping + */ + + + protected com.amazon.ec2.BlockDeviceMappingType localBlockDeviceMapping ; + + /* This tracker boolean wil be used to detect whether the user called the set method + * for this attribute. It will be used to determine whether to include this field + * in the serialized XML + */ + protected boolean localBlockDeviceMappingTracker = false ; + + + /** + * Auto generated getter method + * @return com.amazon.ec2.BlockDeviceMappingType + */ + public com.amazon.ec2.BlockDeviceMappingType getBlockDeviceMapping(){ + return localBlockDeviceMapping; + } + + + + /** + * Auto generated setter method + * @param param BlockDeviceMapping + */ + public void setBlockDeviceMapping(com.amazon.ec2.BlockDeviceMappingType param){ + + if (param != null){ + //update the setting tracker + localBlockDeviceMappingTracker = true; + } else { + localBlockDeviceMappingTracker = false; + + } + + this.localBlockDeviceMapping=param; + + + } + + /** * isReaderMTOMAware * @return true if the reader supports MTOM @@ -279,7 +307,7 @@ if (serializeType){ - java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2010-11-15/"); + java.lang.String namespacePrefix = registerPrefix(xmlWriter,"http://ec2.amazonaws.com/doc/2012-08-15/"); if ((namespacePrefix != null) && (namespacePrefix.trim().length() > 0)){ writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","type", namespacePrefix+":CreateImageType", @@ -293,7 +321,7 @@ } - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -327,7 +355,7 @@ xmlWriter.writeEndElement(); - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -361,7 +389,7 @@ xmlWriter.writeEndElement(); if (localDescriptionTracker){ - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -395,7 +423,7 @@ xmlWriter.writeEndElement(); } if (localNoRebootTracker){ - namespace = "http://ec2.amazonaws.com/doc/2010-11-15/"; + namespace = "http://ec2.amazonaws.com/doc/2012-08-15/"; if (! namespace.equals("")) { prefix = xmlWriter.getPrefix(namespace); @@ -423,7 +451,13 @@ } xmlWriter.writeEndElement(); - } + } if (localBlockDeviceMappingTracker){ + if (localBlockDeviceMapping==null){ + throw new org.apache.axis2.databinding.ADBException("blockDeviceMapping cannot be null!!"); + } + localBlockDeviceMapping.serialize(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","blockDeviceMapping"), + factory,xmlWriter); + } xmlWriter.writeEndElement(); @@ -586,7 +620,7 @@ java.util.ArrayList attribList = new java.util.ArrayList(); - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "instanceId")); if (localInstanceId != null){ @@ -595,7 +629,7 @@ throw new org.apache.axis2.databinding.ADBException("instanceId cannot be null!!"); } - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "name")); if (localName != null){ @@ -604,7 +638,7 @@ throw new org.apache.axis2.databinding.ADBException("name cannot be null!!"); } if (localDescriptionTracker){ - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "description")); if (localDescription != null){ @@ -613,12 +647,21 @@ throw new org.apache.axis2.databinding.ADBException("description cannot be null!!"); } } if (localNoRebootTracker){ - elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/", + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", "noReboot")); elementList.add( org.apache.axis2.databinding.utils.ConverterUtil.convertToString(localNoReboot)); - } + } if (localBlockDeviceMappingTracker){ + elementList.add(new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/", + "blockDeviceMapping")); + + + if (localBlockDeviceMapping==null){ + throw new org.apache.axis2.databinding.ADBException("blockDeviceMapping cannot be null!!"); + } + elementList.add(localBlockDeviceMapping); + } return new org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl(qName, elementList.toArray(), attribList.toArray()); @@ -697,7 +740,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","instanceId").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","instanceId").equals(reader.getName())){ java.lang.String content = reader.getElementText(); @@ -716,7 +759,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","name").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","name").equals(reader.getName())){ java.lang.String content = reader.getElementText(); @@ -735,7 +778,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","description").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","description").equals(reader.getName())){ java.lang.String content = reader.getElementText(); @@ -753,7 +796,7 @@ while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); - if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2010-11-15/","noReboot").equals(reader.getName())){ + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","noReboot").equals(reader.getName())){ java.lang.String content = reader.getElementText(); @@ -767,6 +810,21 @@ else { } + + + while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); + + if (reader.isStartElement() && new javax.xml.namespace.QName("http://ec2.amazonaws.com/doc/2012-08-15/","blockDeviceMapping").equals(reader.getName())){ + + object.setBlockDeviceMapping(com.amazon.ec2.BlockDeviceMappingType.Factory.parse(reader)); + + reader.next(); + + } // End of if for expected property start element + + else { + + } while (!reader.isStartElement() && !reader.isEndElement()) reader.next();