diff options
3 files changed, 26 insertions, 5 deletions
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java index 816372707..80aed5e8e 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java @@ -1,12 +1,15 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * IBM Corporation - initial API and implementation + * yyyymmdd bug Email and other contact information + * -------- -------- ----------------------------------------------------------- + * 20080613 237116 makandre@ca.ibm.com - Andrew Mak, Web service monitoring fails on https endpoint *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.command.common; @@ -85,6 +88,8 @@ public class ComputeEndpointCommand extends AbstractDataModelOperation if (ext instanceof SOAPAddress) { String location = ((SOAPAddress)ext).getLocationURI(); + if (location.startsWith("https://")) + location = "http://" + location.substring(8); try { URL url = new URL(location); diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java index fd014e829..c99346d44 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ * yyyymmdd bug Email and other contact information * -------- -------- ----------------------------------------------------------- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan + * 20080613 237116 makandre@ca.ibm.com - Andrew Mak, Web service monitoring fails on https endpoint *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.command.common; @@ -56,6 +57,8 @@ public class ComputeProxyEndpointCommand extends AbstractDataModelOperation // Use the endpoint that matches with the proxy the extension passes to us if it is set if (proxyEndpoint != null) { String location = proxyEndpoint; + if (location.startsWith("https://")) + location = "http://" + location.substring(8); try { URL url = new URL(location); diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java index 840cd647f..99db0ed1e 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ * -------- -------- ----------------------------------------------------------- * 20060612 146564 kathy@ca.ibm.com - Kathy Chan * 20060728 145426 kathy@ca.ibm.com - Kathy Chan + * 20080613 237116 makandre@ca.ibm.com - Andrew Mak, Web service monitoring fails on https endpoint *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.command.common; @@ -113,7 +114,19 @@ public class GetMonitorCommand extends AbstractDataModelOperation else if ("https".equalsIgnoreCase(protocol)) port = 443; } - if (protocol != null && protocol.startsWith("http") && host != null && host.length() > 0 && port != -1) + if ("https".equalsIgnoreCase(protocol)) + { + IStatus warning = StatusUtils.warningStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[]{String.valueOf(port), endpoint})); + try + { + if (env != null) + env.getStatusHandler().report(warning); + } + catch (StatusException se) + { + } + } + else if (protocol != null && protocol.startsWith("http") && host != null && host.length() > 0 && port != -1) { IMonitor m = null; IMonitor[] monitors = MonitorCore.getMonitors(); |