apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-594: Updating the XenServer java bindings used in cloudstack - part 3.

Browse Source 
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 <chip.childers@gmail.com>
This commit is contained in:
Devdeep Singh 2012-12-13 09:42:43 -05:00 committed by Chip Childers
parent 2ce2645cd1
commit 2cc09c813a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deps/XenServerJava/src/com/xensource/xenapi/Connection.java vendored
View File

@ -38,6 +38,7 @@ import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfig; import org.apache.xmlrpc.client.XmlRpcClientConfig;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
import org.apache.xmlrpc.client.XmlRpcHttpClientConfig; import org.apache.xmlrpc.client.XmlRpcHttpClientConfig;
import org.apache.xmlrpc.client.XmlRpcSun15HttpTransportFactory;
import com.xensource.xenapi.Types.BadServerResponse; import com.xensource.xenapi.Types.BadServerResponse;
import com.xensource.xenapi.Types.SessionAuthenticationFailed; import com.xensource.xenapi.Types.SessionAuthenticationFailed;
@ -65,6 +66,8 @@ public class Connection
private APIVersion apiVersion; private APIVersion apiVersion;
protected int _wait = 600;
/** /**
* Updated when Session.login_with_password() is called. * Updated when Session.login_with_password() is called.
*/ */
@ -159,10 +162,10 @@ public class Connection
* When this constructor is used, a call to dispose() will do nothing. The programmer is responsible for manually * When this constructor is used, a call to dispose() will do nothing. The programmer is responsible for manually
* logging out the Session. * logging out the Session.
*/ */
public Connection(URL url) public Connection(URL url, int wait)
{ {
deprecatedConstructorUsed = false; deprecatedConstructorUsed = false;
_wait = wait;
this.client = getClientFromURL(url); this.client = getClientFromURL(url);
} }
@ -274,6 +277,8 @@ public class Connection
{ {
config.setTimeZone(TimeZone.getTimeZone("UTC")); config.setTimeZone(TimeZone.getTimeZone("UTC"));
config.setServerURL(url); config.setServerURL(url);
config.setReplyTimeout(_wait * 1000);
config.setConnectionTimeout(5000);
XmlRpcClient client = new XmlRpcClient(); XmlRpcClient client = new XmlRpcClient();
client.setConfig(config); client.setConfig(config);
return client; return client;
@ -293,7 +298,7 @@ public class Connection
/** /**
* The (auto-generated parts of) the bindings dispatch XMLRPC calls on this Connection's client through this method. * 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); Map response = (Map) client.execute(method_call, method_params);
@ -337,7 +342,7 @@ public class Connection
new Connection(new URL(client_url.getProtocol(), new Connection(new URL(client_url.getProtocol(),
(String)error[1], (String)error[1],
client_url.getPort(), client_url.getPort(),
client_url.getFile())); client_url.getFile()), _wait);
tmp_conn.sessionReference = sessionReference; tmp_conn.sessionReference = sessionReference;
try try
{ {