You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/03/06 06:54:49 UTC
git commit: refs/heads/master - Temporarily disable the code to
retrieve session cookie from WS call for volume snapshot functionality to
make vmware code compilable from JDK7.
Updated Branches:
refs/heads/master 00cd9d5d6 -> dad20a275
Temporarily disable the code to retrieve session cookie from WS call for
volume snapshot functionality to make vmware code compilable from JDK7.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/dad20a27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/dad20a27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/dad20a27
Branch: refs/heads/master
Commit: dad20a27537f424abc528a723fe1d308b88ab5ad
Parents: 00cd9d5
Author: Min Chen <mi...@citrix.com>
Authored: Tue Mar 5 21:54:21 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Mar 5 21:54:21 2013 -0800
----------------------------------------------------------------------
.../hypervisor/vmware/util/VmwareContext.java | 21 ++++++++++-----
1 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dad20a27/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
index 091ce77..c1139ee 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
@@ -38,8 +38,8 @@ import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLSession;
import javax.xml.ws.BindingProvider;
-import com.sun.xml.internal.ws.transport.http.client.CookieJar;
-import com.sun.xml.internal.ws.client.BindingProviderProperties;
+//import com.sun.xml.internal.ws.transport.http.client.CookieJar;
+//import com.sun.xml.internal.ws.client.BindingProviderProperties;
import org.apache.log4j.Logger;
@@ -381,12 +381,14 @@ public class VmwareContext {
long totalBytesDownloaded, ActionDelegate progressUpdater) throws Exception {
HttpURLConnection conn = getRawHTTPConnection(urlString);
+ /* TODO: need to find a way working for JDK7 since CookieJar is not available in JDK7.
CookieJar cookie = getServiceCookie();
if ( cookie == null ){
s_logger.error("No cookie is found in vwware web service request context!");
throw new Exception("No cookie is found in vmware web service request context!");
}
cookie.applyRelevantCookies(conn);
+ */
conn.setDoInput(true);
conn.setDoOutput(true);
conn.setAllowUserInteraction(true);
@@ -537,11 +539,7 @@ public class VmwareContext {
}
public HttpURLConnection getHTTPConnection(String urlString, String httpMethod) throws Exception {
- CookieJar cookie = getServiceCookie();
- if ( cookie == null ){
- s_logger.error("No cookie is found in vmware web service request context!");
- throw new Exception("No cookie is found in vmware web service request context!");
- }
+
HostnameVerifier hv = new HostnameVerifier() {
@Override
public boolean verify(String urlHostName, SSLSession session) {
@@ -556,7 +554,14 @@ public class VmwareContext {
conn.setDoInput(true);
conn.setDoOutput(true);
conn.setAllowUserInteraction(true);
+ /* TODO: need to find a way to work for JDK7 since CookieJar is not available in JDK7.
+ CookieJar cookie = getServiceCookie();
+ if ( cookie == null ){
+ s_logger.error("No cookie is found in vmware web service request context!");
+ throw new Exception("No cookie is found in vmware web service request context!");
+ }
cookie.applyRelevantCookies(conn);
+ */
conn.setRequestMethod(httpMethod);
connectWithRetry(conn);
return conn;
@@ -575,11 +580,13 @@ public class VmwareContext {
return (HttpURLConnection)url.openConnection();
}
+ /*TODO: find a way to get session cookie from a WS call
private CookieJar getServiceCookie() throws Exception {
VimPortType port = getService();
Map<String, Object> ctxt = ((BindingProvider) port).getRequestContext();
return (CookieJar)ctxt.get(BindingProviderProperties.HTTP_COOKIE_JAR);
}
+ */
private static void connectWithRetry(HttpURLConnection conn) throws Exception {
boolean connected = false;