diff options
author | kchong | 2015-12-02 19:21:23 +0000 |
---|---|---|
committer | kchong | 2015-12-02 19:21:23 +0000 |
commit | e19fe94e679d31fb56f8e0b0bfb02de54c184812 (patch) | |
tree | 426ba1c57dd074e19a25c01ef3a0a54e86535625 | |
parent | 6611c71a893f423ed98bab2ec460b0076eb83cbe (diff) | |
download | webtools.webservices-R3_7_maintenance.tar.gz webtools.webservices-R3_7_maintenance.tar.xz webtools.webservices-R3_7_maintenance.zip |
[476132] Web services explorer issue with Java 8 - Page load failed with
Change-Id: I541ac1e865f44f216d199cda56297464cd0779e5
error: cannot parse response
3 files changed, 116 insertions, 8 deletions
diff --git a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF index 0acc6663c..eb833331e 100644 --- a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %PLUGIN_NAME Bundle-SymbolicName: org.eclipse.wst.ws.explorer; singleton:=true -Bundle-Version: 1.0.800.qualifier +Bundle-Version: 1.0.850.qualifier Bundle-Activator: org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin Bundle-Vendor: %PLUGIN_PROVIDER Bundle-Localization: plugin diff --git a/bundles/org.eclipse.wst.ws.explorer/pom.xml b/bundles/org.eclipse.wst.ws.explorer/pom.xml index 4a47fde85..ce89a963f 100644 --- a/bundles/org.eclipse.wst.ws.explorer/pom.xml +++ b/bundles/org.eclipse.wst.ws.explorer/pom.xml @@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.webservices</groupId>
<artifactId>org.eclipse.wst.ws.explorer</artifactId>
- <version>1.0.800-SNAPSHOT</version>
+ <version>1.0.850-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp index 51239fc52..bfc8eccdf 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp @@ -1,6 +1,6 @@ <% /******************************************************************************* - * Copyright (c) 2001, 2007 IBM Corporation and others. + * Copyright (c) 2001, 2015 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 @@ -13,16 +13,21 @@ * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable *******************************************************************************/ %> -<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*, +<%@ page contentType="text/html; charset=UTF-8" + import="org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*, org.eclipse.wst.ws.internal.explorer.platform.constants.*, org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue, org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs, org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective, org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPTransport, org.eclipse.wst.ws.internal.explorer.transport.HTTPTransportException, + org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames, + org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils, sun.misc.BASE64Decoder, javax.servlet.http.HttpServletResponse"%> + + <jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/> <% // Prepare the action. @@ -49,10 +54,44 @@ boolean inputsValid = action.populatePropertyTable(request); if (!inputsValid) { %> - <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <html lang="<%=response.getLocale().getLanguage()%>"> <head> + <script language="javascript"> + var perspectiveWorkArea = top.frames["<%=FrameNames.PERSPECTIVE_WORKAREA%>"]; + var perspectiveToolbar = top.frames["<%=FrameNames.PERSPECTIVE_TOOLBAR%>"]; + var perspectiveContent = top.frames["<%=FrameNames.PERSPECTIVE_CONTENT%>"]; + + function getPerspectiveContentFrameset() + { + return perspectiveContent.document.getElementsByTagName("frameset").item(0); + } + + function toggleDoubleClickColumnTitle() + { + var doubleClickColumn = document.getElementById("doubleclickcolumn"); + if (doubleClickColumn == null) + return; + <%String jsAltRestore = HTMLUtils.JSMangle(controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE"));%> + if (doubleClickColumn.title == "<%=jsAltRestore%>") + doubleClickColumn.title = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE"))%>"; + else + doubleClickColumn.title = "<%=jsAltRestore%>"; + } + + var wsdlNavigatorContainer = perspectiveContent.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER%>"]; + var wsdlNavigatorToolbar = wsdlNavigatorContainer.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_TOOLBAR%>"]; + var wsdlNavigatorContent = wsdlNavigatorContainer.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTENT%>"]; + var wsdlActionsContainer = perspectiveContent.frames["<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>"]; + var wsdlPropertiesContainer = wsdlActionsContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_CONTAINER%>"]; + var wsdlPropertiesToolbar = wsdlPropertiesContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_TOOLBAR%>"]; + var wsdlPropertiesContent = wsdlPropertiesContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_CONTENT%>"]; + var wsdlStatusContainer = wsdlActionsContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_CONTAINER%>"]; + var wsdlStatusToolbar = wsdlStatusContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_TOOLBAR%>"]; + var wsdlStatusContent = wsdlStatusContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_CONTENT%>"]; + + </script> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script> </head> @@ -72,10 +111,44 @@ else // Run the action and obtain the return code (fail/success). boolean actionResult = action.execute(); %> - <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html lang="<%=response.getLocale().getLanguage()%>"> + <html lang="<%=response.getLocale().getLanguage()%>"> <head> + <script language="javascript"> + var perspectiveWorkArea = top.frames["<%=FrameNames.PERSPECTIVE_WORKAREA%>"]; + var perspectiveToolbar = top.frames["<%=FrameNames.PERSPECTIVE_TOOLBAR%>"]; + var perspectiveContent = top.frames["<%=FrameNames.PERSPECTIVE_CONTENT%>"]; + + function getPerspectiveContentFrameset() + { + return perspectiveContent.document.getElementsByTagName("frameset").item(0); + } + + function toggleDoubleClickColumnTitle() + { + var doubleClickColumn = document.getElementById("doubleclickcolumn"); + if (doubleClickColumn == null) + return; + <%String jsAltRestore = HTMLUtils.JSMangle(controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE"));%> + if (doubleClickColumn.title == "<%=jsAltRestore%>") + doubleClickColumn.title = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE"))%>"; + else + doubleClickColumn.title = "<%=jsAltRestore%>"; + } + + var wsdlNavigatorContainer = perspectiveContent.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER%>"]; + var wsdlNavigatorToolbar = wsdlNavigatorContainer.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_TOOLBAR%>"]; + var wsdlNavigatorContent = wsdlNavigatorContainer.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTENT%>"]; + var wsdlActionsContainer = perspectiveContent.frames["<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>"]; + var wsdlPropertiesContainer = wsdlActionsContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_CONTAINER%>"]; + var wsdlPropertiesToolbar = wsdlPropertiesContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_TOOLBAR%>"]; + var wsdlPropertiesContent = wsdlPropertiesContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_CONTENT%>"]; + var wsdlStatusContainer = wsdlActionsContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_CONTAINER%>"]; + var wsdlStatusToolbar = wsdlStatusContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_TOOLBAR%>"]; + var wsdlStatusContent = wsdlStatusContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_CONTENT%>"]; + + </script> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script> </head> @@ -123,10 +196,45 @@ else messageQueue.addMessage(String.valueOf(code)); messageQueue.addMessage(httpe.getMessage()); %> - <jsp:include page="/wsdl/scripts/wsdlpanes.jsp" flush="true"/> + <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <html lang="<%=response.getLocale().getLanguage()%>"> <head> + <script language="javascript"> + var perspectiveWorkArea = top.frames["<%=FrameNames.PERSPECTIVE_WORKAREA%>"]; + var perspectiveToolbar = top.frames["<%=FrameNames.PERSPECTIVE_TOOLBAR%>"]; + var perspectiveContent = top.frames["<%=FrameNames.PERSPECTIVE_CONTENT%>"]; + + function getPerspectiveContentFrameset() + { + return perspectiveContent.document.getElementsByTagName("frameset").item(0); + } + + function toggleDoubleClickColumnTitle() + { + var doubleClickColumn = document.getElementById("doubleclickcolumn"); + if (doubleClickColumn == null) + return; + <%String jsAltRestore = HTMLUtils.JSMangle(controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE"));%> + if (doubleClickColumn.title == "<%=jsAltRestore%>") + doubleClickColumn.title = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE"))%>"; + else + doubleClickColumn.title = "<%=jsAltRestore%>"; + } + + var wsdlNavigatorContainer = perspectiveContent.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER%>"]; + var wsdlNavigatorToolbar = wsdlNavigatorContainer.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_TOOLBAR%>"]; + var wsdlNavigatorContent = wsdlNavigatorContainer.frames["<%=WSDLFrameNames.WSDL_NAVIGATOR_CONTENT%>"]; + var wsdlActionsContainer = perspectiveContent.frames["<%=WSDLFrameNames.WSDL_ACTIONS_CONTAINER%>"]; + var wsdlPropertiesContainer = wsdlActionsContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_CONTAINER%>"]; + var wsdlPropertiesToolbar = wsdlPropertiesContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_TOOLBAR%>"]; + var wsdlPropertiesContent = wsdlPropertiesContainer.frames["<%=WSDLFrameNames.WSDL_PROPERTIES_CONTENT%>"]; + var wsdlStatusContainer = wsdlActionsContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_CONTAINER%>"]; + var wsdlStatusToolbar = wsdlStatusContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_TOOLBAR%>"]; + var wsdlStatusContent = wsdlStatusContainer.frames["<%=WSDLFrameNames.WSDL_STATUS_CONTENT%>"]; + + </script> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>"></script> </head> |