diff --git a/build/build-cloud.xml b/build/build-cloud.xml index 8e1f824137a..85550a3dd3f 100755 --- a/build/build-cloud.xml +++ b/build/build-cloud.xml @@ -260,44 +260,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -351,7 +317,7 @@ - + diff --git a/build/package.xml b/build/package.xml index ab6bedc5e5b..31aee189c73 100755 --- a/build/package.xml +++ b/build/package.xml @@ -151,6 +151,7 @@ + diff --git a/core/src/com/cloud/api/ResponseObjectTypeAdapter.java b/core/src/com/cloud/api/ResponseObjectTypeAdapter.java index 74eb56bdecb..670ed0ed39f 100644 --- a/core/src/com/cloud/api/ResponseObjectTypeAdapter.java +++ b/core/src/com/cloud/api/ResponseObjectTypeAdapter.java @@ -50,7 +50,15 @@ public class ResponseObjectTypeAdapter implements JsonSerializer ResponseObject subObj = (ResponseObject)fieldValue; obj.add(serializedName.value(), serialize(subObj, subObj.getClass(), ctx)); } else { - obj.addProperty(serializedName.value(), fieldValue.toString()); + if (fieldValue instanceof Number) { + obj.addProperty(serializedName.value(), (Number)fieldValue); + } else if (fieldValue instanceof Character) { + obj.addProperty(serializedName.value(), (Character)fieldValue); + } else if (fieldValue instanceof Boolean) { + obj.addProperty(serializedName.value(), (Boolean)fieldValue); + } else { + obj.addProperty(serializedName.value(), fieldValue.toString()); + } } } } catch (IllegalArgumentException e) { diff --git a/deps/vmware-apputils.jar b/deps/vmware-apputils.jar new file mode 100644 index 00000000000..f93d46eba06 Binary files /dev/null and b/deps/vmware-apputils.jar differ diff --git a/deps/vmware-credstore.jar b/deps/vmware-credstore.jar new file mode 100644 index 00000000000..b661fd878b6 Binary files /dev/null and b/deps/vmware-credstore.jar differ diff --git a/deps/vmware-lib-activation.jar b/deps/vmware-lib-activation.jar new file mode 100644 index 00000000000..8cbef16f485 Binary files /dev/null and b/deps/vmware-lib-activation.jar differ diff --git a/deps/vmware-lib-axis.jar b/deps/vmware-lib-axis.jar new file mode 100644 index 00000000000..20b09a595b4 Binary files /dev/null and b/deps/vmware-lib-axis.jar differ diff --git a/deps/vmware-lib-jaxen-core.jar b/deps/vmware-lib-jaxen-core.jar new file mode 100644 index 00000000000..e52bf679cc0 Binary files /dev/null and b/deps/vmware-lib-jaxen-core.jar differ diff --git a/deps/vmware-lib-jaxen-jdom.jar b/deps/vmware-lib-jaxen-jdom.jar new file mode 100644 index 00000000000..978bd026919 Binary files /dev/null and b/deps/vmware-lib-jaxen-jdom.jar differ diff --git a/deps/vmware-lib-jaxen.license b/deps/vmware-lib-jaxen.license new file mode 100644 index 00000000000..2a3429689cf --- /dev/null +++ b/deps/vmware-lib-jaxen.license @@ -0,0 +1,42 @@ +/* + * Redistribution and use of this software and associated documentation + * ("Software"), with or without modification, are permitted provided + * that the following conditions are met: + * + * 1. Redistributions of source code must retain copyright + * statements and notices. Redistributions must also contain a + * copy of this document. + * + * 2. Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions and the + * following disclaimer in the documentation and/or other + * materials provided with the distribution. + * + * 3. The name "Jaxen" must not be used to endorse or promote + * products derived from this Software without prior written + * permission of werken digital. For written permission, + * please contact bob@werken.com. + * + * 4. Products derived from this Software may not be called "Jaxen" + * nor may "Jaxen" appear in their names without prior written + * permission of werken digital. Jaxen is a registered + * trademark of werken digital + * + * 5. Due credit should be given to the Jaxen Project + * (http://jaxen.org/). + * + * THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT + * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Copyright 2001 (C) werken digital. All Rights Reserved. + */ diff --git a/deps/vmware-lib-jaxen.readme b/deps/vmware-lib-jaxen.readme new file mode 100644 index 00000000000..8deca37ca69 --- /dev/null +++ b/deps/vmware-lib-jaxen.readme @@ -0,0 +1,93 @@ +The Jaxen libraries included here are based on Jaxen 1.0-FCS. Jaxen 1.0-FCS +was written against JDOM Beta 9, and for Jaxen to support JDOM Beta 10+, we +had to make the following change to org.jaxen.jdom.DocumentNavigator. The +jaxen-jdom.jar provided here includes this change, and it's the only +difference between the JARs here and the Jaxen 1.0-FCS JARs. + + +--- DocumentNavigator.java.orig Tue Aug 31 16:23:32 2004 ++++ DocumentNavigator.java Fri Sep 03 00:08:37 2004 +@@ -72,6 +72,8 @@ + + import org.jdom.Document; + import org.jdom.Element; ++import org.jdom.Parent; ++import org.jdom.Content; + import org.jdom.Comment; + import org.jdom.Text; + import org.jdom.Attribute; +@@ -231,7 +233,7 @@ + nsMap.put( ns.getPrefix(), new XPathNamespace(elem, ns) ); + } + +- current = current.getParent(); ++ current = current.getParentElement(); + } + + nsMap.put( "xml", new XPathNamespace(elem, Namespace.XML_NAMESPACE) ); +@@ -247,17 +249,9 @@ + { + parent = contextNode; + } +- else if ( contextNode instanceof Element ) ++ else if ( contextNode instanceof Content ) + { +- parent = ((Element)contextNode).getParent(); +- +- if ( parent == null ) +- { +- if ( ((Element)contextNode).isRootElement() ) +- { +- parent = ((Element)contextNode).getDocument(); +- } +- } ++ parent = ((Content)contextNode).getParent(); + } + else if ( contextNode instanceof Attribute ) + { +@@ -267,18 +261,6 @@ + { + parent = ((XPathNamespace)contextNode).getJDOMElement(); + } +- else if ( contextNode instanceof ProcessingInstruction ) +- { +- parent = ((ProcessingInstruction)contextNode).getParent(); +- } +- else if ( contextNode instanceof Comment ) +- { +- parent = ((Comment)contextNode).getParent(); +- } +- else if ( contextNode instanceof Text ) +- { +- parent = ((Text)contextNode).getParent(); +- } + + if ( parent != null ) + { +@@ -456,9 +438,9 @@ + { + element = (Element) context; + } +- else if ( context instanceof Text ) ++ else if ( context instanceof Content ) + { +- element = ((Text)context).getParent(); ++ element = ((Content)context).getParentElement(); + } + else if ( context instanceof Attribute ) + { +@@ -467,14 +449,6 @@ + else if ( context instanceof XPathNamespace ) + { + element = ((XPathNamespace)context).getJDOMElement(); +- } +- else if ( context instanceof Comment ) +- { +- element = ((Comment)context).getParent(); +- } +- else if ( context instanceof ProcessingInstruction ) +- { +- element = ((ProcessingInstruction)context).getParent(); + } + + if ( element != null ) diff --git a/deps/vmware-lib-jaxrpc.jar b/deps/vmware-lib-jaxrpc.jar new file mode 100644 index 00000000000..a2c13d9a212 Binary files /dev/null and b/deps/vmware-lib-jaxrpc.jar differ diff --git a/deps/vmware-lib-jdom.jar b/deps/vmware-lib-jdom.jar new file mode 100644 index 00000000000..288e64cb5c4 Binary files /dev/null and b/deps/vmware-lib-jdom.jar differ diff --git a/deps/vmware-lib-mailapi.jar b/deps/vmware-lib-mailapi.jar new file mode 100644 index 00000000000..2f8620b6d4a Binary files /dev/null and b/deps/vmware-lib-mailapi.jar differ diff --git a/deps/vmware-lib-saxpath.jar b/deps/vmware-lib-saxpath.jar new file mode 100644 index 00000000000..2b43955babc Binary files /dev/null and b/deps/vmware-lib-saxpath.jar differ diff --git a/deps/vmware-lib-smtp.jar b/deps/vmware-lib-smtp.jar new file mode 100644 index 00000000000..145d302d28a Binary files /dev/null and b/deps/vmware-lib-smtp.jar differ diff --git a/deps/vmware-lib-wbem.jar b/deps/vmware-lib-wbem.jar new file mode 100644 index 00000000000..a4b806df469 Binary files /dev/null and b/deps/vmware-lib-wbem.jar differ diff --git a/deps/vmware-lib-xalan.jar b/deps/vmware-lib-xalan.jar new file mode 100644 index 00000000000..b8f25753260 Binary files /dev/null and b/deps/vmware-lib-xalan.jar differ diff --git a/deps/vmware-lib-xalan.license b/deps/vmware-lib-xalan.license new file mode 100644 index 00000000000..0ac417ec103 --- /dev/null +++ b/deps/vmware-lib-xalan.license @@ -0,0 +1,55 @@ +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Xalan" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation and was + * originally based on software copyright (c) 1999, Lotus + * Development Corporation., http://www.lotus.com. For more + * information on the Apache Software Foundation, please see + * . + */ diff --git a/deps/vmware-lib-xalan.readme b/deps/vmware-lib-xalan.readme new file mode 100644 index 00000000000..50b903d1122 --- /dev/null +++ b/deps/vmware-lib-xalan.readme @@ -0,0 +1,2 @@ +This is Xalan 2.5.D1, distributed from http://xml.apache.org. +It's designed to go with Xerces 2.4.0. diff --git a/deps/vmware-lib-xerces.jar b/deps/vmware-lib-xerces.jar new file mode 100644 index 00000000000..e9fe08ad452 Binary files /dev/null and b/deps/vmware-lib-xerces.jar differ diff --git a/deps/vmware-lib-xerces.readme b/deps/vmware-lib-xerces.readme new file mode 100644 index 00000000000..b6ae08d442f --- /dev/null +++ b/deps/vmware-lib-xerces.readme @@ -0,0 +1,63 @@ +Xerces 2.6.0 + +This product includes Xerces software developed by the Apache Software +Foundation (http://www.apache.org/). It is redistributed in accordance with +the license below. For more information, see http://xml.apache.org. + +/* + * The Apache Software License, Version 1.1 + * + * + * Copyright (c) 1999 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Xerces" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation and was + * originally based on software copyright (c) 1999, International + * Business Machines, Inc., http://www.ibm.com. For more + * information on the Apache Software Foundation, please see + * . + */ + diff --git a/deps/vmware-lib-xml-apis.jar b/deps/vmware-lib-xml-apis.jar new file mode 100644 index 00000000000..2dd83771445 Binary files /dev/null and b/deps/vmware-lib-xml-apis.jar differ diff --git a/deps/vmware-vim.jar b/deps/vmware-vim.jar new file mode 100644 index 00000000000..c9831af675f Binary files /dev/null and b/deps/vmware-vim.jar differ diff --git a/deps/vmware-vim25.jar b/deps/vmware-vim25.jar new file mode 100644 index 00000000000..01ba127da12 Binary files /dev/null and b/deps/vmware-vim25.jar differ diff --git a/server/src/com/cloud/api/commands/AddVpnUserCmd.java b/server/src/com/cloud/api/commands/AddVpnUserCmd.java index 2e23ce9afda..55107fc1a27 100644 --- a/server/src/com/cloud/api/commands/AddVpnUserCmd.java +++ b/server/src/com/cloud/api/commands/AddVpnUserCmd.java @@ -36,7 +36,7 @@ import com.cloud.user.UserContext; public class AddVpnUserCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(AddVpnUserCmd.class.getName()); - private static final String s_name = "vpnuser"; + private static final String s_name = "addvpnuserresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// @@ -106,7 +106,7 @@ public class AddVpnUserCmd extends BaseAsyncCmd { vpnResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName()); } - vpnResponse.setResponseName(getName()); + vpnResponse.setResponseName("vpnuser"); return vpnResponse; } diff --git a/server/src/com/cloud/api/response/VpnUsersResponse.java b/server/src/com/cloud/api/response/VpnUsersResponse.java index a7b052615e9..516b064bbda 100644 --- a/server/src/com/cloud/api/response/VpnUsersResponse.java +++ b/server/src/com/cloud/api/response/VpnUsersResponse.java @@ -77,8 +77,4 @@ public class VpnUsersResponse extends BaseResponse { public String getDomainName() { return domainName; } - - public String toString() { - return "id: " + getId() + ", username: " + getUserName() + ", account: " + getAccountName() + ", domainid: " + getDomainId(); - } }