CLOUDSTACK-594: Updating the XenServer java bindings used in cloudsta…

…ck - part 3. Updating the xenserver java bindings used in cloudstack. This is part 3 of the change and it adds the customization's that have been made to them for cloudstack. 1. https://reviews.apache.org/r/8566/ - removes the old bindings. 2. https://reviews.apache.org/r/8567/ - introduces the latest bindings. 3. https://reviews.apache.org/r/8568/ - adds the customization's made to them for cloudstack. Signed-off-by: Chip Childers <[email protected]>
cloudtrends · Dec 13, 2012 · 2cc09c8 · 2cc09c8
1 parent 2ce2645
commit 2cc09c8
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/deps/XenServerJava/src/com/xensource/xenapi/Connection.java b/deps/XenServerJava/src/com/xensource/xenapi/Connection.java
@@ -38,6 +38,7 @@
 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;
@@ -65,6 +66,8 @@ public class Connection
 
  private APIVersion apiVersion;
 
+ protected int _wait = 600;
+
  /**
  * Updated when Session.login_with_password() is called.
  */
@@ -159,10 +162,10 @@ public Connection(String client, String username, String password) throws java.n
  * 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)
+ public Connection(URL url, int wait)
  {
  deprecatedConstructorUsed = false;
-
+ _wait = wait;
  this.client = getClientFromURL(url);
  }
 
@@ -274,6 +277,8 @@ 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;
@@ -293,7 +298,7 @@ public String getSessionReference()
  /**
  * The (auto-generated parts of) the bindings dispatch XMLRPC calls on this Connection's client through this method.
  */
- Map dispatch(String method_call, Object[] method_params) throws XmlRpcException, XenAPIException
+ protected Map dispatch(String method_call, Object[] method_params) throws XmlRpcException, XenAPIException
  {
  Map response = (Map) client.execute(method_call, method_params);
 
@@ -337,7 +342,7 @@ else if (method_call.equals("session.logout"))
  new Connection(new URL(client_url.getProtocol(),
  (String)error[1],
  client_url.getPort(),
- client_url.getFile()));
+ client_url.getFile()), _wait);
  tmp_conn.sessionReference = sessionReference;
  try
  {