cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [19/50] [abbrv] git commit: updated refs/heads/acl-item-cidrs to e90d595
Date Wed, 26 Feb 2014 18:50:06 GMT
CLOUDSTACK-6058: New XenServer 6.2sp1 SDKs

This commit replaces old XenServer SDKs with lastet XenServer release
i.e. 6.2sp1 SDKs. This SDK also includes new class "VGPU" to support
vGPU functionality in XenServer.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>


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

Branch: refs/heads/acl-item-cidrs
Commit: 2ff9abadf6e6af835f2835ea09e1d8b5421800d0
Parents: d1efdca
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Wed Jan 22 16:15:52 2014 +0530
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Tue Feb 25 08:55:53 2014 +0100

----------------------------------------------------------------------
 deps/XenServerJava/src/LICENSE.Apache-2.0.txt   |   201 +
 deps/XenServerJava/src/LICENSE.txt              |    26 +
 deps/XenServerJava/src/README.txt               |    57 +
 .../src/com/xensource/xenapi/APIVersion.java    |    73 +-
 .../src/com/xensource/xenapi/Auth.java          |    34 +-
 .../src/com/xensource/xenapi/Blob.java          |   149 +-
 .../src/com/xensource/xenapi/Bond.java          |   191 +-
 .../src/com/xensource/xenapi/Connection.java    |   128 +-
 .../src/com/xensource/xenapi/Console.java       |   135 +-
 .../src/com/xensource/xenapi/Crashdump.java     |   113 +-
 .../src/com/xensource/xenapi/DRTask.java        |    93 +-
 .../src/com/xensource/xenapi/DataSource.java    |    19 +-
 .../src/com/xensource/xenapi/Event.java         |    98 +-
 .../src/com/xensource/xenapi/GPUGroup.java      |   338 +-
 .../src/com/xensource/xenapi/Host.java          |  1208 +-
 .../src/com/xensource/xenapi/HostCpu.java       |   182 +-
 .../src/com/xensource/xenapi/HostCrashdump.java |   133 +-
 .../src/com/xensource/xenapi/HostMetrics.java   |   120 +-
 .../src/com/xensource/xenapi/HostPatch.java     |   195 +-
 .../src/com/xensource/xenapi/Marshalling.java   |    60 +-
 .../src/com/xensource/xenapi/Message.java       |   110 +-
 .../src/com/xensource/xenapi/Network.java       |   275 +-
 .../src/com/xensource/xenapi/PBD.java           |   183 +-
 .../src/com/xensource/xenapi/PCI.java           |   133 +-
 .../src/com/xensource/xenapi/PGPU.java          |   373 +-
 .../src/com/xensource/xenapi/PIF.java           |   636 +-
 .../src/com/xensource/xenapi/PIFMetrics.java    |   173 +-
 .../src/com/xensource/xenapi/Pool.java          |   942 +-
 .../src/com/xensource/xenapi/PoolPatch.java     |   237 +-
 .../src/com/xensource/xenapi/Role.java          |   123 +-
 .../src/com/xensource/xenapi/SM.java            |   199 +-
 .../src/com/xensource/xenapi/SR.java            |   767 +-
 .../src/com/xensource/xenapi/Secret.java        |   125 +-
 .../src/com/xensource/xenapi/Session.java       |   227 +-
 .../src/com/xensource/xenapi/Subject.java       |   129 +-
 .../src/com/xensource/xenapi/Task.java          |   235 +-
 .../src/com/xensource/xenapi/Tunnel.java        |   165 +-
 .../src/com/xensource/xenapi/Types.java         | 10869 +++++++++--------
 .../src/com/xensource/xenapi/User.java          |   135 +-
 .../src/com/xensource/xenapi/VBD.java           |   421 +-
 .../src/com/xensource/xenapi/VBDMetrics.java    |   109 +-
 .../src/com/xensource/xenapi/VDI.java           |   866 +-
 .../src/com/xensource/xenapi/VGPU.java          |   225 +-
 .../src/com/xensource/xenapi/VGPUType.java      |   461 +
 .../src/com/xensource/xenapi/VIF.java           |   409 +-
 .../src/com/xensource/xenapi/VIFMetrics.java    |   109 +-
 .../src/com/xensource/xenapi/VLAN.java          |   135 +-
 .../src/com/xensource/xenapi/VM.java            |  2182 ++--
 .../src/com/xensource/xenapi/VMAppliance.java   |   241 +-
 .../com/xensource/xenapi/VMGuestMetrics.java    |   157 +-
 .../src/com/xensource/xenapi/VMMetrics.java     |   165 +-
 .../src/com/xensource/xenapi/VMPP.java          |   437 +-
 .../src/com/xensource/xenapi/VTPM.java          |    85 +-
 .../src/com/xensource/xenapi/XenAPIObject.java  |    44 +-
 54 files changed, 13426 insertions(+), 12209 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/LICENSE.Apache-2.0.txt
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/LICENSE.Apache-2.0.txt b/deps/XenServerJava/src/LICENSE.Apache-2.0.txt
new file mode 100755
index 0000000..261eeb9
--- /dev/null
+++ b/deps/XenServerJava/src/LICENSE.Apache-2.0.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/LICENSE.txt
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/LICENSE.txt b/deps/XenServerJava/src/LICENSE.txt
new file mode 100755
index 0000000..76c4a22
--- /dev/null
+++ b/deps/XenServerJava/src/LICENSE.txt
@@ -0,0 +1,26 @@
+Copyright (c) Citrix Systems, Inc.
+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.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS 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 COPYRIGHT
+HOLDER OR 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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/README.txt
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/README.txt b/deps/XenServerJava/src/README.txt
new file mode 100755
index 0000000..2e6fa45
--- /dev/null
+++ b/deps/XenServerJava/src/README.txt
@@ -0,0 +1,57 @@
+XenServerJava
+=============
+
+NOTE: This is a modified version of Citrix XenServer's SDK. This version of 
+XenServerJava includes some customization which is required to make it work
+with CloudStack.
+
+
+Version 6.2.0-1.
+
+XenServerJava is a complete SDK for Citrix XenServer, exposing the XenServer
+API as Java classes.
+
+For XenServer documentation, see http://docs.xensource.com.
+XenServerJava includes a class for every XenServer class, and a method for
+each XenServer API call, so API documentation and examples written for
+for other languages will apply equally well to Java.
+In particular, the SDK Guide and API Documentation are ideal for developers
+wishing to use XenServerJava.
+
+For community content, blogs, and downloads, visit the XenServer Developer
+Network at http://community.citrix.com/cdn/xs.
+
+XenServerJava is free sofware.  You can redistribute and modify it under the
+terms of the BSD license.  See LICENSE.txt for details.
+
+This library may be accompanied by pedagogical examples. These do not form
+part of this library, and are licensed for redistribution and modification
+under the BSD license. Such examples are licensed clearly at the top
+of each file.
+
+
+Dependencies
+------------
+
+XenServerJava is dependent upon Apache XML-RPC and WS-Commons, both by The
+Apache Software Foundation.  We would like to thank the ASF and the
+Apache XML-RPC development team in particular.
+Both are licensed under the Apache Software License 2.0; see
+LICENSE.Apache-2.0.txt for details.
+
+We test with version 3.1 of Apache XML-RPC, and version 1.0.2 of WS-Commons.
+We recommend that you use these versions, though others may work.
+
+
+Downloads
+---------
+
+XenServerJava is available in the XenServer-6.2.0-SDK.zip in three separate
+folders, one for the compiled binaries, one for the source code,
+and one containing sample code.
+
+The XenServer-6.2.0-SDK.zip is available from
+http://www.citrix.com/downloads/xenserver/.
+
+Apache XML-RPC is available from http://ws.apache.org/xmlrpc/.
+WS-Commons is available from http://ws.apache.org/commons/.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/APIVersion.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/APIVersion.java b/deps/XenServerJava/src/com/xensource/xenapi/APIVersion.java
old mode 100644
new mode 100755
index 8d7247d..9dcdd9f
--- a/deps/XenServerJava/src/com/xensource/xenapi/APIVersion.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/APIVersion.java
@@ -1,18 +1,19 @@
-/* Copyright (c) Citrix Systems, Inc.
+/*
+ * Copyright (c) Citrix Systems, Inc.
  * 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.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -31,16 +32,24 @@ package com.xensource.xenapi;
 
 public enum APIVersion
 {
-    API_1_1, API_1_2, API_1_3, API_1_4, API_1_5, API_1_6, API_1_7, API_1_8, API_1_9, API_1_10, UNKNOWN;
+    API_1_1, API_1_2, API_1_3, API_1_4, API_1_5, API_1_6, API_1_7, API_1_8, API_1_9, API_1_10, API_2_0, API_2_1, UNKNOWN;
 
     public static APIVersion latest()
     {
-        return API_1_10;
+        return API_2_1;
     }
 
     public static APIVersion fromMajorMinor(long major, long minor)
     {
-        if (major == 1 && minor == 10)
+        if (major == 2 && minor == 1)
+        {
+            return API_2_1;
+        }
+        else if (major == 2 && minor == 0)
+        {
+            return API_2_0;
+        }        
+        else if (major == 1 && minor == 10)
         {
             return API_1_10;
         }
@@ -91,28 +100,32 @@ public enum APIVersion
     {
         switch (this)
         {
-            case API_1_1:
-                return "1.1";
-            case API_1_2:
-                return "1.2";
-            case API_1_3:
-                return "1.3";
-            case API_1_4:
-                return "1.4";
-            case API_1_5:
-                return "1.5";
-            case API_1_6:
-                return "1.6";
-            case API_1_7:
-                return "1.7";
-            case API_1_8:
-                return "1.8";
-            case API_1_9:
-                return "1.9";
-            case API_1_10:
-                return "1.10";
-            default:
-                return "Unknown";
+        case API_1_1:
+            return "1.1";
+        case API_1_2:
+            return "1.2";
+        case API_1_3:
+            return "1.3";
+        case API_1_4:
+            return "1.4";
+        case API_1_5:
+            return "1.5";
+        case API_1_6:
+            return "1.6";
+        case API_1_7:
+            return "1.7";
+        case API_1_8:
+            return "1.8";
+        case API_1_9:
+            return "1.9";
+        case API_1_10:
+            return "1.10";
+        case API_2_0:
+            return "2.0";
+        case API_2_1:
+            return "2.1";
+        default:
+            return "Unknown";
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Auth.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Auth.java b/deps/XenServerJava/src/com/xensource/xenapi/Auth.java
index cffaaac..4778e6a 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Auth.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Auth.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) Citrix Systems, Inc.
  * 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.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 package com.xensource.xenapi;
 
 import com.xensource.xenapi.Types.BadServerResponse;
@@ -51,6 +52,7 @@ import org.apache.xmlrpc.XmlRpcException;
  */
 public class Auth extends XenAPIObject {
 
+
     public String toWireString() {
         return null;
     }
@@ -62,15 +64,15 @@ public class Auth extends XenAPIObject {
      * @return the subject_identifier obtained from the external directory service
      */
     public static String getSubjectIdentifier(Connection c, String subjectName) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "auth.get_subject_identifier";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(subjectName)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toString(result);
+            return Types.toString(result);
     }
 
     /**
@@ -80,15 +82,15 @@ public class Auth extends XenAPIObject {
      * @return key-value pairs containing at least a key called subject_name
      */
     public static Map<String, String> getSubjectInformationFromIdentifier(Connection c, String subjectIdentifier) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "auth.get_subject_information_from_identifier";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(subjectIdentifier)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toMapOfStringString(result);
+            return Types.toMapOfStringString(result);
     }
 
     /**
@@ -98,15 +100,15 @@ public class Auth extends XenAPIObject {
      * @return set of subject_identifiers that provides the group membership of subject_identifier passed as argument, it contains, recursively, all groups a subject_identifier is member of.
      */
     public static Set<String> getGroupMembership(Connection c, String subjectIdentifier) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "auth.get_group_membership";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(subjectIdentifier)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toSetOfString(result);
+            return Types.toSetOfString(result);
     }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Blob.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Blob.java b/deps/XenServerJava/src/com/xensource/xenapi/Blob.java
index 494b928..ec91d87 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Blob.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Blob.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) Citrix Systems, Inc.
  * 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.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 package com.xensource.xenapi;
 
 import com.xensource.xenapi.Types.BadServerResponse;
@@ -60,14 +61,14 @@ public class Blob extends XenAPIObject {
      * For internal use only.
      */
     Blob(String ref) {
-        this.ref = ref;
+       this.ref = ref;
     }
 
     /**
      * @return The XenAPI reference (OpaqueRef) to this object.
      */
     public String toWireString() {
-        return this.ref;
+       return this.ref;
     }
 
     /**
@@ -78,7 +79,7 @@ public class Blob extends XenAPIObject {
     {
         if (obj != null && obj instanceof Blob)
         {
-            Blob other = (Blob)obj;
+            Blob other = (Blob) obj;
             return other.ref.equals(this.ref);
         } else
         {
@@ -112,8 +113,8 @@ public class Blob extends XenAPIObject {
         /**
          * Convert a blob.Record to a Map
          */
-        public Map<String, Object> toMap() {
-            Map<String, Object> map = new HashMap<String, Object>();
+        public Map<String,Object> toMap() {
+            Map<String,Object> map = new HashMap<String,Object>();
             map.put("uuid", this.uuid == null ? "" : this.uuid);
             map.put("name_label", this.nameLabel == null ? "" : this.nameLabel);
             map.put("name_description", this.nameDescription == null ? "" : this.nameDescription);
@@ -160,15 +161,15 @@ public class Blob extends XenAPIObject {
      * @return all fields from the object
      */
     public Blob.Record getRecord(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_record";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toBlobRecord(result);
+            return Types.toBlobRecord(result);
     }
 
     /**
@@ -178,15 +179,15 @@ public class Blob extends XenAPIObject {
      * @return reference to the object
      */
     public static Blob getByUuid(Connection c, String uuid) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_by_uuid";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toBlob(result);
+            return Types.toBlob(result);
     }
 
     /**
@@ -196,15 +197,15 @@ public class Blob extends XenAPIObject {
      * @return references to objects with matching names
      */
     public static Set<Blob> getByNameLabel(Connection c, String label) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_by_name_label";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(label)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toSetOfBlob(result);
+            return Types.toSetOfBlob(result);
     }
 
     /**
@@ -213,15 +214,15 @@ public class Blob extends XenAPIObject {
      * @return value of the field
      */
     public String getUuid(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_uuid";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toString(result);
+            return Types.toString(result);
     }
 
     /**
@@ -230,15 +231,15 @@ public class Blob extends XenAPIObject {
      * @return value of the field
      */
     public String getNameLabel(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_name_label";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toString(result);
+            return Types.toString(result);
     }
 
     /**
@@ -247,15 +248,15 @@ public class Blob extends XenAPIObject {
      * @return value of the field
      */
     public String getNameDescription(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_name_description";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toString(result);
+            return Types.toString(result);
     }
 
     /**
@@ -264,15 +265,15 @@ public class Blob extends XenAPIObject {
      * @return value of the field
      */
     public Long getSize(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_size";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toLong(result);
+            return Types.toLong(result);
     }
 
     /**
@@ -281,15 +282,15 @@ public class Blob extends XenAPIObject {
      * @return value of the field
      */
     public Boolean getPublic(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_public";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toBoolean(result);
+            return Types.toBoolean(result);
     }
 
     /**
@@ -298,15 +299,15 @@ public class Blob extends XenAPIObject {
      * @return value of the field
      */
     public Date getLastUpdated(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_last_updated";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toDate(result);
+            return Types.toDate(result);
     }
 
     /**
@@ -315,15 +316,15 @@ public class Blob extends XenAPIObject {
      * @return value of the field
      */
     public String getMimeType(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_mime_type";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toString(result);
+            return Types.toString(result);
     }
 
     /**
@@ -332,9 +333,9 @@ public class Blob extends XenAPIObject {
      * @param label New value to set
      */
     public void setNameLabel(Connection c, String label) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.set_name_label";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(label)};
@@ -348,9 +349,9 @@ public class Blob extends XenAPIObject {
      * @param description New value to set
      */
     public void setNameDescription(Connection c, String description) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.set_name_description";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(description)};
@@ -364,9 +365,9 @@ public class Blob extends XenAPIObject {
      * @param _public New value to set
      */
     public void setPublic(Connection c, Boolean _public) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.set_public";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(_public)};
@@ -382,25 +383,25 @@ public class Blob extends XenAPIObject {
      * @return The reference to the created blob
      */
     public static Blob create(Connection c, String mimeType, Boolean _public) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.create";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(mimeType), Marshalling.toXMLRPC(_public)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toBlob(result);
+            return Types.toBlob(result);
     }
 
     /**
-     *
+     * 
      *
      */
     public void destroy(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.destroy";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -414,15 +415,15 @@ public class Blob extends XenAPIObject {
      * @return references to all objects
      */
     public static Set<Blob> getAll(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_all";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toSetOfBlob(result);
+            return Types.toSetOfBlob(result);
     }
 
     /**
@@ -431,15 +432,15 @@ public class Blob extends XenAPIObject {
      * @return records of all objects
      */
     public static Map<Blob, Blob.Record> getAllRecords(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "blob.get_all_records";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toMapOfBlobBlobRecord(result);
+            return Types.toMapOfBlobBlobRecord(result);
     }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Bond.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Bond.java b/deps/XenServerJava/src/com/xensource/xenapi/Bond.java
index 935fd98..5a54ad2 100644
--- a/deps/XenServerJava/src/com/xensource/xenapi/Bond.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Bond.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) Citrix Systems, Inc.
  * 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.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -28,6 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 package com.xensource.xenapi;
 
 import com.xensource.xenapi.Types.BadServerResponse;
@@ -45,7 +46,7 @@ import java.util.Set;
 import org.apache.xmlrpc.XmlRpcException;
 
 /**
- *
+ * 
  *
  * @author Citrix Systems, Inc.
  */
@@ -60,14 +61,14 @@ public class Bond extends XenAPIObject {
      * For internal use only.
      */
     Bond(String ref) {
-        this.ref = ref;
+       this.ref = ref;
     }
 
     /**
      * @return The XenAPI reference (OpaqueRef) to this object.
      */
     public String toWireString() {
-        return this.ref;
+       return this.ref;
     }
 
     /**
@@ -78,7 +79,7 @@ public class Bond extends XenAPIObject {
     {
         if (obj != null && obj instanceof Bond)
         {
-            Bond other = (Bond)obj;
+            Bond other = (Bond) obj;
             return other.ref.equals(this.ref);
         } else
         {
@@ -113,8 +114,8 @@ public class Bond extends XenAPIObject {
         /**
          * Convert a Bond.Record to a Map
          */
-        public Map<String, Object> toMap() {
-            Map<String, Object> map = new HashMap<String, Object>();
+        public Map<String,Object> toMap() {
+            Map<String,Object> map = new HashMap<String,Object>();
             map.put("uuid", this.uuid == null ? "" : this.uuid);
             map.put("master", this.master == null ? new PIF("OpaqueRef:NULL") : this.master);
             map.put("slaves", this.slaves == null ? new LinkedHashSet<PIF>() : this.slaves);
@@ -166,15 +167,15 @@ public class Bond extends XenAPIObject {
      * @return all fields from the object
      */
     public Bond.Record getRecord(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_record";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toBondRecord(result);
+            return Types.toBondRecord(result);
     }
 
     /**
@@ -184,15 +185,15 @@ public class Bond extends XenAPIObject {
      * @return reference to the object
      */
     public static Bond getByUuid(Connection c, String uuid) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_by_uuid";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(uuid)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toBond(result);
+            return Types.toBond(result);
     }
 
     /**
@@ -201,15 +202,15 @@ public class Bond extends XenAPIObject {
      * @return value of the field
      */
     public String getUuid(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_uuid";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toString(result);
+            return Types.toString(result);
     }
 
     /**
@@ -218,15 +219,15 @@ public class Bond extends XenAPIObject {
      * @return value of the field
      */
     public PIF getMaster(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_master";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toPIF(result);
+            return Types.toPIF(result);
     }
 
     /**
@@ -235,15 +236,15 @@ public class Bond extends XenAPIObject {
      * @return value of the field
      */
     public Set<PIF> getSlaves(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_slaves";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toSetOfPIF(result);
+            return Types.toSetOfPIF(result);
     }
 
     /**
@@ -252,15 +253,15 @@ public class Bond extends XenAPIObject {
      * @return value of the field
      */
     public Map<String, String> getOtherConfig(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_other_config";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toMapOfStringString(result);
+            return Types.toMapOfStringString(result);
     }
 
     /**
@@ -269,15 +270,15 @@ public class Bond extends XenAPIObject {
      * @return value of the field
      */
     public PIF getPrimarySlave(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_primary_slave";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toPIF(result);
+            return Types.toPIF(result);
     }
 
     /**
@@ -286,15 +287,15 @@ public class Bond extends XenAPIObject {
      * @return value of the field
      */
     public Types.BondMode getMode(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_mode";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toBondMode(result);
+            return Types.toBondMode(result);
     }
 
     /**
@@ -303,15 +304,15 @@ public class Bond extends XenAPIObject {
      * @return value of the field
      */
     public Map<String, String> getProperties(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_properties";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toMapOfStringString(result);
+            return Types.toMapOfStringString(result);
     }
 
     /**
@@ -320,15 +321,15 @@ public class Bond extends XenAPIObject {
      * @return value of the field
      */
     public Long getLinksUp(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_links_up";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toLong(result);
+            return Types.toLong(result);
     }
 
     /**
@@ -337,9 +338,9 @@ public class Bond extends XenAPIObject {
      * @param otherConfig New value to set
      */
     public void setOtherConfig(Connection c, Map<String, String> otherConfig) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.set_other_config";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(otherConfig)};
@@ -354,9 +355,9 @@ public class Bond extends XenAPIObject {
      * @param value Value to add
      */
     public void addToOtherConfig(Connection c, String key, String value) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.add_to_other_config";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key), Marshalling.toXMLRPC(value)};
@@ -370,9 +371,9 @@ public class Bond extends XenAPIObject {
      * @param key Key to remove
      */
     public void removeFromOtherConfig(Connection c, String key) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.remove_from_other_config";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(key)};
@@ -391,13 +392,12 @@ public class Bond extends XenAPIObject {
      * @return Task
      */
     public static Task createAsync(Connection c, Network network, Set<PIF> members, String MAC, Types.BondMode mode, Map<String, String> properties) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Async.Bond.create";
         String session = c.getSessionReference();
-        Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(members), Marshalling.toXMLRPC(MAC),
-            Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(properties)};
+        Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(members), Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(properties)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
         return Types.toTask(result);
@@ -414,16 +414,15 @@ public class Bond extends XenAPIObject {
      * @return The reference of the created Bond object
      */
     public static Bond create(Connection c, Network network, Set<PIF> members, String MAC, Types.BondMode mode, Map<String, String> properties) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.create";
         String session = c.getSessionReference();
-        Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(members), Marshalling.toXMLRPC(MAC),
-            Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(properties)};
+        Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(network), Marshalling.toXMLRPC(members), Marshalling.toXMLRPC(MAC), Marshalling.toXMLRPC(mode), Marshalling.toXMLRPC(properties)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toBond(result);
+            return Types.toBond(result);
     }
 
     /**
@@ -432,9 +431,9 @@ public class Bond extends XenAPIObject {
      * @return Task
      */
     public Task destroyAsync(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Async.Bond.destroy";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -448,9 +447,9 @@ public class Bond extends XenAPIObject {
      *
      */
     public void destroy(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.destroy";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref)};
@@ -465,9 +464,9 @@ public class Bond extends XenAPIObject {
      * @return Task
      */
     public Task setModeAsync(Connection c, Types.BondMode value) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Async.Bond.set_mode";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -482,9 +481,9 @@ public class Bond extends XenAPIObject {
      * @param value The new bond mode
      */
     public void setMode(Connection c, Types.BondMode value) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.set_mode";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(value)};
@@ -500,9 +499,9 @@ public class Bond extends XenAPIObject {
      * @return Task
      */
     public Task setPropertyAsync(Connection c, String name, String value) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Async.Bond.set_property";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(value)};
@@ -518,9 +517,9 @@ public class Bond extends XenAPIObject {
      * @param value The property value
      */
     public void setProperty(Connection c, String name, String value) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.set_property";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session), Marshalling.toXMLRPC(this.ref), Marshalling.toXMLRPC(name), Marshalling.toXMLRPC(value)};
@@ -534,15 +533,15 @@ public class Bond extends XenAPIObject {
      * @return references to all objects
      */
     public static Set<Bond> getAll(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_all";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toSetOfBond(result);
+            return Types.toSetOfBond(result);
     }
 
     /**
@@ -551,15 +550,15 @@ public class Bond extends XenAPIObject {
      * @return records of all objects
      */
     public static Map<Bond, Bond.Record> getAllRecords(Connection c) throws
-        BadServerResponse,
-        XenAPIException,
-        XmlRpcException {
+       BadServerResponse,
+       XenAPIException,
+       XmlRpcException {
         String method_call = "Bond.get_all_records";
         String session = c.getSessionReference();
         Object[] method_params = {Marshalling.toXMLRPC(session)};
         Map response = c.dispatch(method_call, method_params);
         Object result = response.get("Value");
-        return Types.toMapOfBondBondRecord(result);
+            return Types.toMapOfBondBondRecord(result);
     }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ff9abad/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Connection.java b/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
old mode 100644
new mode 100755
index a652450..63469df
--- a/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
+++ b/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
@@ -1,18 +1,19 @@
-/* Copyright (c) Citrix Systems, Inc.
+/*
+ * Copyright (c) Citrix Systems, Inc.
  * 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.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -38,7 +39,6 @@ import org.apache.xmlrpc.client.XmlRpcClient;
 import org.apache.xmlrpc.client.XmlRpcClientConfig;
 import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
 import org.apache.xmlrpc.client.XmlRpcHttpClientConfig;
-import org.apache.xmlrpc.client.XmlRpcSun15HttpTransportFactory;
 
 import com.xensource.xenapi.Types.BadServerResponse;
 import com.xensource.xenapi.Types.SessionAuthenticationFailed;
@@ -54,20 +54,10 @@ public class Connection
     /**
      * The version of the bindings that this class belongs to.
      */
-    public static final String BINDINGS_VERSION = "6.1.0-1";
-
-    /**
-     * true if the connection is to the Rio edition of XenServer. Certain function calls are not allowed.
-     *
-     * @deprecated Use getAPIVersion() instead.
-     */
-    @Deprecated
-    public Boolean rioConnection = false;
-
+    public static final String BINDINGS_VERSION = "6.2.0-1";
+    
     private APIVersion apiVersion;
 
-    protected int _wait = 600;
-
     /**
      * Updated when Session.login_with_password() is called.
      */
@@ -91,47 +81,37 @@ public class Connection
     /**
      * Creates a connection to a particular server using a given username and password. This object can then be passed
      * in to any other API calls.
-     *
+     * 
      * This constructor calls Session.loginWithPassword, passing itself as the first parameter.
-     *
+     * 
      * When this constructor is used, a call to dispose() (also called in the Connection's finalizer) will attempt a
      * Session.logout on this connection.
-     *
+     * 
      * @deprecated Use a constructor that takes a URL as the first parameter instead.
      */
     @Deprecated
     public Connection(String client, String username, String password) throws java.net.MalformedURLException,
-            XmlRpcException, BadServerResponse, SessionAuthenticationFailed, XenAPIException
+        XmlRpcException, BadServerResponse, SessionAuthenticationFailed, XenAPIException
     {
         deprecatedConstructorUsed = true;
 
-        // To login normally we call login_with_password(username, password, "1.X").  On rio this call fails and we
-        // should use login_with_password(username,password) instead, and note that we are talking to a rio host so that we
-        // can refuse to make certain miami-specific calls
         final String ApiVersion = APIVersion.latest().toString();
         this.client = getClientFromURL(new URL(client));
         try
         {
-            //first try to login the modern way
             this.sessionReference = loginWithPassword(this.client, username, password, ApiVersion);
         } catch (BadServerResponse e)
         {
-            //oops, something went wrong
             String[] errDesc = e.errorDescription;
-            //was the problem that the host was running rio? If so it will have complained that it got three parameters
-            //instead of two. Let us carefully verify the details of this complaint
+
             if (0 == errDesc[0].compareTo("MESSAGE_PARAMETER_COUNT_MISMATCH")
-                && 0 == errDesc[1].compareTo("session.login_with_password")
-                && 0 == errDesc[2].compareTo("2")
-                && 0 == errDesc[3].compareTo("3"))
+                    && 0 == errDesc[1].compareTo("session.login_with_password")
+                    && 0 == errDesc[2].compareTo("2")
+                    && 0 == errDesc[3].compareTo("3"))
             {
-                //and if so, we can have another go, using the older login method, and see how that goes.
                 this.sessionReference = loginWithPassword(this.client, username, password);
-                //success!. Note that we are talking to an old host on this connection
-                this.rioConnection = true;
             } else
             {
-                //Hmm... Can't solve this here. Let upstairs know about the problem.
                 throw e;
             }
         }
@@ -139,11 +119,13 @@ public class Connection
         try
         {
             setAPIVersion(new Session(sessionReference));
-        } catch (XenAPIException exn)
+        }
+        catch (XenAPIException exn)
         {
             dispose();
             throw exn;
-        } catch (XmlRpcException exn)
+        }
+        catch (XmlRpcException exn)
         {
             dispose();
             throw exn;
@@ -153,24 +135,24 @@ public class Connection
     /**
      * Creates a connection to a particular server using a given username and password. This object can then be passed
      * in to any other API calls.
-     *
+     * 
      * Note this constructor does NOT call Session.loginWithPassword; the programmer is responsible for calling it,
      * passing the Connection as a parameter. No attempt to connect to the server is made until login is called.
-     *
+     * 
      * When this constructor is used, a call to dispose() will do nothing. The programmer is responsible for manually
      * logging out the Session.
      */
-    public Connection(URL url, int wait)
+    public Connection(URL url)
     {
         deprecatedConstructorUsed = false;
-        _wait = wait;
+
         this.client = getClientFromURL(url);
     }
 
     /**
      * Creates a connection to a particular server using a given username and password. This object can then be passed
      * in to any other API calls.
-     *
+     * 
      * The additional sessionReference parameter must be a reference to a logged-in Session. Any method calls on this
      * Connection will use it. This constructor does not call Session.loginWithPassword, and dispose() on the resulting
      * Connection object does not call Session.logout. The programmer is responsible for ensuring the Session is logged
@@ -206,11 +188,12 @@ public class Connection
             if (sessionReference != null)
             {
                 String method_call = "session.logout";
-                Object[] method_params = {Marshalling.toXMLRPC(this.sessionReference)};
+                Object[] method_params = { Marshalling.toXMLRPC(this.sessionReference) };
                 client.execute(method_call, method_params);
                 sessionReference = null;
             }
-        } catch (XmlRpcException exn)
+        }
+        catch (XmlRpcException exn)
         {
         }
     }
@@ -220,17 +203,17 @@ public class Connection
      */
     @Deprecated
     private static String loginWithPassword(XmlRpcClient client, String username, String password)
-        throws BadServerResponse, XmlRpcException, SessionAuthenticationFailed
+            throws BadServerResponse, XmlRpcException, SessionAuthenticationFailed
     {
         String method_call = "session.login_with_password";
-        Object[] method_params = {Marshalling.toXMLRPC(username), Marshalling.toXMLRPC(password)};
-        Map response = (Map)client.execute(method_call, method_params);
+        Object[] method_params = { Marshalling.toXMLRPC(username), Marshalling.toXMLRPC(password) };
+        Map response = (Map) client.execute(method_call, method_params);
         if (response.get("Status").equals("Success"))
         {
-            return (String)response.get("Value");
+            return (String) response.get("Value");
         } else if (response.get("Status").equals("Failure"))
         {
-            Object[] error = (Object[])response.get("ErrorDescription");
+            Object[] error = (Object[]) response.get("ErrorDescription");
             if (error[0].equals("SESSION_AUTHENTICATION_FAILED"))
             {
                 throw new SessionAuthenticationFailed();
@@ -244,18 +227,18 @@ public class Connection
      */
     @Deprecated
     private static String loginWithPassword(XmlRpcClient client, String username, String password, String ApiVersion)
-        throws BadServerResponse, XmlRpcException, SessionAuthenticationFailed
+            throws BadServerResponse, XmlRpcException, SessionAuthenticationFailed
     {
         String method_call = "session.login_with_password";
-        Object[] method_params = {Marshalling.toXMLRPC(username), Marshalling.toXMLRPC(password),
-            Marshalling.toXMLRPC(ApiVersion)};
-        Map response = (Map)client.execute(method_call, method_params);
+        Object[] method_params = { Marshalling.toXMLRPC(username), Marshalling.toXMLRPC(password),
+                Marshalling.toXMLRPC(ApiVersion) };
+        Map response = (Map) client.execute(method_call, method_params);
         if (response.get("Status").equals("Success"))
         {
-            return (String)response.get("Value");
+            return (String) response.get("Value");
         } else if (response.get("Status").equals("Failure"))
         {
-            Object[] error = (Object[])response.get("ErrorDescription");
+            Object[] error = (Object[]) response.get("ErrorDescription");
             if (error[0].equals("SESSION_AUTHENTICATION_FAILED"))
             {
                 throw new SessionAuthenticationFailed();
@@ -268,22 +251,19 @@ public class Connection
 
     public XmlRpcClientConfigImpl getConfig()
     {
-        return config;
+	return config;
     }
-
     private XmlRpcClient getClientFromURL(URL url)
     {
         config.setTimeZone(TimeZone.getTimeZone("UTC"));
         config.setServerURL(url);
-        config.setReplyTimeout(_wait * 1000);
-        config.setConnectionTimeout(5000);
         XmlRpcClient client = new XmlRpcClient();
         client.setConfig(config);
         return client;
     }
 
     /*
-     * Because the binding calls are constructing their own parameter lists, they need to be able to get to
+     * Because the binding calls are constructing their own parameter lists, they need to be able to get to 
      * the session reference directly. This is all rather ugly and needs redone
      * Changed to public to allow easier integration with HTTP-level streaming interface,
      * see CA-15447
@@ -296,9 +276,9 @@ public class Connection
     /**
      * The (auto-generated parts of) the bindings dispatch XMLRPC calls on this Connection's client through this method.
      */
-    protected Map dispatch(String method_call, Object[] method_params) throws XmlRpcException, XenAPIException
+    Map dispatch(String method_call, Object[] method_params) throws XmlRpcException, XenAPIException
     {
-        Map response = (Map)client.execute(method_call, method_params);
+        Map response = (Map) client.execute(method_call, method_params);
 
         if (!deprecatedConstructorUsed)
         {
@@ -314,7 +294,7 @@ public class Connection
                 setAPIVersion(session);
             }
             else if (method_call.equals("session.slave_local_login_with_password") &&
-                response.get("Status").equals("Success"))
+                     response.get("Status").equals("Success"))
             {
                 // Store the Session reference and assume the latest API version.
                 sessionReference = Types.toSession(response.get("Value")).ref;
@@ -329,7 +309,7 @@ public class Connection
                 // this session from the master instead.
                 if (response.get("Status").equals("Failure"))
                 {
-                    Object[] error = (Object[])response.get("ErrorDescription");
+                    Object[] error = (Object[]) response.get("ErrorDescription");
                     if (error.length == 2 && error[0].equals("HOST_IS_SLAVE"))
                     {
                         try
@@ -338,18 +318,20 @@ public class Connection
                                 ((XmlRpcHttpClientConfig)client.getClientConfig()).getServerURL();
                             Connection tmp_conn =
                                 new Connection(new URL(client_url.getProtocol(),
-                                    (String)error[1],
-                                    client_url.getPort(),
-                                    client_url.getFile()), _wait);
+                                                       (String)error[1],
+                                                       client_url.getPort(),
+                                                       client_url.getFile()));
                             tmp_conn.sessionReference = sessionReference;
                             try
                             {
                                 Session.logout(tmp_conn);
-                            } finally
+                            }
+                            finally
                             {
                                 tmp_conn.dispose();
                             }
-                        } catch (Exception exn2)
+                        }
+                        catch (Exception exn2)
                         {
                             // Ignore -- we're going to throw HostIsSlave anyway.
                         }
@@ -364,6 +346,7 @@ public class Connection
         return Types.checkResponse(response);
     }
 
+
     private void setAPIVersion(Session session) throws XenAPIException, XmlRpcException
     {
         try
@@ -371,9 +354,10 @@ public class Connection
             long major = session.getThisHost(this).getAPIVersionMajor(this);
             long minor = session.getThisHost(this).getAPIVersionMinor(this);
             apiVersion = APIVersion.fromMajorMinor(major, minor);
-        } catch (BadServerResponse exn)
+        }
+        catch (BadServerResponse exn)
         {
-            apiVersion = APIVersion.API_1_1;
+            apiVersion = APIVersion.UNKNOWN;
         }
     }
 }


Mime
View raw message