Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp')
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp65
1 files changed, 0 insertions, 65 deletions
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp
deleted file mode 100644
index e3762946f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<%
- // Prepare the action.
- RefreshUDDINodesAction action = new RefreshUDDINodesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action
- boolean actionResult = action.execute();
-%>
-<script language="javascript">
- function processClearNodesForm()
- {
- var clearNodesForm = document.forms[0];
-<%
- Vector staleNodes = action.getStaleNodes();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- for (int i=0;i<staleNodes.size();i++)
- {
- Node staleNode = (Node)staleNodes.elementAt(i);
-%>
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_NODE",staleNode.getNodeName()))%>"))
- clearNodesForm.appendChild(createHiddenElement("<%=ActionInputs.NODEID%>",<%=staleNode.getNodeId()%>));
-<%
- }
-%>
- clearNodesForm.submit();
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodesActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data">
-</form>
-<script language="javascript">
- processClearNodesForm();
-</script>
-</body>
-</html>

Back to the top

ebtools.webservices.git/diff/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java?h=v200804092100'>bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java279
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java260
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java428
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParamModifier.java150
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java472
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/NameMappingUtils.java73
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/AxisEmitterContext.java181
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/AxisEmitterDefaults.java91
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/PersistentAxisEmitterContext.java114
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisServicesSaxHandler.java46
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisServletSaxHandler.java48
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisWebServiceLocator.java394
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/ServerConfigWSDDVisitor.java42
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/plugin/WebServiceAxisConsumptionCorePlugin.java118
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore7
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/.project28
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF48
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html34
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties6
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties25
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml39
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties106
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java81
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java263
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java69
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java58
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java182
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java179
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java105
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java348
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java158
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java446
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java130
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java63
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java283
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java622
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java74
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java297
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java120
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java176
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java514
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java39
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java127
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java140
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java119
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java51
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java159
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore7
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/.project28
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF50
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/about.html34
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties7
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl26
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties29
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml161
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUI.properties105
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUIMessages.java67
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisCheckCompilerLevelCommand.java92
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java65
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java74
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java29
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java129
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUCodeGenOperation.java178
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java161
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java213
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ModifyWSDLEndpointAddressCommand.java187
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java106
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDCodeGenOperation.java234
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java218
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ValidateWSIComplianceCommand.java99
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java133
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUConfigCommand.java34
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BackupSkelImplCommand.java174
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java261
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java294
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDConfigCommand.java35
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java172
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java187
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java301
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java172
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java128
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java174
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java118
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java227
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java216
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java51
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java51
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java331
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java28
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java34
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntimeChecker.java46
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/.classpath8
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/.cvsignore9
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/.project28
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF62
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/about.html34
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/build.properties24
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/plugin.properties19
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/plugin.xml52
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties199
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java121
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java245
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java88
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java30
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java31
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java77
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java71
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java40
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java40
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java40
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java38
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java91
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java116
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java86
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java129
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java423
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java98
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java219
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java80
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java156
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java94
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java217
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java45
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java139
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java84
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java108
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java112
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java139
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java147
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java89
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java98
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java76
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java137
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java119
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java362
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLTreeCommand.java115
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java335
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java82
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java137
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java142
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java68
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java63
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java233
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java114
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java139
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java56
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java58
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java156
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java61
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java154
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java1459
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java92
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java36
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaMerger.java204
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java167
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java84
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java122
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java74
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java54
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java49
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java117
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java100
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java99
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java68
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java95
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java39
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java147
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java168
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java56
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java56
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java90
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java128
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java123
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java92
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java130
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java37
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java37
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java129
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ObjectType.java63
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java83
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java65
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java56
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java61
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java108
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java123
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java62
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java143
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java38
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java57
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java195
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java263
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java57
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java37
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java56
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java112
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java54
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java39
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java44
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java39
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java48
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java69
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java53
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java17
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java17
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java17
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java17
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java17
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java17
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java17
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java17
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java57
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java76
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java138
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java93
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java102
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java304
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java119
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java77
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java56
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java92
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java143
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java148
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java100
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java128
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java88
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java104
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java227
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java115
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java28
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java99
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java86
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java137
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java50
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java69
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java33
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java142
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore1
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ejb.ui/.project22
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ejb.ui/.settings/org.eclipse.pde.prefs15
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF10
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html34
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties4
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties28
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml75
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/.cvsignore7
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/.project28
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF49
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/about.html34
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/build.properties7
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gifbin570 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gifbin577 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.pngbin6489 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.pngbin6018 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpgbin16187 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpgbin16150 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpgbin16010 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpgbin16036 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpgbin16218 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpgbin16243 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/plugin.properties62
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/plugin.xml396
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties19
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java29
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java156
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java164
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java42
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java331
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java122
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java59
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java122
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java84
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java155
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java55
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java73
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java1682
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java198
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java181
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java105
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java103
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java62
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java645
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java648
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java49
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java78
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java170
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java93
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore7
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/.project28
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF24
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/about.html34
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/build.properties7
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gifbin353 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/icons/wizban/uddiprivateconfig_wiz.pngbin6484 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties24
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml57
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistry.properties55
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistryMessages.java39
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java101
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java88
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java98
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java210
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java46
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java111
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java33
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java80
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java133
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.cvsignore7
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.project28
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF36
-rw-r--r--bundles/org.eclipse.jst.ws.ui/about.html34
-rw-r--r--bundles/org.eclipse.jst.ws.ui/build.properties7
-rw-r--r--bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gifbin568 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.ui/plugin.properties48
-rw-r--r--bundles/org.eclipse.jst.ws.ui/plugin.xml78
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPlugin.properties120
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPluginMessages.java84
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java64
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java18
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java83
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java86
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java343
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java70
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java43
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java244
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java250
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java319
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java74
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/popup/PopupTestService.java71
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java172
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/TestFacilityDefaultsPreferencePage.java364
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java21
-rw-r--r--bundles/org.eclipse.jst.ws/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws/.cvsignore7
-rw-r--r--bundles/org.eclipse.jst.ws/.project28
-rw-r--r--bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.jst.ws/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF47
-rw-r--r--bundles/org.eclipse.jst.ws/about.html34
-rw-r--r--bundles/org.eclipse.jst.ws/build.properties16
-rw-r--r--bundles/org.eclipse.jst.ws/component.xml15
-rw-r--r--bundles/org.eclipse.jst.ws/plugin.properties16
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPlugin.properties31
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java48
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java61
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java37
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java32
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java82
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java86
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java28
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java122
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java1539
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java248
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java1919
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java69
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java809
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java140
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2PathTransformer.java32
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java100
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TestFacilityListTransformer.java40
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.java93
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java41
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java288
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaBeanProperty.java96
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRule.java129
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRuleEngine.java56
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceAnalyzer.java214
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceRuleEngine.java278
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JDTResolver.java883
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaBeanProperty.java147
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRule.java143
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRuleSet.java285
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0001.java68
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0002.java82
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0003.java151
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0005.java121
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0006.java164
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRuleSetFactory.java44
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java393
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java49
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java110
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java119
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java306
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java31
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java24
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java48
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java114
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java40
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java31
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java46
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java100
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java42
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java118
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java39
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java19
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java205
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java39
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java181
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java97
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaClientInfo.java48
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaInfo.java48
-rw-r--r--bundles/org.eclipse.wst.command.env.core/.classpath7
-rw-r--r--bundles/org.eclipse.wst.command.env.core/.cvsignore8
-rw-r--r--bundles/org.eclipse.wst.command.env.core/.project28
-rw-r--r--bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF20
-rw-r--r--bundles/org.eclipse.wst.command.env.core/about.html34
-rw-r--r--bundles/org.eclipse.wst.command.env.core/build.properties19
-rw-r--r--bundles/org.eclipse.wst.command.env.core/component.xml8
-rw-r--r--bundles/org.eclipse.wst.command.env.core/plugin.properties16
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java26
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java33
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties22
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCoreMessages.java31
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java30
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java49
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java22
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java22
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java88
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java22
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java62
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java30
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java58
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java87
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java74
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java45
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java82
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/BeanModifier.java22
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/ClassEntry.java77
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java293
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java47
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java117
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java32
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java23
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java102
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java154
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java143
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java160
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java71
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java472
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java24
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java22
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java99
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java25
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java27
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java135
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java133
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java81
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java29
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java45
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java47
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java92
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java96
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java121
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java117
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/.classpath7
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/.cvsignore8
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/.project28
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF26
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/about.html34
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/build.properties10
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/icons/full/obj16/ant_buildfile.gifbin370 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.command.env.ui/icons/full/wizban/newantfiles_wiz.pngbin9163 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.command.env.ui/plugin.properties24
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/plugin.xml29
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd117
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUI.properties42
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUIMessages.java53
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/common/LabelsAndIds.java52
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/common/TimedOperation.java179
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntExtension.java110
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntExtensionCreation.java103
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizard.java296
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java193
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java99
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java98
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java585
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java107
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/RuntimeStruct.java52
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java51
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java103
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java191
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EnvironmentUtils.java42
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/SWTEnvironmentManager.java28
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java55
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java247
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java110
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/AbstractSelectionDialog.java35
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java29
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java42
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java128
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java46
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java45
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DialogDataEvents.java35
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java435
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java42
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java39
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java44
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java35
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java48
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java34
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java322
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleDialog.java164
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java20
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java27
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java71
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java74
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java54
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java34
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java153
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java74
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java71
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java21
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java20
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java34
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java39
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java23
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java538
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java227
-rw-r--r--bundles/org.eclipse.wst.command.env/.classpath8
-rw-r--r--bundles/org.eclipse.wst.command.env/.cvsignore10
-rw-r--r--bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch20
-rw-r--r--bundles/org.eclipse.wst.command.env/.project38
-rw-r--r--bundles/org.eclipse.wst.command.env/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--bundles/org.eclipse.wst.command.env/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF27
-rw-r--r--bundles/org.eclipse.wst.command.env/about.html34
-rw-r--r--bundles/org.eclipse.wst.command.env/ant-lib/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.command.env/ant-src/ws/ant/task/WebServiceGenerationAntTask.java40
-rw-r--r--bundles/org.eclipse.wst.command.env/ant/axisclient.properties60
-rw-r--r--bundles/org.eclipse.wst.command.env/ant/axisservice.properties71
-rw-r--r--bundles/org.eclipse.wst.command.env/ant/wsant.bat49
-rw-r--r--bundles/org.eclipse.wst.command.env/ant/wsant.sh56
-rw-r--r--bundles/org.eclipse.wst.command.env/ant/wsgen.xml13
-rw-r--r--bundles/org.eclipse.wst.command.env/build-anttasks.xml52
-rw-r--r--bundles/org.eclipse.wst.command.env/build.properties14
-rw-r--r--bundles/org.eclipse.wst.command.env/plugin.properties22
-rw-r--r--bundles/org.eclipse.wst.command.env/plugin.xml35
-rw-r--r--bundles/org.eclipse.wst.command.env/schema/antScenario.exsd110
-rw-r--r--bundles/org.eclipse.wst.command.env/schema/antdatamapping.exsd131
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties48
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/EnvironmentMessages.java52
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntController.java220
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntEnvironment.java588
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntOperationManager.java63
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntStatusHandler.java49
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/PropertyDataHolder.java33
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/String2BooleanTransformer.java28
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java855
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java73
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties34
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java90
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java153
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java797
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java296
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java40
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java117
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java110
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java192
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java86
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/AccumulateStatusHandler.java148
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java27
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseStatusHandler.java63
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EclipseEnvironment.java111
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EnvironmentManager.java31
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/IEclipseStatusHandler.java32
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java43
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java222
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.classpath8
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.cvsignore9
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.project28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs68
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/about.html34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/build.properties30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/buildJSPs.xml229
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/icons/etool16/launch_ws_explorer.gifbin583 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/plugin.properties59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/plugin.xml128
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil18
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/schema/wseTransportProvider.exsd145
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/servletapi/org.eclipse.equinox.servlet.api_1.0.0.v20060206.jarbin80449 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/JettyRunnable.java55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.java52
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java65
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java287
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WebappManager.java107
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/action/LaunchWSEAction.java63
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java75
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java76
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java134
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java98
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java81
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java72
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java127
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java220
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java80
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java132
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java163
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java88
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java105
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java122
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java229
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java233
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java92
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java104
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java76
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java134
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java163
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java121
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java250
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddUserDefRegistryToUDDIPerspectiveAction.java49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java87
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java109
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java135
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java92
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeAction.java46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java137
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java117
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java192
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java118
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java118
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryElement.java192
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryFolderElement.java117
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java110
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java109
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java99
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java161
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java62
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryDetailsTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryFolderNode.java68
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryNode.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUserDefUDDIRegistryTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java224
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java102
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java109
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java94
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java126
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java453
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java253
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java75
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/TransportProviderRegistry.java183
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java242
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java242
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java53
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java81
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java63
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java53
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java103
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java217
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java266
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LoginAdvancedAction.java222
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LogoutAdvancedAction.java72
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java383
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java250
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java238
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java254
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java72
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java112
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java315
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java119
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java112
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java378
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java119
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java112
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java392
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java121
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java269
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java377
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java246
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java163
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java221
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java228
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java83
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java76
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java83
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java229
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java425
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java79
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java148
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java133
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIExceptionHandler.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java115
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java171
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java185
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java416
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java127
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java497
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java343
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java209
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java48
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java569
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java111
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java308
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java110
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java76
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/LoginTool.java73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java104
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java103
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java65
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java124
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java140
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java126
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java249
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java116
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java499
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java423
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/BrowserDetect.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java69
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java207
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java25
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java247
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java101
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java148
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java96
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java89
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java195
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java88
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java167
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java100
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java135
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java70
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java90
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java198
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java92
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java48
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java97
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java233
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java421
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java396
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java18
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDAttributeFragment.java20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java16
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java16
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java24
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java22
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java14
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java18
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDAttributeUseToFragmentMapper.java75
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java105
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java88
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java104
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java174
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java90
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java87
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java102
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java188
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java189
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java287
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDAttributeFragment.java183
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java338
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentFixFragment.java184
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentRangeFragment.java182
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java120
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java297
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java119
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java337
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java167
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java168
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java265
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java289
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java152
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java119
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java103
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java114
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java96
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java21
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java64
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java370
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java21
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java98
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java192
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java640
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java497
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransport.java146
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransportProvider.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SOAPMessageUtils.java202
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java143
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java143
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java95
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java95
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java96
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java128
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java83
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java155
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java104
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java183
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java90
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java94
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java94
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java86
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java75
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java24
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java460
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java53
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java96
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java105
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java86
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java48
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java153
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java139
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java194
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java142
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/HTTPTransportException.java65
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/IDeserializer.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPMessage.java220
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransport.java59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransportProvider.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISerializer.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/MessageContext.java107
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/SOAPMessage.java339
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/TransportException.java51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties188
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties164
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties496
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties172
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties163
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp138
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc110
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc184
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SessionTimedOut.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc79
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp627
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css5
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp62
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp63
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp24
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp22
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesToggleNodeActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesActionJSP.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesConfirmJSP.jsp39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp52
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesNodeActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesToolActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp83
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp68
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesImportToWorkbenchForm.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp101
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp155
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp101
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp101
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp312
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp72
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/ProcessFavoritesFramesetsForm.jsp27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_enabled.gifbin583 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_highlighted.gifbin583 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_enabled.gifbin623 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_highlighted.gifbin623 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_enabled.gifbin597 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_highlighted.gifbin597 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_enabled.gifbin591 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_highlighted.gifbin591 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_enabled.gifbin574 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_highlighted.gifbin574 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_enabled.gifbin564 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_highlighted.gifbin564 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_enabled.gifbin605 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_highlighted.gifbin605 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_enabled.gifbin587 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_highlighted.gifbin587 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_business_node.gifbin358 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_cat_node.gifbin373 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_node.gifbin353 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_interface_node.gifbin576 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_node.gifbin541 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsdl_service_node.gifbin563 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsil_node.gifbin606 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesFormSubmit.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesPanes.jsp28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesTable.jsp62
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesframesets.jsp32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIBusinessView.jsp127
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp127
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp127
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp127
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp124
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp127
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp129
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp104
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp161
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadPage.jsp36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/copyright.inc12
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/formheader.inc23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/otherActions.jsp55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/simpleCommon_table.jsp26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/actions.gifbin365 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_enabled.gifbin1023 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_highlighted.gifbin1023 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_enabled.gifbin327 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_highlighted.gifbin327 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/calendar.gifbin359 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_enabled.gifbin545 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_highlighted.gifbin545 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_enabled.gifbin1008 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_highlighted.gifbin1008 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_play.gifbin145 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_record.gifbin210 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_save.gifbin229 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_stop.gifbin149 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_play.gifbin318 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_record.gifbin211 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_save.gifbin571 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_stop.gifbin154 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/actionengine.gifbin580 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_enabled.gifbin144 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_highlighted.gifbin144 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_enabled.gifbin145 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_highlighted.gifbin145 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_closed.gifbin219 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_open.gifbin324 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_enabled.gifbin327 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_highlighted.gifbin327 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_enabled.gifbin330 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_highlighted.gifbin330 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_enabled.gifbin327 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_highlighted.gifbin327 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/keyline.gifbin96 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_enabled.gifbin590 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_highlighted.gifbin590 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line.gifbin70 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_last.gifbin62 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_notlast.gifbin92 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_last.gifbin82 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_notlast.gifbin82 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/navigator.gifbin139 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_last.gifbin84 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_notlast.gifbin85 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_enabled.gifbin216 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_highlighted.gifbin216 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/root_main.gifbin342 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/space.gifbin50 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/status.gifbin121 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_enabled.gifbin323 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_highlighted.gifbin323 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistclosed.gifbin81 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistopened.gifbin78 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_enabled.gifbin347 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_highlighted.gifbin347 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl.gifbin563 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_enabled.gifbin1008 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_highlighted.gifbin1008 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_enabled.gifbin599 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_highlighted.gifbin599 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/launch_options_registry.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/browserdetect.js15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/calendarbrowser.jsp69
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formsubmit.jsp34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formutils.jsp41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/panes.jsp39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/resumeproxyloadpage.js17
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/switchperspective.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/tables.jsp159
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/toolbar.js30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/treeview.js50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/wsdlbrowser.jsp48
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddItemsToFavoritesActionJSP.jsp41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusinessGetServicesActionJSP.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CheckFavoriteExistsActionJSP.jsp66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodeActionJSP.jsp35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodesActionJSP.jsp36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LaunchSubQueryAction.inc56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LoginAdvancedActionJSP.jsp55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LogoutAdvancedActionJSP.jsp44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ManageReferencedServicesActionJSP.jsp68
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/NewNodeAction.inc55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/OpenRegistryActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp52
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp52
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectFindToolActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectNavigatorNodeActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectPropertiesToolActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectSubQueryItemActionJSP.jsp52
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetBusinessActionJSP.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ShowPublisherAssertionsActionJSP.jsp58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleCategoryNodeActionJSP.jsp59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ToggleNavigatorNodeActionJSP.jsp21
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferSubQueryResultsActionJSP.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferToAddCategoryDataActionJSP.jsp45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp24
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIImportWSDLToWorkbenchActionJSP.jsp22
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDILaunchWebServiceWizardActionJSP.jsp19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UnpublishActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateAction.inc47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateBusinessActionJSP.jsp41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateNewPublishActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateRegistryActionJSP.jsp41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceActionJSP.jsp87
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceInterfaceActionJSP.jsp41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_browser.jsp41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_content.jsp115
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_toolbar.jsp45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/geo-data.txt1383
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/naics-data.txt1814
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/data/unspsc-data.txt17054
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceAdvancedForm.jsp114
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceForm.jsp260
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusPublishServiceSimpleForm.jsp95
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/BusinessDetailsForm.jsp294
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/GetForm.jsp218
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ItemsSummaryForm.jsp211
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/LoginUddiForm.jsp88
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManagePublisherAssertionsForm.jsp409
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManageReferencedServicesForm.jsp232
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenRegistryForm.jsp159
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ProcessUDDIFramesetsForm.jsp27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegDetailsForm.jsp268
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesAdvancedForm.jsp93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesForm.jsp47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindBusinessesSimpleForm.jsp58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindForm.jsp709
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesAdvancedForm.jsp114
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesForm.jsp45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServiceInterfacesSimpleForm.jsp58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesAdvancedForm.jsp85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesForm.jsp47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindServicesSimpleForm.jsp58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegFindUUIDForm.jsp65
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessAdvancedForm.jsp74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessForm.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishBusinessSimpleForm.jsp71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishForm.jsp584
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceAdvancedForm.jsp107
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceForm.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceAdvancedForm.jsp101
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceForm.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceInterfaceSimpleForm.jsp92
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/RegPublishServiceSimpleForm.jsp103
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ResultsForm.jsp177
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceDetailsForm.jsp279
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceInterfaceDetailsForm.jsp293
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UDDILaunchWebServiceWizardForm.jsp20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/UnpublishForm.jsp91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/advancedCommon_table.jsp63
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/authentication_table.jsp88
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/categories_table.jsp77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsCategories_table.jsp60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsDiscoveryURLs_table.jsp68
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsIdentifiers_table.jsp60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsLanguageInput_table.jsp82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/detailsSingleItem_table.jsp34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/discoveryURLs_table.jsp62
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findQualifiers_table.jsp65
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/findformheader.inc53
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/identifiers_table.jsp54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/languageInput_table.jsp86
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/login_authentication_table.jsp79
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/names_findQualifiers_table.jsp31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/results_table.jsp52
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/resultsformheader.inc50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ud_categories_table.jsp62
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjectsPublisherAssertions_table.jsp84
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/uddiObjects_table.jsp80
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_enabled.gifbin358 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/business_highlighted.gifbin358 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_enabled.gifbin372 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_closed_highlighted.gifbin372 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/businesses_open_highlighted.gifbin369 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/category.gifbin363 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_enabled.gifbin347 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/find_highlighted.gifbin347 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_enabled.gifbin576 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/open_registry_highlighted.gifbin576 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_enabled.gifbin595 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_highlighted.gifbin595 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_enabled.gifbin569 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publish_service_highlighted.gifbin569 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_enabled.gifbin362 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/publisher_assertions_highlighted.gifbin362 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_enabled.gifbin339 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_closed_highlighted.gifbin339 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/queries_open_highlighted.gifbin339 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/query.gifbin564 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_enabled.gifbin612 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/referenced_services_highlighted.gifbin612 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/registry.gifbin353 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/regstrycat_obj.gifbin373 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_highlighted.gifbin541 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interface_highlighted.gifbin576 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_enabled.gifbin594 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_closed_highlighted.gifbin594 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/service_interfaces_open_highlighted.gifbin603 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_enabled.gifbin594 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_closed_highlighted.gifbin594 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_enabled.gifbin594 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/services_open_highlighted.gifbin594 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish.gifbin351 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_enabled.gifbin568 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_bus_highlighted.gifbin568 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_enabled.gifbin576 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_highlighted.gifbin576 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_enabled.gifbin599 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/images/unpublish_service_interface_highlighted.gifbin599 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_content.jsp51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_toolbar.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_content.jsp77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_toolbar.jsp85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/cbpanes.jsp20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/detailstables.jsp1550
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/results.jsp135
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddiframesets.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/uddipanes.jsp35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/scripts/udditables.jsp894
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_content.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_toolbar.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/uddi_perspective_content.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ClearWSDLActionJSP.jsp44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/CreateInstanceActionJSP.jsp35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp144
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp179
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/OpenWSDLActionJSP.jsp59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/RefreshWSDLActionJSP.jsp90
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ResizeWSDLFramesActionJSP.jsp55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchReadOnlyFragmentViewsActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/UpdateWSDLBindingActionJSP.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLAddToFavoritesActionJSP.jsp41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLImportWSDLToWorkbenchActionJSP.jsp22
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLLaunchWebServiceWizardActionJSP.jsp19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsFormView.jsp108
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsSoapView.jsp376
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/InvokeWSDLOperationForm.jsp209
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/OpenWSDLForm.jsp85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ProcessWSDLFramesetsForm.jsp27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsFormView.jsp229
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsSoapView.jsp119
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLBindingDetailsForm.jsp112
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsForm.jsp105
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsFormView.jsp106
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsSourceView.jsp45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLServiceDetailsForm.jsp79
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/bindings_table.jsp72
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/endpoint_table.jsp139
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/operations_table.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/services_table.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp89
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/SOAPHeaderWrapperWFragmentJSP.jsp86
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp123
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRFragmentJSP.jsp91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp135
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentFixWFragmentJSP.jsp129
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentRFragmentJSP.jsp95
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexSimpleContentRangeWFragmentJSP.jsp137
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp201
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentJSP.jsp76
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentXML.jsp114
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultWFragmentJSP.jsp74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationRFragmentJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDelegationWFragmentJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDElementRFragmentJSP.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDElementWFragmentJSP.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyRFragmentJSP.jsp17
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDEmptyWFragmentJSP.jsp77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp190
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp119
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp79
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp152
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupRFragmentJSP.jsp89
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp101
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfoDialog.jsp53
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_content.jsp48
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_toolbar.jsp51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp97
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp109
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp165
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp95
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp323
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp140
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp103
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp144
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp157
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_enabled.gifbin590 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/invoke_wsdl_operation_highlighted.gifbin590 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_enabled.gifbin579 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/open_wsdl_highlighted.gifbin579 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_binding_node.gifbin615 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_operation_node.gifbin359 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/images/wsdl_service_node.gifbin585 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/fragmenttables.jsp202
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlframesets.jsp32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/scripts/wsdlpanes.jsp28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/soap_envelope_xml.jsp34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_actions_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_content.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_toolbar.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_perspective_content.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_content.jsp74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_toolbar.jsp82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_result_content.jsp73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_container.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_content.jsp44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_toolbar.jsp68
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_browser.jsp58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp405
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_toolbar.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsexplorer.jsp98
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearNodeConfirmJSP.jsp39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ClearWSILActionJSP.jsp18
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSDLToFileSystemActionJSP.jsp24
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ImportWSILToFileSystemActionJSP.jsp24
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILActionJSP.jsp68
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILLinkActionJSP.jsp68
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/RefreshActionJSP.jsp64
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ResizeWSILFramesActionJSP.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILNodeActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SelectWSILToolActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WSILImportWSILToWorkbenchActionJSP.jsp22
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToFavoritesActionJSP.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilImportWSDLToWorkbenchActionJSP.jsp22
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilLaunchWebServiceWizardActionJSP.jsp19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilToggleNodeActionJSP.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/OpenWSILForm.jsp102
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/ProcessWSILFramesetsForm.jsp27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiBusinessDetailsPage.jsp127
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiServiceDetailsPage.jsp133
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WSILImportWSILToWorkbenchForm.jsp114
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsdlServiceDetailsPage.jsp149
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilDetailsPage.jsp89
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilImportWSDLToWorkbenchForm.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLaunchWebServiceWizardForm.jsp20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilLinkDetailsPage.jsp85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_enabled.gifbin583 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/add_to_UDDI_perspective_highlighted.gifbin583 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_enabled.gifbin564 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_UDDI_service_highlighted.gifbin564 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_enabled.gifbin587 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSDL_service_highlighted.gifbin587 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_enabled.gifbin597 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_WSIL_highlighted.gifbin586 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_enabled.gifbin591 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/list_business_highlighted.gifbin591 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_enabled.gifbin596 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/open_wsil_highlighted.gifbin596 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/images/wsil_node.gifbin606 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilAbstractTable.jsp82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilFormSubmit.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilNameTable.jsp82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilPanes.jsp28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilTable.jsp82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/scripts/wsilframesets.jsp32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiBusinessView.jsp158
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiServicesView.jsp159
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsdlServicesView.jsp135
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsilLinksView.jsp131
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_actions_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_content.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_toolbar.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_perspective_content.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_content.jsp74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_toolbar.jsp82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_container.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_content.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_toolbar.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.classpath7
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.cvsignore8
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.project28
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF23
-rw-r--r--bundles/org.eclipse.wst.ws.parser/about.html34
-rw-r--r--bundles/org.eclipse.wst.ws.parser/build.properties16
-rw-r--r--bundles/org.eclipse.wst.ws.parser/plugin.properties16
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOContractReference.java28
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOParser.java123
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/disco/DISCOReference.java27
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/NetUtils.java93
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/discovery/WebServicesParserExt.java32
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesConstants.java22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesLink.java34
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesRegistryTypeAbstract.java429
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesService.java34
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIBusiness.java49
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIRegistry.java88
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIService.java51
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesUDDIServiceInterface.java51
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSDL.java38
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/FavoritesWSIL.java39
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesRegistryType.java36
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIBusiness.java23
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIRegistry.java25
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIService.java23
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesUDDIServiceInterface.java23
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSDL.java21
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/favorites/IFavoritesWSIL.java21
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java111
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/HTMLHeadHandler.java296
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/IllegalArgumentsException.java22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/UDDIURIHelper.java63
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WSILMessages.java22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationException.java46
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WWWAuthenticationHandler.java19
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServiceEntity.java148
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java628
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/wsil.properties22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/PluginMessages.java28
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties18
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/.classpath7
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/.project28
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/META-INF/MANIFEST.MF20
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/build.properties8
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/icons/full/obj16/file_obj.gifbin358 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/icons/full/obj16/fldr_obj.gifbin359 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/icons/full/ovr16/favorite_ovr.gifbin171 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/icons/full/ovr16/invalidtype_ovr.gifbin82 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/icons/full/ovr16/unmodifiable_ovr.gifbin111 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/icons/full/ovr16/warning_ovr.gifbin173 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/plugin.properties21
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/plugin.xml56
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/schema/servicePolicyui.exsd326
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/BaseOperationImpl.java233
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/IConManager.java251
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/PolicyOperationImpl.java121
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/QuickFixActionInfoImpl.java59
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/ScrolledPageContent.java66
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/ServicePoliciesComposite.java1536
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/ServicePolicyPlatformUIImpl.java202
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/ServicePolicyRegistryUI.java288
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/WstSPUIPluginMessages.java48
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/WstSPUIPluginMessages.properties38
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/preferences/ServicePoliciesPreferencePage.java136
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/properties/ServicePoliciesPropertyPage.java311
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/internal/service/policy/ui/properties/ServicePolicyPropertyTester.java21
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/service/policy/ui/IEnableOperation.java34
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/service/policy/ui/ILaunchOperation.java34
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/service/policy/ui/IPolicyOperation.java135
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/service/policy/ui/IQuickFixAction.java33
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/service/policy/ui/IQuickFixActionInfo.java31
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/service/policy/ui/ServicePolicyActivatorUI.java96
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/service/policy/ui/ServicePolicyPlatformUI.java114
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/service/policy/ui/utils/ActivityUtils.java40
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy.ui/src/org/eclipse/wst/ws/service/policy/ui/utils/ServiceUtils.java46
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/.classpath7
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/.project28
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/META-INF/MANIFEST.MF16
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/build.properties7
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/plugin.properties36
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/plugin.xml39
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/schema/servicePolicy.exsd311
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/internal/policy/DescriptorImpl.java109
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/internal/policy/EnumerationStateImpl.java100
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/internal/policy/LocalUtils.java307
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/internal/policy/PolicyStateImpl.java325
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/internal/policy/ServicePolicyImpl.java429
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/internal/policy/ServicePolicyPlatformImpl.java564
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/internal/policy/ServicePolicyRegistry.java376
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/internal/policy/StateEnumerationItemImpl.java64
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/internal/policy/UnresolvedPolicyRelationship.java38
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/internal/policy/UnresolvedRelationship.java39
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/IDescriptor.java96
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/IFilter.java29
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/IPolicyEnumerationList.java38
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/IPolicyRelationship.java39
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/IPolicyState.java95
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/IPolicyStateEnum.java52
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/IServicePolicy.java172
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/IStateEnumerationItem.java48
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/PolicyEnumerationListImpl.java57
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/PolicyRelationshipImpl.java55
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/ServicePolicyActivator.java77
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/ServicePolicyPlatform.java290
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/listeners/IPolicyChildChangeListener.java31
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/listeners/IPolicyPlatformLoadListener.java21
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/listeners/IPolicyPlatformProjectLoadListener.java22
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/listeners/IPolicyStateChangeListener.java22
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/listeners/IStatusChangeListener.java23
-rw-r--r--bundles/org.eclipse.wst.ws.service.policy/src/org/eclipse/wst/ws/service/policy/utils/RegistryUtils.java104
-rw-r--r--bundles/org.eclipse.wst.ws.ui/.classpath7
-rw-r--r--bundles/org.eclipse.wst.ws.ui/.cvsignore7
-rw-r--r--bundles/org.eclipse.wst.ws.ui/.project28
-rw-r--r--bundles/org.eclipse.wst.ws.ui/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.wst.ws.ui/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF25
-rw-r--r--bundles/org.eclipse.wst.ws.ui/about.html34
-rw-r--r--bundles/org.eclipse.wst.ws.ui/build.properties7
-rw-r--r--bundles/org.eclipse.wst.ws.ui/plugin.properties28
-rw-r--r--bundles/org.eclipse.wst.ws.ui/plugin.xml41
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/WstWSUIPlugin.properties68
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/WstWSUIPluginMessages.java61
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/command/OpenEditorCommand.java122
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java72
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/preferences/WebServicesPreferencePage.java74
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/utils/AdapterUtils.java81
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java225
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsrt/IObjectSelector.java28
-rw-r--r--bundles/org.eclipse.wst.ws/.classpath7
-rw-r--r--bundles/org.eclipse.wst.ws/.cvsignore7
-rw-r--r--bundles/org.eclipse.wst.ws/.project28
-rw-r--r--bundles/org.eclipse.wst.ws/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.wst.ws/.settings/org.eclipse.pde.prefs12
-rw-r--r--bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF56
-rw-r--r--bundles/org.eclipse.wst.ws/RT.genmodel117
-rw-r--r--bundles/org.eclipse.wst.ws/RT.xsd2ecore120
-rw-r--r--bundles/org.eclipse.wst.ws/about.html34
-rw-r--r--bundles/org.eclipse.wst.ws/build.properties20
-rw-r--r--bundles/org.eclipse.wst.ws/component.xml12
-rw-r--r--bundles/org.eclipse.wst.ws/icons/full/obj16/wsicat.gifbin376 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws/icons/full/obj16/wsicat_child.gifbin321 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.ws/jmerger/merge.xml26
-rw-r--r--bundles/org.eclipse.wst.ws/model/Index.xsd52
-rw-r--r--bundles/org.eclipse.wst.ws/model/Registry.xsd43
-rw-r--r--bundles/org.eclipse.wst.ws/model/Taxonomy.xsd46
-rw-r--r--bundles/org.eclipse.wst.ws/model/UDDIRegistry.xsd48
-rw-r--r--bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.registry.ecore141
-rw-r--r--bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.rtindex.ecore140
-rw-r--r--bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.taxonomy.ecore167
-rw-r--r--bundles/org.eclipse.wst.ws/org.eclipse.wst.ws.internal.model.v10.uddiregistry.ecore133
-rw-r--r--bundles/org.eclipse.wst.ws/plugin.properties47
-rw-r--r--bundles/org.eclipse.wst.ws/plugin.xml101
-rw-r--r--bundles/org.eclipse.wst.ws/schema/webServiceLocator.exsd197
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/WstWSPlugin.properties54
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/WstWSPluginMessages.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/BundleUtils.java71
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/HTTPUtility.java70
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/LiveWSDLFilter.java102
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/WSDLUtility.java172
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/data/LabelsAndIds.java48
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.java63
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java344
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java149
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java70
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java100
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java57
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java265
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.java62
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.java56
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java135
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java70
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java66
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java81
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.java64
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.java86
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java110
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java122
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExecutable.java29
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtension.java46
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionImpl.java100
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistry.java42
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistryImpl.java115
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java86
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java86
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.java53
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java53
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java54
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java54
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java53
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java53
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java61
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java62
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java61
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java62
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Description.java81
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/DocumentRoot.java165
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Name.java81
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/Registry.java144
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/RegistryFactory.java73
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/RegistryPackage.java570
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/DescriptionImpl.java216
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/DocumentRootImpl.java367
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/NameImpl.java216
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryFactoryImpl.java108
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryImpl.java368
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/impl/RegistryPackageImpl.java586
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryAdapterFactory.java171
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryResourceFactoryImpl.java63
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistryResourceImpl.java32
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/registry/util/RegistrySwitch.java193
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Description.java81
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/DocumentRoot.java165
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Index.java97
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/Name.java81
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/RTIndexFactory.java73
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/RTIndexPackage.java550
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/DescriptionImpl.java216
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/DocumentRootImpl.java367
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/IndexImpl.java267
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/NameImpl.java216
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/RTIndexFactoryImpl.java108
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/impl/RTIndexPackageImpl.java573
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexAdapterFactory.java171
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexResourceFactoryImpl.java63
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexResourceImpl.java32
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/rtindex/util/RTIndexSwitch.java193
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Category.java117
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/DocumentRoot.java165
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Name.java81
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/Taxonomy.java198
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/TaxonomyFactory.java73
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/TaxonomyPackage.java650
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/CategoryImpl.java313
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/DocumentRootImpl.java367
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/NameImpl.java216
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyFactoryImpl.java108
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyImpl.java476
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/impl/TaxonomyPackageImpl.java658
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyAdapterFactory.java171
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyResourceFactoryImpl.java63
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomyResourceImpl.java32
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/taxonomy/util/TaxonomySwitch.java193
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/DocumentRoot.java138
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/Taxonomies.java46
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistry.java243
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistryFactory.java64
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/UDDIRegistryPackage.java568
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/DocumentRootImpl.java326
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/TaxonomiesImpl.java155
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryFactoryImpl.java97
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryImpl.java631
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/impl/UDDIRegistryPackageImpl.java542
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryAdapterFactory.java173
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryResourceFactoryImpl.java63
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistryResourceImpl.java32
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/model/v10/uddiregistry/util/UDDIRegistrySwitch.java190
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java179
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/plugin/WSPlugin.java160
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/MergeDefaults.java29
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/MigrateWSIpreferencesLoadListener.java175
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentMergeContext.java61
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSDLValidationContext.java77
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSIAPContext.java53
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSIContext.java186
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSISSBPContext.java40
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWaitForWSDLValidationContext.java55
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/WSDLFilePropertyTester.java73
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/WSIComplianceUtils.java84
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/WSIServicePoliciesConstants.java31
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/GenericResourceFactory.java57
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/IRegistryManager.java273
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/ITaxonomyFinder.java35
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/RegistryManager.java531
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/RegistryService.java467
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/UDDIRegistryService.java230
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/registry/UDDITaxonomyFinder.java39
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/util/UniversalPathTransformer.java187
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/util/WSDLCopier.java587
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/AbstractWebServiceLocator.java97
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/IWebServiceLocator.java77
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceCategory.java114
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceFinder.java393
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorExtension.java33
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorRegistry.java78
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java149
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java518
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebService.java49
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceClient.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceRuntime.java29
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceRuntimeChecker.java37
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IContext.java40
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IMerger.java46
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/ISelection.java18
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebService.java29
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceClient.java28
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServicePublisher.java20
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceRuntime.java28
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceRuntimeChecker.java56
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceTester.java18
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/Merger.java35
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java129
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/TestInfo.java277
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceClientInfo.java95
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceInfo.java145
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceScenario.java83
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceState.java91
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/.classpath19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/.cvsignore8
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/.project28
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/.settings/org.eclipse.jdt.core.prefs59
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF91
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/about.html34
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/build.properties23
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/dlcl16/showproperties_obj.gifbin577 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/dtool16/capturescreen.gifbin384 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/elcl16/showproperties_obj.gifbin577 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/etool16/capturescreen.gifbin613 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/etool16/zoomminus.gifbin559 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/etool16/zoomplus.gifbin559 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/reloadgrammar.gifbin367 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/validate.gifbin558 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/icons/wsdl_file_obj.gifbin572 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/plugin.properties37
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/plugin.xml538
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/schema/adapterFactory.exsd121
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/schema/contentGeneratorUI.exsd151
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/schema/extensibilityElementFilter.exsd115
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/schema/extensibilityItemTreeProviders.exsd115
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/schema/internalEditorExtensions.exsd107
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/schema/propertyDescriptorProvider.exsd115
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/DefaultEditorMode.java47
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/IDesignViewerActionBarContributor.java18
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/ISelectionMapper.java17
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/InternalWSDLMultiPageEditor.java577
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/Messages.java164
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/ReloadDependenciesActionDelegate.java41
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/SourceEditorActionBarContributor.java207
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/SourcePageActionContributor.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java24
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLActionBarContributor.java246
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java588
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java317
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLPreferencePage.java94
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionMapper.java39
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java330
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java54
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java78
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java202
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java39
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java125
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/IWSDLToolbarAction.java18
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/OpenInNewEditor.java64
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/OpenWSDLEditorUtil.java108
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java142
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java655
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/WSDLAdapterFactory.java190
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/WSDLBaseAdapter.java217
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/actions/W11AddPartAction.java109
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/actions/W11OpenImportAction.java60
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/actions/W11SetExistingElementAction.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/actions/W11SetExistingMessageAction.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/actions/W11SetExistingTypeAction.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/actions/W11SetNewElementAction.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/actions/W11SetNewMessageAction.java59
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/actions/W11SetNewTypeAction.java82
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11Binding.java297
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11BindingMessageReference.java135
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11BindingOperation.java106
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11CategoryAdapter.java144
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11Description.java354
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11EndPoint.java277
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11Import.java76
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11Interface.java85
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11Message.java105
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11MessageReference.java482
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11Operation.java202
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11ParameterForAttribute.java128
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11ParameterForElement.java145
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11ParameterForPart.java252
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11Service.java105
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11Type.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/basic/W11TypesCategoryAdapter.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddBindingCommand.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddEndPointCommand.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddFaultParameterCommand.java67
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddImportCommand.java45
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddInputParameterCommand.java70
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddInterfaceCommand.java66
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddMessageCommand.java57
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddOperationCommand.java117
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddOutputParameterCommand.java80
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddPartCommand.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddSchemaCommand.java69
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11AddServiceCommand.java126
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11DeleteCommand.java124
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11DeleteParameterCommand.java113
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11EditNamespacesCommand.java178
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11GenerateBindingCommand.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11RenameCommand.java256
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11ReorderMessageReferencesCommand.java122
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11ReorderParametersCommand.java171
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11SetAddressCommand.java205
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11SetBindingCommand.java88
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11SetElementCommand.java116
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11SetInterfaceCommand.java36
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11SetTypeCommand.java128
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/commands/W11TopLevelElementCommand.java186
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/specialized/W11AddressExtensibilityElementAdapter.java47
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/specialized/W11ExtensibilityElementAdapter.java18
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/visitor/W11FindInnerElementVisitor.java48
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/visitor/W11XSDVisitor.java212
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/adapters/visitor/W11XSDVisitorForFields.java109
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddBaseParameterCommand.java558
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java47
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddExtensionElementCommand.java79
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java79
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultParameterCommand.java167
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java83
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddInputParameterCommand.java280
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java109
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java71
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java145
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java82
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputParameterCommand.java90
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java209
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java49
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java75
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java72
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java80
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java147
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java84
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java162
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/AddressPortOptionsPage.java87
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/BaseContentGeneratorOptionsPage.java82
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java103
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ISoapStyleInfo.java15
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java215
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/dialogs/EditNamespacesDialog.java126
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java99
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/dialogs/NewComponentDialog.java189
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/dialogs/ProtocolComponentControl.java334
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/dialogs/W11BrowseComponentDialog.java137
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/dialogs/W11NewComponentDialog.java135
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/W11BindingReferenceEditManager.java115
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/W11InterfaceReferenceEditManager.java112
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/W11MessageReferenceEditManager.java128
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/WSDLBaseSearchListProvider.java110
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/WSDLBindingSearchListProvider.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/WSDLComponentDescriptionProvider.java178
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/WSDLComponentFinder.java89
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/WSDLInterfaceSearchListProvider.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/WSDLMessageSearchListProvider.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/WSDLXSDElementReferenceEditManager.java99
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/edit/WSDLXSDTypeReferenceEditManager.java111
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/ExtensibilityItemTreeProviderRegistry.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/ExtensibleTypeSystemProvider.java85
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/INodeAssociationProvider.java20
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/INodeReconciler.java21
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/ITreeChildProvider.java23
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/ITypeSystemProvider.java30
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/NSKeyedExtensionRegistry.java142
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/WSDLEditorConfiguration.java193
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/WSDLEditorExtension.java36
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/WSDLEditorExtensionProperties.java69
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/extensions/WSDLNodeAssociationProvider.java80
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java18
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java61
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java31
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/back.gifbin873 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/bind_asct_val_not_obj.gifbin222 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/bind_asct_val_obj.gifbin128 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/binding_obj.gifbin610 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/bindingheader_obj.gifbin576 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/browsebutton.gifbin53 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/complextype_obj.gifbin155 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/delete_obj.gifbin351 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/element_obj.gifbin351 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/error_co.gifbin82 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/fault_obj.gifbin360 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/file_obj.gifbin349 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/fldr_el.gifbin366 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/forward.gifbin874 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/hidebinding.gifbin315 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/httpaddress_obj.gifbin556 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/httpbinding_obj.gifbin376 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/httpoperation_obj.gifbin598 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/httpurlencoded_obj.gifbin596 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/httpurlreplacement_obj.gifbin232 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/import_obj.gifbin114 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/importheader_obj.gifbin336 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/input_obj.gifbin338 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/message_obj.gifbin577 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/messageheader_obj.gifbin581 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/namespace_obj.gifbin207 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/namespacedecl_obj.gifbin211 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/new_wsdl_wiz.pngbin5955 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/operation_obj.gifbin150 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/operationbinding_obj.gifbin615 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/output_no.gifbin148 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/output_obj.gifbin347 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/output_yes.gifbin343 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/page_banner.gifbin5600 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/part_obj.gifbin200 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/port_obj.gifbin220 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/porttype_obj.gifbin576 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/porttypeheader_obj.gifbin603 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/prtcmplxpltyp_obj.gifbin351 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/prtelemt_obj.gifbin599 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/prtsmpltyp_obj.gifbin350 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/quickassist.gifbin225 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/service_obj.gifbin542 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/serviceheader_obj.gifbin580 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/simpletype_obj.gifbin150 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/soap_obj.gifbin589 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/soapaddress_obj.gifbin577 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/soapatt_obj.gifbin583 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/soapbinding_obj.gifbin637 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/soapbody_obj.gifbin585 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/soapfault_obj.gifbin605 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/soapheader_obj.gifbin587 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/soapheaderfault_obj.gifbin598 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/soapoperation_obj.gifbin598 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/types_obj.gifbin592 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/validate.gifbin558 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/wsdl_file_obj.gifbin572 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/xsd_file_obj.gifbin574 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/icons/xsd_obj.gifbin574 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/label/providers/HTTPLabelProvider.java52
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/label/providers/SOAPLabelProvider.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/messages.properties123
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/EditorModeSectionFilter.java16
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11ExtensionsSection.java265
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11MessageReferenceSection.java234
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11MessageReferenceSectionFilter.java28
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11ParameterSection.java219
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/properties/sections/W11ParameterSectionFilter.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/reconciler/DelegatingSourceValidatorForWSDL.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/text/WSDLHyperlink.java117
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/text/WSDLHyperlinkDetector.java105
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelAdapter.java191
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelLocatorAdapterFactory.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelQueryExtension.java237
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/text/WSDLModelReconcileAdapter.java154
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/ComponentReferenceUtil.java959
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/CreateWSDLElementHelper.java368
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/NameUtil.java581
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/NodeAssociationManager.java146
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/OpenOnSelectionHelper.java404
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/ReferenceEditManagerHelper.java123
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/ServicePolicyHelper.java178
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/ValidateHelper.java405
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/W11OpenExternalEditorHelper.java219
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/WSDLAdapterFactoryHelper.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/WSDLEditorUtil.java273
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/WSDLResourceUtil.java145
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/WSDLSetComponentHelper.java244
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/XSDComponentHelper.java282
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/util/XSDTypeSystemProvider.java212
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/visitor/BaseRenamer.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/visitor/BindingRenamer.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/visitor/MessageRenamer.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/visitor/PortTypeRenamer.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitor.java197
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/visitor/WSDLVisitorForParameters.java97
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/wizards/BindingWizard.java295
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/wizards/ContentGeneratorOptionsPage.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/wizards/HttpBindingOptionsPage.java143
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/wizards/NamespaceTable.java702
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/wizards/NewWSDLWizard.java421
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/wizards/PortWizard.java154
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/wizards/SoapBindingOptionsPage.java189
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFileOptionsPage.java776
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/wizards/WSDLNewFilePage.java133
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/xsd/XSDNodeAssociationProvider.java77
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/ASDEditorCSHelpIds.java191
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/ASDEditorPlugin.java68
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/ASDLabelProvider.java115
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/ASDMultiPageEditor.java331
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/ASDSelectionManager.java100
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/Messages.java80
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddBindingAction.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddEndPointAction.java55
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddFaultAction.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddImportAction.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddInputAction.java59
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddInterfaceAction.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddMessageAction.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddOperationAction.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddOutputAction.java59
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddParameterAction.java57
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddSchemaAction.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDAddServiceAction.java59
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDCaptureScreenAction.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDDeleteAction.java57
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDDirectEditAction.java84
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDDragAction.java50
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDDragReorderAction.java284
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDEditNamespacesAction.java74
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDGenerateBindingAction.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDOpenSchemaAction.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDSetExistingBindingAction.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDSetExistingInterfaceAction.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDSetNewBindingAction.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ASDSetNewInterfaceAction.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/BaseSelectionAction.java157
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/IASDAddCommand.java15
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/actions/ShowPropertiesViewAction.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/adapterfactory/extension/AdapterFactoryExtension.java49
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/adapterfactory/extension/AdapterFactoryExtensionRegistry.java48
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/contentgenerator/ui/extension/ContentGeneratorUIExtension.java84
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/contentgenerator/ui/extension/ContentGeneratorUIExtensionRegistry.java81
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/DesignViewContextMenuProvider.java170
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/DesignViewGraphicalViewer.java159
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/DesignViewGraphicsConstants.java49
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/KeyboardDragImpl.java78
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/connections/CenteredConnectionAnchor.java88
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/connections/TopLeftConnectionAnchor.java35
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ASDCCombo.java1511
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ASDComboBoxCellEditor.java302
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/ComboBoxCellEditorManager.java204
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/DirectEditSelectionTool.java60
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/LabelCellEditorLocator.java70
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/LabelEditManager.java140
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/directedit/TypeReferenceDirectEditManager.java178
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/ASDEditPartFactory.java97
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/ASDRootEditPart.java32
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/AbstractBoxtEditPart.java125
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/BaseEditPart.java198
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/BindingColumnEditPart.java64
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/BindingContentEditPart.java94
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/BindingEditPart.java307
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/ColumnEditPart.java67
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/DefinitionsEditPart.java160
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/EditPartNavigationHandlerUtil.java199
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/EndPointEditPart.java385
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/IFeedbackHandler.java16
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/INamedEditPart.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/InterfaceEditPart.java169
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/MessageReferenceEditPart.java268
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/OperationEditPart.java157
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/ParameterEditPart.java232
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/ParameterTypeEditPart.java403
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/ServiceEditPart.java165
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/model/AbstractModelCollection.java86
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/model/BindingColumn.java76
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/model/BindingContentPlaceHolder.java23
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/model/IActionProvider.java16
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/model/InterfaceColumn.java64
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editparts/model/ServiceColumn.java81
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editpolicies/ASDDragAndDropCommand.java135
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editpolicies/ASDDragAndDropEditPolicy.java38
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editpolicies/ASDGraphNodeDragTracker.java30
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editpolicies/ASDLabelDirectEditPolicy.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/editpolicies/ASDSelectionEditPolicy.java89
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/figures/BaseLinkIconFigure.java216
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/figures/BoxComponentFigure.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/figures/ComponentReferenceConnection.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/figures/HeadingFigure.java81
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/figures/LinkIconFigure.java90
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/figures/ListFigure.java79
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/figures/ModelDiagnosticInfo.java71
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/layouts/BindingColumnLayout.java145
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/layouts/BindingContentLayout.java105
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/layouts/BindingLayout.java60
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/layouts/ColumnData.java83
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/design/layouts/RowLayout.java182
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IASDObject.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IASDObjectListener.java15
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IBinding.java28
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IBindingMessageReference.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IBindingOperation.java20
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IDescription.java38
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IEndPoint.java24
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IImport.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IInterface.java25
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IMessage.java23
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IMessageReference.java30
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/INamedObject.java20
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IOperation.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IParameter.java35
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IService.java21
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/facade/IType.java18
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/messages.properties50
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/outline/ASDContentOutlinePage.java98
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/outline/ASDContentOutlineProvider.java156
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/outline/ICategoryAdapter.java17
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/outline/ITreeElement.java23
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ASDAbstractSection.java438
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ASDTabbedPropertySheetPage.java48
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/BindingSection.java225
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/DocumentationSection.java154
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/EndPointSection.java286
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ImportSection.java323
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/NameSection.java243
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/NamespaceSection.java259
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ParameterSection.java261
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/properties/sections/ReferenceSection.java138
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/util/ASDEditPartFactoryHelper.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/util/EndPointComparator.java54
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-asd/org/eclipse/wst/wsdl/ui/internal/asd/util/IOpenExternalEditorHelper.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/WSDLComponentRenameParticipant.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/RenameComponentAction.java204
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLRefactorActionGroup.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLRefactorGroupActionDelegate.java66
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/WSDLSelectionDispatchAction.java39
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/IWSDLSearchConstants.java34
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/WSDLSearchContributor.java77
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/search/WSDLSearchParticipant.java130
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-search/org/eclipse/wst/wsdl/ui/internal/search/actions/WSDLFindReferencesAction.java162
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-search/org/eclipse/wst/wsdl/ui/internal/search/actions/WSDLFindReferencesInProjectAction.java45
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-search/org/eclipse/wst/wsdl/ui/internal/search/actions/WSDLFindReferencesInWorkingSetAction.java78
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-search/org/eclipse/wst/wsdl/ui/internal/search/actions/WSDLReferencesSearchGroup.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-search/org/eclipse/wst/wsdl/ui/internal/search/actions/WSDLSearchReferencesGroupActionDelegate.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-soap/org/eclipse/wst/wsdl/ui/internal/soap/customizations/Messages.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-soap/org/eclipse/wst/wsdl/ui/internal/soap/customizations/SOAPNodeEditorProvider.java96
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-soap/org/eclipse/wst/wsdl/ui/internal/soap/customizations/SOAPSelectPartsDialog.java142
-rw-r--r--bundles/org.eclipse.wst.wsdl.ui/src-soap/org/eclipse/wst/wsdl/ui/internal/soap/customizations/messages.properties12
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/.classpath17
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/.cvsignore10
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/.project28
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF32
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/about.html34
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/build.properties9
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/exsd/extvalidator.exsd127
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/exsd/wsdl11validator.exsd132
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/lib/.cvsignore1
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/plugin.properties23
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/plugin.xml70
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ClassloaderWSDLValidatorDelegate.java82
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/Constants.java50
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ControllerValidationInfo.java32
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/IValidationInfo.java81
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/IValidationMessage.java75
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/IValidationReport.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/IWSDLValidator.java31
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationController.java393
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationInfoImpl.java305
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidationMessageImpl.java193
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ValidatorRegistry.java144
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/WSDLValidationConfiguration.java59
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/WSDLValidator.java126
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/WSDLValidatorDelegate.java49
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/EclipseLogger.java53
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/EclipseWSDL11ValidatorDelegate.java60
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/EclipseWSDLValidatorDelegate.java72
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/InlineSchemaModelGrammarPoolImpl.java50
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/URIResolverWrapper.java91
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidateWSDLPlugin.java307
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/Validator.java157
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLDelegatingValidator.java31
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidator.java52
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/exception/ValidateWSDLException.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/logging/ILogger.java60
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/logging/LoggerFactory.java62
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/logging/StandardLogger.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/IExtensibleURIResolver.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/IURIResolutionResult.java47
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolutionResult.java61
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolver.java283
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverDelegate.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/AntLogger.java65
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/ExtensionValidator.java41
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/Property.java66
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/URIResolver.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidate.java489
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/XMLCatalogImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/text/Log4jLogger.java143
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidate.java333
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateTextUIMessages.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/ui/text/wsdlvalidatetextui.properties33
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/util/ErrorMessage.java216
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/util/LazyURLInputStream.java163
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/util/MessageGenerator.java93
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ClassloaderWSDL11ValidatorDelegate.java68
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11ValidationInfo.java129
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/IWSDL11Validator.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ImportHolder.java610
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/LocationHolder.java66
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ReaderError.java66
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/ValidatorRegistry.java133
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11BasicValidator.java680
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidationInfoImpl.java190
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorController.java347
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDL11ValidatorDelegate.java38
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLDocument.java2009
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/WSDLReaderImpl.java427
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/http/HTTPValidator.java335
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/mime/MIMEValidator.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/soap/SOAPValidator.java604
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/DOMError.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/FileEntityResolver.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGenerator.java681
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaValidator.java316
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineXSDResolver.java137
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/SchemaAttributeTable.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/ValidateErrorHandler.java88
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XMLEntityResolverChain.java81
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/XSDValidator.java300
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/AbstractXMLConformanceFactory.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLConformanceFactory.java36
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/DefaultXMLValidator.java473
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/ElementLocation.java53
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/IXMLCatalog.java40
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/IXMLValidator.java55
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/LineNumberDOMParser.java153
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalog.java364
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogEntityHolder.java52
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogResolver.java71
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLMessageInfoHelper.java132
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/validatewsdl.properties59
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/validatewsdlhttp.properties23
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/validatewsdlmime.properties11
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/validatewsdlsoap.properties45
-rw-r--r--bundles/org.eclipse.wst.wsdl.validation/src/validatewsdlui.properties25
-rw-r--r--bundles/org.eclipse.wst.wsdl/.classpath15
-rw-r--r--bundles/org.eclipse.wst.wsdl/.cvsignore9
-rw-r--r--bundles/org.eclipse.wst.wsdl/.project28
-rw-r--r--bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.core.prefs310
-rw-r--r--bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF36
-rw-r--r--bundles/org.eclipse.wst.wsdl/about.html34
-rw-r--r--bundles/org.eclipse.wst.wsdl/build.properties23
-rw-r--r--bundles/org.eclipse.wst.wsdl/component.xml77
-rw-r--r--bundles/org.eclipse.wst.wsdl/grabjars.xml34
-rw-r--r--bundles/org.eclipse.wst.wsdl/lib/.cvsignore1
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/HTTP.ecore27
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/HTTP.genmodel31
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/HTTP.mdl5471
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/MIME.ecore46
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/MIME.genmodel49
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/MIME.mdl5818
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/SOAP.ecore85
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/SOAP.genmodel77
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/SOAP.mdl6233
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/WSDL.ecore597
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/WSDL.genmodel384
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/WSDL.mdl3850
-rw-r--r--bundles/org.eclipse.wst.wsdl/model/org.eclipse.wst.WSDL.cat7295
-rw-r--r--bundles/org.eclipse.wst.wsdl/plugin.properties35
-rw-r--r--bundles/org.eclipse.wst.wsdl/plugin.xml158
-rw-r--r--bundles/org.eclipse.wst.wsdl/schema/contentGenerators.exsd128
-rw-r--r--bundles/org.eclipse.wst.wsdl/schema/extensibilityElementFactories.exsd115
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java61
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java61
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java89
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java61
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java753
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/generator/HTTPContentGenerator.java291
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java225
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java226
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java163
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java226
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java462
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java68
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java68
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java377
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java39
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java413
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java109
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java80
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java82
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java72
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java727
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java70
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java319
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java205
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java244
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java237
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java496
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java251
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java337
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java37
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java365
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java62
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java88
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java123
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java115
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java117
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java228
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java88
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java1721
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java428
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java225
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java284
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java569
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java255
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java420
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java681
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java67
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java233
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java285
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java898
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java477
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java66
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java543
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html21
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml18
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Binding.java139
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingFault.java114
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingInput.java114
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOperation.java164
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOutput.java115
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Definition.java302
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibilityElement.java94
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibleElement.java84
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Fault.java32
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Import.java172
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Input.java32
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Message.java113
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/MessageReference.java87
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Namespace.java94
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Operation.java211
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Output.java32
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Part.java205
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Port.java91
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/PortType.java113
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Service.java113
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Types.java61
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java53
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLElement.java152
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLFactory.java243
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java4590
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPlugin.java109
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPluginImplementation.java40
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java59
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java88
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BaseGenerator.java83
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java736
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/ContentGenerator.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/PortGenerator.java260
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionDescriptor.java65
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionFactoryRegistry.java193
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionRegistryReader.java93
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java373
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java638
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java369
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java802
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java369
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java2419
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java390
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java214
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java87
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java584
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java87
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java478
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java327
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java235
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java1086
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java87
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java761
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java386
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java505
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java477
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java237
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java274
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java1631
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java569
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java2641
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java385
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java54
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java227
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java139
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/Reconcilable.java28
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java1061
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java57
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java1201
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java157
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.html21
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml18
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java379
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnostic.java97
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnosticImpl.java352
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnosticSeverity.java171
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLParser.java693
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceFactoryRegistry.java149
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java542
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html22
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml19
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/.classpath11
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/.cvsignore7
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/.project28
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF39
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/about.html34
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/build.properties10
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/icons/full/obj16/validate.gifbin227 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsi.ui/icons/wsi_logfile_obj.gifbin205 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsi.ui/plugin.properties18
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/plugin.xml89
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Messages.java74
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Messages.properties61
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Resource.java21
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/ResourceFilter.java101
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIMessageValidator.java59
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIUIPlugin.java82
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/WSIValidator.java65
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/ValidateAction.java431
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidateAction.java295
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/WSIValidationUIMessages.java32
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/RequestHandlerImpl.java226
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSILogFileActionDelegate.java76
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/actionDelegates/ValidateWSIProfileActionDelegate.java240
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/icons/wsi_logfile_wiz.pngbin6138 -> 0 bytes-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/wsivalidation.properties17
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizard.java319
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardLogPage.java133
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLContentPage.java908
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/wizards/ValidationWizardWSDLPage.java373
-rw-r--r--bundles/org.eclipse.wst.wsi/.classpath18
-rw-r--r--bundles/org.eclipse.wst.wsi/.cvsignore7
-rw-r--r--bundles/org.eclipse.wst.wsi/.project28
-rw-r--r--bundles/org.eclipse.wst.wsi/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--bundles/org.eclipse.wst.wsi/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF58
-rw-r--r--bundles/org.eclipse.wst.wsi/about.html34
-rw-r--r--bundles/org.eclipse.wst.wsi/build.properties10
-rw-r--r--bundles/org.eclipse.wst.wsi/component.xml1
-rw-r--r--bundles/org.eclipse.wst.wsi/plugin.properties22
-rw-r--r--bundles/org.eclipse.wst.wsi/plugin.xml81
-rw-r--r--bundles/org.eclipse.wst.wsi/schema/reportArtifactTypes.exsd111
-rw-r--r--bundles/org.eclipse.wst.wsi/schema/tads.exsd129
-rw-r--r--bundles/org.eclipse.wst.wsi/schema/wsivalidator.exsd127
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSIPreferences.java74
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsEclipseProperties.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java208
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java127
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java313
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java384
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSIAnalyzerException.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/ToolEnvironment.java254
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/ToolInfo.java447
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIConstants.java483
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIException.java151
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIFileNotFoundException.java56
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSIRuntimeException.java55
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/WSITag.java114
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java314
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.properties45
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AnalyzerContext.java93
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionFailException.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionNotApplicableException.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionPassException.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AssertionResultException.java65
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/BasicProfileAnalyzer.java460
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/CandidateInfo.java922
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java83
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/ServiceReference.java109
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfig.java256
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java51
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultType.java160
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/AssertionResultsOption.java100
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java116
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java135
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java78
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java1060
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigReaderImpl.java559
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java200
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/UDDIReferenceImpl.java197
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java202
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java163
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/common/AddStyleSheet.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java220
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/DocumentElement.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/DocumentFactory.java182
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/DocumentReader.java34
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/WSIDocument.java34
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/impl/DocumentFactoryImpl.java166
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java133
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/Log.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogBuilder.java431
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogReader.java48
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/LogWriter.java46
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/MessageEntry.java217
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/MessageEntryHandler.java41
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/MimePart.java79
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/MimeParts.java60
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/RequestHandler.java132
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java219
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java857
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogWriterImpl.java51
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java374
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/MimePartImpl.java139
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/MimePartsImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/ChunkedData.java221
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/ConnectionListener.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java220
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java505
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/Monitor.properties38
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java140
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java306
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java963
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java50
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/ManInTheMiddle.java72
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java49
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/Redirect.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/CommentImpl.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/ManInTheMiddleImpl.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java561
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java479
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java299
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/EntryTypeList.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/Profile.java24
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java123
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java177
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/EntryTypeListImpl.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java123
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java193
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsReaderImpl.java586
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java256
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java224
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java61
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/LogValidator.java27
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java83
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java109
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java70
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java88
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcess.java66
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/AssertionProcessVisitor.java154
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java1910
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseValidatorImpl.java705
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/ProfileValidatorFactoryImpl.java102
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java119
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1928.java426
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1005.java167
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1007.java64
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1008.java277
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1009.java313
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1011.java203
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1012.java102
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1013.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1031.java108
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1032.java152
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1033.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1100.java103
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1107.java277
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1201.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1202.java104
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1203.java147
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1204.java302
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1208.java88
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1211.java147
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1212.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1213.java141
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1214.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1301.java198
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1302.java181
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1305.java132
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1306.java114
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1307.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1308.java97
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1309.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1316.java113
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1318.java183
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1600.java269
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1601.java73
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1701.java110
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP1755.java167
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4100.java226
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4101.java132
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4102.java114
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/BP4109.java107
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/EnvelopeValidatorImpl.java76
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP1601.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/SSBP9704.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1003.java59
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1902.java124
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1915.java136
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1917.java153
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1925.java133
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1926.java210
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1931.java91
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1932.java80
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1933.java257
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1934.java103
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1935.java348
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1936.java72
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1942.java264
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1945.java73
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP1946.java64
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5100.java53
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/AP5101.java51
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1001.java101
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1002.java137
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1004.java73
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1006.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1010.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1101.java86
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1103.java80
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1104.java93
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP1116.java150
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4103.java126
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4104.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4105.java95
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4106.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/BP4107.java66
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/MessageValidatorImpl.java78
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP1003.java228
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5100.java80
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/SSBP5101.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1001.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1002.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1003.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1004.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1005.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1006.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1007.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1008.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1009.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1010.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1011.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1012.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1013.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1031.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1100.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1101.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1102.java150
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1103.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1104.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1105.java110
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1107.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1108.java415
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1109.java103
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1110.java104
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1111.java111
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1116.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1121.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1201.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1202.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1203.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1204.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1208.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1211.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1301.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1302.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1305.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1306.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1307.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1308.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1309.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1311.java204
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1316.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1318.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1601.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI1701.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4100.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4101.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4102.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4103.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4104.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4105.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4106.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/message/WSI4107.java28
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3001.java155
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3002.java81
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/BP3003.java78
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java542
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3001.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3002.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3003.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3004.java290
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3005_OBSOLETE.java119
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3006.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3007.java155
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/WSI3021.java115
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2901.java146
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2903.java241
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2904.java47
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2906.java216
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2907.java52
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2908.java296
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2909.java215
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2910.java230
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2911.java228
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2930.java136
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2940.java450
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2941.java367
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2944.java234
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/AP2946.java194
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2010.java119
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2011.java349
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2012.java123
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2013.java91
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2014.java286
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2017.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java127
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2019.java122
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2020.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2021.java112
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2022.java82
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2023.java85
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2032.java86
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2034.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2098.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2101.java106
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java210
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2103.java130
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2104.java100
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2105.java232
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2107.java200
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2108.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2110.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2111.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2112.java203
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2113.java159
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2114.java278
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2115.java97
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2116.java88
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2117.java183
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2118.java98
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2119.java165
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2120.java247
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2121.java174
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2122.java95
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2123.java357
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2201.java189
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2202.java428
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2208.java72
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2402.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2404.java76
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2406.java166
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2416.java209
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2417.java160
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2700.java81
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2701.java89
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2703.java49
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2803.java87
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4200.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4201.java144
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP4202.java131
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2209.java29
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2402.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/SSBP2403.java191
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSDLValidatorImpl.java2385
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2010.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2011.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2012.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2013.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2014.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2017.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2018.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2019.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2020.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2021.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2022.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2032.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2098.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2099.java157
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2100.java171
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2101.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2102.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2103.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2104.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2105.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2107.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2108.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2110.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2111.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2112.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2113.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2114.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2115.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2116.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2117.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2118.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2119.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2120.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2122.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2123.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2201.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2202.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2208.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2402.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2403.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2404.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2406.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2416.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2417.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2700.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2701.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI2703.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4200.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4201.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/WSI4202.java26
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/AssertionResult.java148
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/BuildReport.java125
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/Entry.java153
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/EntryContainer.java35
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/EntryResult.java42
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java94
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java43
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/Report.java105
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/ReportArtifact.java79
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/ReportContext.java116
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/ReportWriter.java40
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/Reporter.java21
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/WriteReport.java47
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java125
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/AssertionResultImpl.java236
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/DefaultReporter.java280
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryContainerImpl.java56
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryImpl.java276
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java56
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java151
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java76
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ReportArtifactImpl.java115
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ReportImpl.java514
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/report/impl/ReportWriterImpl.java63
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/toolinfo.properties18
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/ArtifactType.java214
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/BasicRules.java477
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/EntryType.java296
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/ErrorList.java156
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/HTTPConstants.java600
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/HTTPUtils.java182
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/HttpHeadersValidator.java1721
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/JavaEncoding.properties31
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/MIMEConstants.java24
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/MIMEUtils.java138
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/MessageList.java164
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/NullUtil.java40
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java788
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/Pair.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/SetCookie2Validator.java629
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/StringTokenizer.java212
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/TestUtils.java192
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java581
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/UDDIUtils.java543
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/Utils.java1446
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/WSDLUtil.java160
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java347
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/XMLInfo.java27
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/wsi.properties46
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLDocument.java323
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java99
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java801
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java411
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/VisitorAdaptor.java201
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java3290
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java1126
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java233
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/FileEntityResolver.java50
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaGenerator.java590
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineSchemaValidator.java241
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/InlineXSDResolver.java110
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/LazyURLInputStream.java162
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/SchemaAttributeTable.java105
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/ValidateErrorHandler.java62
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalog.java90
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogImpl.java45
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLCatalogResolver.java67
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XMLEntityResolverChain.java74
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/wsdl/xsd/XSDValidator.java190
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLConvertor.java69
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCache.java77
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java117
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLTags.java60
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLTraversal.java129
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java1536
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java186
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java93
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java91
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java100
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java248
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java142
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java170
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java152
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/document/DocumentFactoryImpl.java64
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/report/AssertionError.java131
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/report/NullReportImpl.java54
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/report/ReportNoWriterImpl.java84
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/report/SimpleReporter.java48
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java389
-rw-r--r--bundles/org.eclipse.wst.wsi/src/wsivalidate.properties16
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/.cvsignore1
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/.project22
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/about.html34
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/axisconsumptionui-f1Contexts.xml99
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/axiscreationui-f1Contexts.xml65
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/build.properties8
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/plugin.properties3
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/plugin.xml19
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/.cvsignore4
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/.project22
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/DocBuild.xml60
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/META-INF/MANIFEST.MF7
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/about.html34
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/build.properties27
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/index/_2.cfsbin8772 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/index/deletablebin6 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/index/indexed_contributions3
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/index/indexed_dependencies4
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/index/indexed_docs4
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/index/segmentsbin20 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/myplugin.xml26
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/org.eclipse.jst.ws.axis.ui.doc.user.maplist8
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/org.eclipse.jst.ws.axis.ui.doc.userindex.xml48
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/plugin.properties15
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/plugin.xml26
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/topics/caxistover.dita40
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/topics/caxistover.html78
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/topics/tsampappa.dita132
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/topics/tsampappa.html189
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/topics/tsklwsdla.dita124
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/topics/tsklwsdla.html223
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/topics/ttomcatserv.dita62
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/topics/ttomcatserv.html107
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/topics/twsbeana.dita172
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/topics/twsbeana.html238
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/wsaxis_reltable_toc.ditamap28
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/wsaxis_reltable_toc.xml5
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/wsaxisbuild_toc.ditamap17
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/wsaxisbuild_toc.xml5
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/.cvsignore1
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/.project22
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/META-INF/MANIFEST.MF7
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/about.html34
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/build.properties8
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/plugin.properties3
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/plugin.xml20
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/wsconsumptionui-f1Contexts.xml414
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/wscreationui-f1Contexts.xml92
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/.cvsignore5
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/.project22
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/DocBuild.xml59
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/about.html34
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/build.properties20
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cuddi.dita92
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cuddi.html120
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cwsdlud.dita111
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cwsdlud.html156
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/addfav.gifbin237 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/adduddi.gifbin230 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/beaninfojsp.gifbin7147 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/bindnode.gifbin364 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/browsebutton.gifbin213 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/busasst.gifbin139 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/fav.gifbin265 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/find.gifbin153 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/fswsdlicon.gifbin213 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/login.gifbin179 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/loginicon.gifbin346 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/logouticon.gifbin1096 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/mptwsdlicon.gifbin891 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/newjsp.gifbin22101 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/opnode.gifbin221 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/proxyonjsp.gifbin7318 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/publish2.gifbin163 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/pubserv.gifbin240 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/refserv.gifbin273 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/runjsf.gifbin7736 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/scenario7.gifbin7006 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/servnode.gifbin571 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/soapudws.cdrbin47164 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddi.cdrbin39990 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddi.gifbin5498 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiref.cdrbin42332 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiref.gifbin9793 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/uddiview.gifbin159 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlbnddetl.gifbin22014 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdldetail.gifbin15345 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdldtlicon.gifbin914 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlexp.gifbin11235 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlfavicon.gifbin136 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlicon.gifbin597 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlnode.gifbin548 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlop.gifbin18275 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopret.gifbin16767 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopretx.gifbin18157 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlpage.gifbin14584 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlservdet.gifbin17660 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlstatx.gifbin31686 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdltemp.gifbin16096 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdluddi.cdrbin45554 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdluddi.gifbin16346 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsilpage.gifbin26640 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsilview.gifbin367 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsinjsp.gifbin8636 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wswizicon.gifbin573 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/index/_k.cfsbin49675 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/index/deletablebin6 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/index/indexed_contributions3
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/index/indexed_dependencies4
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/index/indexed_docs21
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/index/segmentsbin20 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/myplugin.xml24
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/org.eclipse.jst.ws.consumption.ui.doc.user.maplist10
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/org.eclipse.jst.ws.consumption.ui.doc.userindex.html179
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/org.eclipse.jst.ws.consumption.ui.doc.userindex.xml160
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.properties15
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.xml24
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/ref/ruddi.dita77
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/ref/ruddi.html112
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/taddreg.dita78
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/taddreg.html115
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tassert.dita61
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tassert.html99
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbkmrk.dita59
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbkmrk.html96
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbusproj.dita54
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbusproj.html90
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tdiscov.dita177
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tdiscov.html275
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tgenwsil.dita72
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tgenwsil.html115
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tlogexp.dita55
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tlogexp.html93
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpubent.dita102
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpubent.html160
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpublish.dita107
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpublish.html166
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/treg.dita54
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/treg.html88
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tstrtexp.dita119
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tstrtexp.html186
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.dita103
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html137
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.dita130
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.html189
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tunpub.dita63
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tunpub.html102
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tupdate.dita57
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tupdate.html98
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.dita142
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html200
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptionbuild_toc.ditamap41
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptionbuild_toc.xml27
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptiont_toc.ditamap30
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptiont_toc.xml21
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/.cvsignore5
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/.project22
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/DocBuild.xml60
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/META-INF/MANIFEST.MF7
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/about.html34
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/build.properties19
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cjaxrpc.dita66
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cjaxrpc.html89
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cjsr109.dita41
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cjsr109.html69
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/csoap.dita108
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/csoap.html159
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cws.dita93
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cws.html149
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsbtmup.dita38
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsbtmup.html68
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsdl.dita73
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsdl.html113
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsil.dita84
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsil.html131
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsilud.dita72
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsilud.html109
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.dita48
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html80
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsiover.dita41
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsiover.html74
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsstandards.dita222
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsstandards.html341
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwstopdown.dita39
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwstopdown.html70
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/images/roles.gifbin4283 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.doc.user/images/soapudws.gifbin17234 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.doc.user/index/_w.cfsbin85979 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.doc.user/index/deletablebin6 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.doc.user/index/indexed_contributions3
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/index/indexed_dependencies4
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/index/indexed_docs31
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/index/segmentsbin20 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.doc.user/myplugin.xml26
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/org.eclipse.jst.ws.doc.user.maplist8
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/org.eclipse.jst.ws.doc.userindex.html164
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/org.eclipse.jst.ws.doc.userindex.xml116
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/plugin.properties15
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/plugin.xml26
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/ref/rwsdl.dita55
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/ref/rwsdl.html97
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/ref/rwspref.dita156
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/ref/rwspref.html236
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/tasks/toverws.dita54
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/tasks/toverws.html87
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/tasks/twsicomply.dita67
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/tasks/twsicomply.html123
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/webservice_toc.ditamap73
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/webservice_toc.xml54
-rw-r--r--docs/org.eclipse.jst.ws.infopop/.cvsignore1
-rw-r--r--docs/org.eclipse.jst.ws.infopop/.project22
-rw-r--r--docs/org.eclipse.jst.ws.infopop/META-INF/MANIFEST.MF7
-rw-r--r--docs/org.eclipse.jst.ws.infopop/about.html34
-rw-r--r--docs/org.eclipse.jst.ws.infopop/build.properties6
-rw-r--r--docs/org.eclipse.jst.ws.infopop/plugin.properties3
-rw-r--r--docs/org.eclipse.jst.ws.infopop/plugin.xml18
-rw-r--r--docs/org.eclipse.jst.ws.infopop/webserviceui-f1Contexts.xml111
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/.cvsignore3
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/.project22
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/DocBuild.xml59
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/about.html34
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/build.properties13
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/index/_6.cfsbin18389 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/index/deletablebin6 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/index/indexed_contributions3
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/index/indexed_dependencies4
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/index/indexed_docs8
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/index/segmentsbin20 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/myplugin.xml23
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/org.eclipse.wst.command.env.doc.user.maplist8
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/plugin.properties15
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/plugin.xml23
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/cwsaxisant.dita45
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/cwsaxisant.html90
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/rbuwsa.dita99
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/rbuwsa.html177
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/rtdwsa.dita100
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/rtdwsa.html178
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/rwsclienta.dita89
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/rwsclienta.html164
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/twbwsa.dita75
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/twbwsa.html141
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/twbwsclienta.dita66
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/topics/twbwsclienta.html126
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/wsaxisant_toc.ditamap19
-rw-r--r--docs/org.eclipse.wst.command.env.doc.user/wsaxisant_toc.xml15
-rw-r--r--docs/org.eclipse.wst.command.env.infopop/.cvsignore1
-rw-r--r--docs/org.eclipse.wst.command.env.infopop/.project22
-rw-r--r--docs/org.eclipse.wst.command.env.infopop/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.wst.command.env.infopop/about.html34
-rw-r--r--docs/org.eclipse.wst.command.env.infopop/build.properties7
-rw-r--r--docs/org.eclipse.wst.command.env.infopop/plugin.properties3
-rw-r--r--docs/org.eclipse.wst.command.env.infopop/plugin.xml18
-rw-r--r--docs/org.eclipse.wst.command.env.infopop/wst-command-f1.xml30
-rw-r--r--docs/org.eclipse.wst.ws.infopop/.cvsignore1
-rw-r--r--docs/org.eclipse.wst.ws.infopop/.project22
-rw-r--r--docs/org.eclipse.wst.ws.infopop/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.wst.ws.infopop/about.html34
-rw-r--r--docs/org.eclipse.wst.ws.infopop/build.properties7
-rw-r--r--docs/org.eclipse.wst.ws.infopop/plugin.properties13
-rw-r--r--docs/org.eclipse.wst.ws.infopop/plugin.xml18
-rw-r--r--docs/org.eclipse.wst.ws.infopop/webserviceui-f1Contexts.xml131
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/.cvsignore4
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/.project22
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/.settings/org.eclipse.pde.prefs13
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/DocBuild.xml61
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/META-INF/MANIFEST.MF9
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/about.html34
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/build.properties18
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.dita56
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.html94
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/images/httpskel.gifbin7112 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/images/show-hide-binding.gifbin143 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/images/soapskel.gifbin7881 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/images/wsdleditor.gifbin10559 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/index/_f.cfsbin33697 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/index/deletablebin6 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_contributions3
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_dependencies4
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/index/indexed_docs16
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/index/segmentsbin20 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/myplugin.xml32
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/org.eclipse.wst.wsdl.ui.doc.user.maplist10
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/org.eclipse.wst.wsdl.ui.doc.userindex.html88
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/org.eclipse.wst.wsdl.ui.doc.userindex.xml84
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.properties15
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.xml32
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.dita106
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.html167
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.dita57
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.html102
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.dita49
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.html84
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.dita65
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.html103
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.dita44
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.html76
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.dita51
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.html87
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.dita39
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.html67
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.dita95
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html144
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.dita100
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.html152
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.dita70
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.html109
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.dita113
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.html178
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.dita115
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.html179
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.ditamap8
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditorc_toc.xml7
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.ditamap34
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/wswsdleditort_toc.xml22
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/.cvsignore3
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/.project22
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/DocBuild.xml59
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/META-INF/MANIFEST.MF7
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/about.html34
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/build.properties15
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/images/traffic.gifbin27043 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/images/wsivalico.gifbin217 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/index/_3.cfsbin9285 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/index/deletablebin6 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_contributions3
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_dependencies4
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/index/indexed_docs5
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/index/segmentsbin20 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/myplugin.xml28
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/org.eclipse.wst.wsi.ui.doc.user.maplist8
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/org.eclipse.wst.wsi.ui.doc.userindex.html60
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/org.eclipse.wst.wsi.ui.doc.userindex.xml37
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/plugin.properties15
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/plugin.xml28
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.dita93
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html148
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.dita53
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html79
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.dita53
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html84
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.ditamap11
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.xml9
-rw-r--r--features/org.eclipse.wst.ws_core.feature/.cvsignore1
-rw-r--r--features/org.eclipse.wst.ws_core.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_core.feature/build.properties6
-rw-r--r--features/org.eclipse.wst.ws_core.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_core.feature/epl-v10.html328
-rw-r--r--features/org.eclipse.wst.ws_core.feature/feature.properties145
-rw-r--r--features/org.eclipse.wst.ws_core.feature/feature.xml156
-rw-r--r--features/org.eclipse.wst.ws_core.feature/license.html98
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/build.properties16
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/epl-v10.html328
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/feature.properties145
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/license.html82
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.html27
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.ini31
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.mappings6
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/about.properties26
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/build.properties2
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/plugin.properties12
-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/wtp_prod32.gifbin1752 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_core.feature/sourceTemplatePlugin/wtp_prod32.pngbin2672 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/.cvsignore4
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/build.properties7
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/epl-v10.html328
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/feature.properties145
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/feature.xml32
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/license.html98
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/.cvsignore2
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/build.properties5
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_tests.feature/epl-v10.html328
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/feature.properties145
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/feature.xml60
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/license.html98
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/.cvsignore1
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/build.properties5
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_ui.feature/epl-v10.html328
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/feature.properties145
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/feature.xml147
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/license.html98
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/build.properties19
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/epl-v10.html328
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/feature.properties145
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/license.html82
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.html27
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.ini31
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.mappings6
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/about.properties26
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/build.properties3
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/plugin.properties12
-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/wtp_prod32.gifbin1752 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_ui.feature/sourceTemplatePlugin/wtp_prod32.pngbin2672 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/.cvsignore3
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/build.properties5
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/epl-v10.html328
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/feature.properties145
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/feature.xml45
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/license.html98
-rw-r--r--features/org.eclipse.wst.ws_wsdl15.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_wsdl15.feature/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--features/org.eclipse.wst.ws_wsdl15.feature/build.properties5
-rw-r--r--features/org.eclipse.wst.ws_wsdl15.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_wsdl15.feature/epl-v10.html328
-rw-r--r--features/org.eclipse.wst.ws_wsdl15.feature/feature.properties145
-rw-r--r--features/org.eclipse.wst.ws_wsdl15.feature/feature.xml33
-rw-r--r--features/org.eclipse.wst.ws_wsdl15.feature/license.html98
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/.classpath7
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/.project28
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.jdt.core.prefs58
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF16
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/about.html34
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/build.properties8
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceProxy.java59
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceSOAPStub.java185
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_PortType.java22
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_Service.java26
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_ServiceLocator.java152
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/Dimensions.java156
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/Converter.java23
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterProxy.java65
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterService.java26
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterServiceLocator.java152
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterSoapBindingStub.java179
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties19
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/unittest/LocatorTests.java120
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Filter.java21
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/JavaFilter.java25
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/StdoutProgressMonitor.java47
-rw-r--r--tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java259
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.classpath7
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.cvsignore4
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.project28
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.jdt.core.prefs58
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF35
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/about.html34
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/build.properties19
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/plugin.properties19
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java166
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java162
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java154
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v55/WSWizardTomcat55Test.java58
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrBUJavaAxis2TC55.java168
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrClientAxis2TC55.java159
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis2/tomcat/v55/perfmsr/PerfmsrTDJavaAxis2TC55.java154
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java65
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java41
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java77
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java55
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/test.xml189
-rw-r--r--tests/org.eclipse.jst.ws.tests/.classpath7
-rw-r--r--tests/org.eclipse.jst.ws.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.jst.ws.tests/.project28
-rw-r--r--tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs58
-rw-r--r--tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF41
-rw-r--r--tests/org.eclipse.jst.ws.tests/about.html34
-rw-r--r--tests/org.eclipse.jst.ws.tests/build.properties22
-rw-r--r--tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp38
-rw-r--r--tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java9
-rw-r--r--tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl80
-rw-r--r--tests/org.eclipse.jst.ws.tests/data/WSPerfProjects.zipbin14258 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zipbin8297 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf6
-rw-r--r--tests/org.eclipse.jst.ws.tests/plugin.properties25
-rw-r--r--tests/org.eclipse.jst.ws.tests/plugin.xml62
-rw-r--r--tests/org.eclipse.jst.ws.tests/readme.txt5
-rw-r--r--tests/org.eclipse.jst.ws.tests/test.xml51
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java247
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java41
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java81
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java120
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java168
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ClientAxisTC50.java161
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java92
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java215
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java33
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java100
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java93
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java152
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java63
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WebServiceRuntimeTests.java529
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java72
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java410
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java45
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/WSCustomAdapterFactory.java115
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/.classpath7
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/.project28
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/META-INF/MANIFEST.MF18
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/build.properties10
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/plugin.properties19
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/plugin.xml224
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/MainTester.java401
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/MainUITester.java333
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/ServicePolicytTestActivator.java77
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/TestEnabledClass.java29
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/TestLaunchClass.java28
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action1.java27
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action2.java27
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/action3.java27
-rw-r--r--tests/org.eclipse.wst.ws.service.policy.test/src/org/eclipse/wst/ws/service/policy/test/internal/properties/FOOFilePropertyTester.java55
-rw-r--r--tests/org.eclipse.wst.ws.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.ws.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.ws.tests/.project28
-rw-r--r--tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.jdt.core.prefs57
-rw-r--r--tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.pde.prefs13
-rw-r--r--tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF34
-rw-r--r--tests/org.eclipse.wst.ws.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.ws.tests/build.properties21
-rw-r--r--tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl45
-rw-r--r--tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2/3/test.wsdl44
-rw-r--r--tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2a/start.wsdl23
-rw-r--r--tests/org.eclipse.wst.ws.tests/data/wsdlcopier/1/2a/test.xsd7
-rw-r--r--tests/org.eclipse.wst.ws.tests/data/wsdlcopier/test.xsd7
-rw-r--r--tests/org.eclipse.wst.ws.tests/icons/full/wizban/webservices_wiz.pngbin6390 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.ws.tests/plugin.properties19
-rw-r--r--tests/org.eclipse.wst.ws.tests/plugin.xml28
-rw-r--r--tests/org.eclipse.wst.ws.tests/readme.txt2
-rw-r--r--tests/org.eclipse.wst.ws.tests/test.xml52
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/test/popup/NewAction.java66
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java176
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java43
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java101
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java33
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/RegistryTests.java285
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/TestBundleUtils.java15
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSDLCopierTests.java333
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java29
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java52
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/BuildClasspath.java74
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/CopyPropertyFiles.java81
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindContextIds.java90
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindDuplicateKeys.java196
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindPercentString.java68
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/FindPropertyMovement.java116
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/GenPluginPropertiesFromPluginXml.java76
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/ListPropertyFiles.java39
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/RemoveBrackets.java80
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/RemoveUnusedKeys.java182
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/UpdateFeatureXMLFiles.java93
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/utils/Utils.java305
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.classpath14
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.project28
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/META-INF/MANIFEST.MF31
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/about.html34
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/build.properties18
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample0.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample1.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample10.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample100.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample101.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample102.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample103.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample104.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample105.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample106.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample107.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample108.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample109.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample11.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample110.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample111.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample112.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample113.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample114.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample115.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample116.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample117.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample118.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample119.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample12.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample120.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample121.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample122.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample123.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample124.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample125.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample126.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample127.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample128.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample129.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample13.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample130.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample131.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample132.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample133.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample134.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample135.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample136.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample137.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample138.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample139.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample14.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample140.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample141.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample142.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample143.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample144.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample145.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample146.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample147.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample148.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample149.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample15.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample150.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample151.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample152.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample153.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample154.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample155.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample156.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample157.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample158.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample159.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample16.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample160.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample161.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample162.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample163.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample164.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample165.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample166.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample167.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample168.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample169.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample17.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample170.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample171.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample172.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample173.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample174.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample175.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample176.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample177.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample178.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample179.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample18.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample180.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample181.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample182.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample183.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample184.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample185.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample186.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample187.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample188.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample189.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample19.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample190.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample191.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample192.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample193.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample194.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample195.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample196.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample197.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample198.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample199.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample2.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample20.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample200.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample201.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample202.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample203.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample204.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample205.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample206.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample207.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample208.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample209.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample21.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample210.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample211.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample212.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample213.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample214.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample215.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample216.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample217.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample218.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample219.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample22.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample220.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample221.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample222.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample223.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample224.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample225.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample226.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample227.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample228.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample229.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample23.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample230.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample231.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample232.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample233.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample234.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample235.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample236.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample237.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample238.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample239.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample24.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample240.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample241.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample242.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample243.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample244.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample245.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample246.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample247.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample248.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample249.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample25.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample250.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample251.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample252.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample253.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample254.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample255.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample256.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample257.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample258.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample259.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample26.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample260.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample261.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample262.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample263.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample264.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample265.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample266.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample267.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample268.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample269.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample27.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample270.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample271.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample272.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample273.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample274.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample275.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample276.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample277.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample278.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample279.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample28.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample280.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample281.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample282.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample283.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample284.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample285.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample286.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample287.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample288.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample289.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample29.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample290.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample291.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample292.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample293.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample294.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample295.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample296.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample297.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample298.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample299.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample3.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample30.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample300.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample301.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample302.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample303.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample304.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample305.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample306.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample307.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample308.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample309.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample31.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample310.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample311.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample312.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample313.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample314.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample315.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample316.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample317.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample318.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample319.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample32.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample320.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample321.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample322.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample323.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample324.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample325.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample326.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample327.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample328.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample329.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample33.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample330.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample331.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample332.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample333.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample334.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample335.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample336.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample337.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample338.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample339.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample34.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample340.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample341.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample342.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample343.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample344.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample345.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample346.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample347.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample348.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample349.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample35.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample350.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample351.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample352.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample353.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample354.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample355.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample356.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample357.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample358.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample359.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample36.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample360.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample361.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample362.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample363.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample364.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample365.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample366.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample367.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample368.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample369.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample37.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample370.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample371.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample372.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample373.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample374.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample375.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample376.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample377.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample378.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample379.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample38.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample380.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample381.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample382.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample383.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample384.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample385.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample386.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample387.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample388.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample389.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample39.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample390.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample391.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample392.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample393.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample394.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample395.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample396.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample397.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample398.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample399.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample4.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample40.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample400.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample401.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample402.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample403.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample404.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample405.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample406.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample407.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample408.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample409.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample41.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample410.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample411.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample412.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample413.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample414.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample415.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample416.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample417.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample418.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample419.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample42.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample420.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample421.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample422.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample423.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample424.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample425.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample426.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample427.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample428.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample429.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample43.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample430.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample431.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample432.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample433.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample434.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample435.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample436.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample437.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample438.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample439.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample44.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample440.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample441.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample442.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample443.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample444.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample445.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample446.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample447.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample448.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample449.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample45.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample450.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample451.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample452.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample453.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample454.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample455.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample456.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample457.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample458.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample459.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample46.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample460.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample461.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample462.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample463.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample464.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample465.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample466.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample467.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample468.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample469.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample47.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample470.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample471.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample472.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample473.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample474.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample475.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample476.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample477.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample478.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample479.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample48.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample480.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample481.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample482.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample483.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample484.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample485.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample486.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample487.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample488.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample489.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample49.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample490.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample491.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample492.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample493.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample494.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample495.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample496.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample497.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample498.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample499.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample5.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample50.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample500.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample501.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample502.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample503.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample504.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample505.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample506.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample507.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample508.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample509.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample51.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample510.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample511.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample512.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample513.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample514.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample515.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample516.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample517.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample518.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample519.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample52.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample520.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample521.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample522.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample523.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample524.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample525.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample526.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample527.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample528.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample529.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample53.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample530.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample531.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample532.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample533.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample534.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample535.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample536.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample537.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample538.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample539.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample54.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample540.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample541.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample542.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample543.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample544.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample545.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample546.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample547.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample548.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample549.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample55.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample550.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample551.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample552.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample553.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample554.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample555.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample556.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample557.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample558.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample559.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample56.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample560.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample561.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample562.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample563.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample564.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample565.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample566.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample567.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample568.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample569.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample57.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample570.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample571.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample572.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample573.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample574.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample575.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample576.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample577.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample578.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample579.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample58.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample580.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample581.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample582.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample583.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample584.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample585.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample586.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample587.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample588.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample589.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample59.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample590.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample591.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample592.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample593.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample594.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample595.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample596.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample597.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample598.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample599.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample6.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample60.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample600.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample601.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample602.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample603.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample604.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample605.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample606.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample607.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample608.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample609.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample61.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample610.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample611.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample612.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample613.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample614.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample615.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample616.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample617.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample618.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample619.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample62.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample620.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample621.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample622.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample623.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample624.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample625.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample626.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample627.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample628.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample629.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample63.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample630.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample631.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample632.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample633.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample634.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample635.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample636.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample637.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample638.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample639.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample64.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample640.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample641.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample642.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample643.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample644.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample645.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample646.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample647.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample648.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample649.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample65.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample650.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample651.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample652.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample653.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample654.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample655.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample656.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample657.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample658.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample659.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample66.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample660.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample661.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample662.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample663.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample664.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample665.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample666.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample667.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample668.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample669.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample67.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample670.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample671.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample672.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample673.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample674.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample675.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample676.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample677.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample678.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample679.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample68.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample680.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample681.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample682.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample683.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample684.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample685.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample686.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample687.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample688.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample689.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample69.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample690.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample691.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample692.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample693.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample694.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample695.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample696.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample697.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample698.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample699.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample7.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample70.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample700.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample701.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample702.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample703.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample704.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample705.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample706.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample707.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample708.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample709.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample71.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample710.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample711.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample712.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample713.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample714.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample715.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample716.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample717.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample718.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample719.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample72.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample720.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample721.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample722.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample723.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample724.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample725.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample726.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample727.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample728.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample729.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample73.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample730.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample731.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample732.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample733.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample734.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample735.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample736.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample737.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample738.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample739.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample74.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample740.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample741.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample742.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample743.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample744.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample745.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample746.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample747.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample748.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample749.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample75.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample750.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample751.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample752.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample753.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample754.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample755.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample756.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample757.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample758.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample759.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample76.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample760.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample761.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample762.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample763.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample764.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample765.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample766.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample767.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample768.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample769.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample77.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample770.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample771.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample772.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample773.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample774.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample775.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample776.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample777.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample778.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample779.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample78.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample780.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample781.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample782.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample783.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample784.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample785.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample786.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample787.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample788.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample789.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample79.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample790.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample791.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample792.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample793.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample794.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample795.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample796.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample797.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample798.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample799.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample8.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample80.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample800.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample801.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample802.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample803.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample804.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample805.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample806.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample807.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample808.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample809.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample81.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample810.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample811.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample812.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample813.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample814.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample815.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample816.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample817.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample818.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample819.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample82.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample820.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample821.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample822.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample823.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample824.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample825.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample826.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample827.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample828.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample829.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample83.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample830.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample831.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample832.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample833.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample834.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample835.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample836.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample837.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample838.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample839.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample84.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample840.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample841.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample842.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample843.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample844.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample845.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample846.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample847.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample848.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample849.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample85.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample850.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample851.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample852.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample853.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample854.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample855.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample856.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample857.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample858.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample859.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample86.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample860.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample861.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample862.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample863.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample864.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample865.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample866.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample867.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample868.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample869.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample87.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample870.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample871.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample872.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample873.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample874.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample875.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample876.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample877.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample878.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample879.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample88.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample880.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample881.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample882.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample883.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample884.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample885.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample886.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample887.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample888.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample889.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample89.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample890.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample891.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample892.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample893.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample894.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample895.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample896.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample897.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample898.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample899.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample9.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample90.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample900.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample901.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample902.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample903.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample904.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample905.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample906.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample907.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample908.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample909.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample91.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample910.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample911.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample912.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample913.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample914.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample915.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample916.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample917.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample918.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample919.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample92.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample920.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample921.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample922.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample923.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample924.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample925.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample926.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample927.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample928.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample929.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample93.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample930.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample931.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample932.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample933.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample934.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample935.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample936.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample937.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample938.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample939.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample94.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample940.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample941.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample942.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample943.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample944.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample945.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample946.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample947.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample948.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample949.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample95.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample950.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample951.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample952.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample953.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample954.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample955.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample956.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample957.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample958.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample959.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample96.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample960.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample961.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample962.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample963.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample964.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample965.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample966.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample967.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample968.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample969.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample97.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample970.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample971.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample972.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample973.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample974.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample975.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample976.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample977.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample978.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample979.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample98.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample980.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample981.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample982.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample983.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample984.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample985.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample986.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample987.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample988.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample989.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample99.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample990.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample991.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample992.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample993.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample994.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample995.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample996.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample997.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample998.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample999.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample0.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample1.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample10.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample100.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample101.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample102.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample103.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample104.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample105.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample106.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample107.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample108.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample109.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample11.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample110.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample111.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample112.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample113.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample114.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample115.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample116.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample117.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample118.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample119.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample12.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample120.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample121.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample122.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample123.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample124.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample125.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample126.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample127.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample128.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample129.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample13.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample130.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample131.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample132.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample133.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample134.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample135.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample136.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample137.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample138.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample139.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample14.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample140.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample141.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample142.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample143.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample144.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample145.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample146.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample147.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample148.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample149.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample15.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample150.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample151.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample152.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample153.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample154.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample155.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample156.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample157.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample158.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample159.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample16.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample160.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample161.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample162.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample163.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample164.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample165.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample166.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample167.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample168.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample169.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample17.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample170.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample171.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample172.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample173.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample174.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample175.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample176.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample177.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample178.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample179.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample18.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample180.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample181.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample182.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample183.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample184.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample185.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample186.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample187.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample188.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample189.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample19.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample190.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample191.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample192.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample193.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample194.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample195.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample196.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample197.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample198.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample199.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample2.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample20.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample200.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample201.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample202.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample203.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample204.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample205.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample206.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample207.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample208.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample209.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample21.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample210.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample211.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample212.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample213.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample214.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample215.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample216.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample217.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample218.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample219.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample22.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample220.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample221.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample222.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample223.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample224.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample225.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample226.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample227.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample228.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample229.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample23.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample230.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample231.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample232.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample233.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample234.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample235.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample236.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample237.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample238.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample239.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample24.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample240.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample241.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample242.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample243.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample244.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample245.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample246.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample247.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample248.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample249.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample25.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample250.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample251.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample252.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample253.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample254.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample255.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample256.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample257.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample258.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample259.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample26.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample260.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample261.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample262.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample263.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample264.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample265.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample266.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample267.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample268.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample269.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample27.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample270.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample271.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample272.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample273.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample274.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample275.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample276.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample277.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample278.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample279.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample28.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample280.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample281.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample282.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample283.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample284.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample285.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample286.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample287.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample288.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample289.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample29.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample290.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample291.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample292.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample293.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample294.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample295.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample296.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample297.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample298.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample299.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample3.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample30.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample300.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample301.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample302.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample303.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample304.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample305.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample306.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample307.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample308.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample309.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample31.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample310.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample311.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample312.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample313.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample314.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample315.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample316.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample317.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample318.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample319.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample32.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample320.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample321.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample322.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample323.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample324.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample325.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample326.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample327.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample328.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample329.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample33.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample330.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample331.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample332.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample333.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample334.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample335.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample336.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample337.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample338.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample339.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample34.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample340.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample341.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample342.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample343.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample344.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample345.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample346.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample347.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample348.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample349.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample35.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample350.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample351.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample352.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample353.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample354.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample355.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample356.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample357.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample358.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample359.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample36.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample360.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample361.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample362.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample363.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample364.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample365.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample366.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample367.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample368.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample369.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample37.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample370.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample371.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample372.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample373.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample374.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample375.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample376.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample377.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample378.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample379.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample38.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample380.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample381.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample382.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample383.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample384.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample385.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample386.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample387.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample388.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample389.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample39.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample390.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample391.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample392.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample393.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample394.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample395.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample396.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample397.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample398.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample399.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample4.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample40.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample400.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample401.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample402.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample403.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample404.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample405.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample406.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample407.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample408.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample409.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample41.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample410.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample411.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample412.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample413.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample414.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample415.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample416.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample417.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample418.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample419.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample42.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample420.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample421.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample422.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample423.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample424.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample425.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample426.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample427.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample428.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample429.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample43.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample430.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample431.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample432.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample433.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample434.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample435.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample436.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample437.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample438.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample439.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample44.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample440.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample441.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample442.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample443.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample444.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample445.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample446.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample447.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample448.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample449.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample45.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample450.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample451.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample452.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample453.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample454.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample455.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample456.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample457.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample458.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample459.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample46.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample460.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample461.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample462.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample463.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample464.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample465.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample466.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample467.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample468.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample469.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample47.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample470.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample471.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample472.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample473.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample474.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample475.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample476.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample477.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample478.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample479.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample48.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample480.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample481.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample482.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample483.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample484.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample485.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample486.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample487.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample488.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample489.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample49.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample490.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample491.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample492.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample493.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample494.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample495.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample496.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample497.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample498.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample499.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample5.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample50.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample500.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample501.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample502.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample503.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample504.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample505.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample506.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample507.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample508.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample509.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample51.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample510.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample511.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample512.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample513.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample514.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample515.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample516.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample517.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample518.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample519.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample52.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample520.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample521.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample522.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample523.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample524.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample525.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample526.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample527.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample528.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample529.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample53.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample530.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample531.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample532.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample533.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample534.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample535.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample536.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample537.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample538.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample539.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample54.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample540.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample541.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample542.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample543.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample544.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample545.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample546.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample547.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample548.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample549.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample55.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample550.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample551.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample552.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample553.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample554.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample555.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample556.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample557.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample558.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample559.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample56.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample560.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample561.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample562.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample563.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample564.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample565.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample566.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample567.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample568.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample569.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample57.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample570.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample571.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample572.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample573.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample574.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample575.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample576.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample577.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample578.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample579.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample58.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample580.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample581.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample582.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample583.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample584.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample585.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample586.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample587.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample588.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample589.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample59.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample590.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample591.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample592.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample593.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample594.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample595.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample596.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample597.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample598.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample599.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample6.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample60.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample600.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample601.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample602.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample603.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample604.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample605.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample606.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample607.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample608.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample609.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample61.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample610.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample611.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample612.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample613.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample614.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample615.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample616.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample617.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample618.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample619.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample62.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample620.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample621.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample622.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample623.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample624.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample625.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample626.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample627.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample628.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample629.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample63.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample630.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample631.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample632.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample633.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample634.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample635.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample636.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample637.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample638.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample639.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample64.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample640.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample641.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample642.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample643.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample644.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample645.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample646.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample647.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample648.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample649.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample65.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample650.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample651.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample652.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample653.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample654.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample655.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample656.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample657.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample658.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample659.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample66.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample660.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample661.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample662.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample663.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample664.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample665.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample666.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample667.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample668.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample669.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample67.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample670.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample671.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample672.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample673.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample674.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample675.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample676.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample677.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample678.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample679.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample68.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample680.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample681.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample682.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample683.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample684.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample685.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample686.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample687.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample688.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample689.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample69.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample690.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample691.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample692.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample693.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample694.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample695.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample696.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample697.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample698.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample699.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample7.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample70.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample700.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample701.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample702.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample703.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample704.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample705.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample706.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample707.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample708.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample709.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample71.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample710.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample711.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample712.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample713.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample714.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample715.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample716.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample717.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample718.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample719.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample72.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample720.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample721.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample722.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample723.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample724.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample725.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample726.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample727.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample728.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample729.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample73.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample730.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample731.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample732.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample733.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample734.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample735.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample736.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample737.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample738.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample739.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample74.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample740.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample741.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample742.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample743.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample744.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample745.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample746.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample747.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample748.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample749.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample75.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample750.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample751.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample752.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample753.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample754.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample755.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample756.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample757.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample758.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample759.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample76.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample760.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample761.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample762.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample763.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample764.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample765.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample766.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample767.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample768.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample769.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample77.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample770.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample771.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample772.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample773.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample774.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample775.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample776.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample777.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample778.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample779.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample78.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample780.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample781.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample782.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample783.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample784.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample785.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample786.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample787.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample788.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample789.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample79.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample790.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample791.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample792.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample793.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample794.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample795.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample796.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample797.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample798.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample799.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample8.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample80.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample800.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample801.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample802.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample803.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample804.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample805.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample806.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample807.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample808.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample809.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample81.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample810.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample811.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample812.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample813.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample814.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample815.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample816.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample817.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample818.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample819.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample82.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample820.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample821.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample822.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample823.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample824.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample825.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample826.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample827.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample828.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample829.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample83.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample830.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample831.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample832.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample833.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample834.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample835.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample836.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample837.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample838.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample839.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample84.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample840.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample841.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample842.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample843.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample844.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample845.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample846.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample847.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample848.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample849.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample85.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample850.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample851.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample852.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample853.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample854.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample855.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample856.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample857.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample858.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample859.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample86.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample860.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample861.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample862.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample863.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample864.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample865.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample866.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample867.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample868.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample869.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample87.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample870.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample871.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample872.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample873.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample874.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample875.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample876.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample877.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample878.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample879.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample88.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample880.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample881.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample882.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample883.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample884.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample885.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample886.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample887.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample888.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample889.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample89.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample890.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample891.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample892.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample893.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample894.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample895.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample896.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample897.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample898.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample899.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample9.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample90.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample900.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample901.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample902.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample903.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample904.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample905.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample906.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample907.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample908.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample909.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample91.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample910.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample911.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample912.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample913.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample914.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample915.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample916.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample917.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample918.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample919.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample92.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample920.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample921.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample922.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample923.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample924.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample925.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample926.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample927.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample928.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample929.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample93.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample930.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample931.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample932.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample933.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample934.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample935.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample936.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample937.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample938.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample939.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample94.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample940.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample941.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample942.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample943.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample944.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample945.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample946.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample947.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample948.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample949.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample95.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample950.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample951.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample952.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample953.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample954.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample955.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample956.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample957.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample958.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample959.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample96.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample960.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample961.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample962.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample963.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample964.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample965.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample966.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample967.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample968.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample969.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample97.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample970.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample971.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample972.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample973.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample974.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample975.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample976.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample977.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample978.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample979.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample98.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample980.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample981.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample982.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample983.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample984.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample985.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample986.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample987.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample988.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample989.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample99.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample990.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample991.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample992.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample993.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample994.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample995.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample996.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample997.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample998.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsNoDepends/sample999.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample0.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample0.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample1.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample1.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample10.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample10.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample100.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample101.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample102.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample103.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample104.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample105.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample106.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample107.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample108.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample109.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample11.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample11.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample110.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample111.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample112.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample113.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample114.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample115.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample116.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample117.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample118.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample119.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample12.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample12.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample120.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample121.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample122.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample123.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample124.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample125.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample126.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample127.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample128.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample129.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample13.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample13.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample130.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample131.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample132.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample133.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample134.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample135.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample136.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample137.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample138.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample139.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample14.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample14.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample140.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample141.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample142.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample143.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample144.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample145.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample146.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample147.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample148.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample149.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample15.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample15.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample150.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample151.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample152.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample153.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample154.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample155.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample156.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample157.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample158.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample159.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample16.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample16.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample160.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample161.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample162.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample163.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample164.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample165.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample166.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample167.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample168.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample169.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample17.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample17.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample170.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample171.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample172.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample173.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample174.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample175.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample176.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample177.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample178.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample179.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample18.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample18.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample180.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample181.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample182.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample183.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample184.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample185.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample186.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample187.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample188.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample189.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample19.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample19.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample190.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample191.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample192.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample193.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample194.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample195.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample196.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample197.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample198.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample199.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample2.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample2.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample20.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample20.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample200.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample201.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample202.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample203.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample204.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample205.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample206.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample207.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample208.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample209.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample21.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample21.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample210.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample211.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample212.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample213.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample214.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample215.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample216.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample217.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample218.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample219.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample22.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample22.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample220.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample221.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample222.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample223.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample224.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample225.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample226.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample227.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample228.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample229.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample23.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample23.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample230.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample231.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample232.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample233.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample234.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample235.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample236.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample237.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample238.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample239.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample24.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample24.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample240.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample241.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample242.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample243.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample244.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample245.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample246.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample247.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample248.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample249.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample25.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample25.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample250.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample251.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample252.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample253.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample254.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample255.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample256.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample257.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample258.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample259.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample26.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample26.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample260.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample261.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample262.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample263.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample264.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample265.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample266.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample267.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample268.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample269.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample27.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample27.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample270.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample271.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample272.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample273.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample274.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample275.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample276.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample277.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample278.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample279.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample28.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample28.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample280.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample281.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample282.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample283.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample284.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample285.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample286.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample287.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample288.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample289.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample29.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample29.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample290.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample291.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample292.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample293.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample294.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample295.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample296.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample297.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample298.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample299.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample3.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample3.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample30.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample30.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample300.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample301.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample302.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample303.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample304.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample305.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample306.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample307.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample308.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample309.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample31.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample31.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample310.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample311.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample312.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample313.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample314.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample315.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample316.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample317.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample318.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample319.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample32.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample32.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample320.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample321.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample322.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample323.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample324.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample325.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample326.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample327.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample328.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample329.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample33.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample33.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample330.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample331.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample332.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample333.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample334.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample335.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample336.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample337.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample338.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample339.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample34.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample34.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample340.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample341.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample342.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample343.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample344.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample345.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample346.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample347.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample348.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample349.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample35.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample35.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample350.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample351.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample352.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample353.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample354.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample355.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample356.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample357.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample358.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample359.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample36.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample36.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample360.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample361.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample362.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample363.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample364.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample365.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample366.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample367.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample368.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample369.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample37.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample37.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample370.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample371.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample372.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample373.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample374.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample375.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample376.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample377.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample378.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample379.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample38.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample38.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample380.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample381.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample382.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample383.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample384.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample385.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample386.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample387.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample388.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample389.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample39.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample39.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample390.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample391.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample392.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample393.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample394.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample395.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample396.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample397.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample398.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample399.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample4.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample4.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample40.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample40.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample400.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample401.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample402.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample403.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample404.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample405.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample406.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample407.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample408.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample409.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample41.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample41.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample410.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample411.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample412.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample413.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample414.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample415.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample416.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample417.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample418.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample419.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample42.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample42.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample420.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample421.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample422.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample423.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample424.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample425.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample426.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample427.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample428.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample429.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample43.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample43.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample430.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample431.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample432.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample433.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample434.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample435.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample436.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample437.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample438.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample439.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample44.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample44.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample440.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample441.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample442.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample443.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample444.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample445.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample446.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample447.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample448.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample449.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample45.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample45.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample450.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample451.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample452.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample453.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample454.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample455.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample456.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample457.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample458.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample459.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample46.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample46.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample460.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample461.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample462.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample463.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample464.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample465.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample466.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample467.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample468.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample469.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample47.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample47.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample470.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample471.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample472.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample473.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample474.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample475.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample476.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample477.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample478.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample479.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample48.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample48.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample480.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample481.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample482.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample483.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample484.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample485.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample486.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample487.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample488.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample489.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample49.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample49.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample490.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample491.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample492.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample493.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample494.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample495.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample496.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample497.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample498.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample499.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample5.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample5.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample50.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample50.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample500.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample501.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample502.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample503.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample504.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample505.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample506.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample507.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample508.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample509.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample51.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample51.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample510.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample511.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample512.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample513.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample514.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample515.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample516.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample517.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample518.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample519.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample52.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample52.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample520.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample521.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample522.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample523.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample524.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample525.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample526.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample527.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample528.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample529.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample53.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample53.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample530.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample531.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample532.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample533.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample534.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample535.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample536.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample537.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample538.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample539.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample54.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample54.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample540.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample541.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample542.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample543.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample544.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample545.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample546.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample547.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample548.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample549.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample55.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample55.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample550.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample551.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample552.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample553.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample554.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample555.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample556.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample557.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample558.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample559.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample56.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample56.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample560.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample561.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample562.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample563.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample564.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample565.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample566.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample567.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample568.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample569.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample57.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample57.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample570.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample571.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample572.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample573.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample574.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample575.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample576.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample577.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample578.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample579.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample58.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample58.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample580.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample581.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample582.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample583.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample584.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample585.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample586.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample587.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample588.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample589.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample59.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample59.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample590.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample591.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample592.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample593.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample594.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample595.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample596.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample597.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample598.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample599.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample6.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample6.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample60.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample60.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample600.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample601.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample602.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample603.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample604.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample605.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample606.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample607.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample608.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample609.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample61.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample61.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample610.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample611.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample612.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample613.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample614.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample615.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample616.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample617.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample618.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample619.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample62.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample62.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample620.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample621.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample622.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample623.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample624.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample625.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample626.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample627.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample628.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample629.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample63.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample63.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample630.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample631.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample632.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample633.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample634.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample635.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample636.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample637.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample638.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample639.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample64.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample64.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample640.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample641.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample642.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample643.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample644.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample645.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample646.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample647.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample648.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample649.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample65.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample65.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample650.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample651.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample652.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample653.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample654.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample655.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample656.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample657.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample658.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample659.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample66.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample66.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample660.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample661.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample662.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample663.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample664.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample665.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample666.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample667.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample668.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample669.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample67.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample67.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample670.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample671.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample672.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample673.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample674.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample675.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample676.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample677.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample678.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample679.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample68.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample68.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample680.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample681.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample682.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample683.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample684.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample685.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample686.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample687.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample688.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample689.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample69.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample69.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample690.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample691.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample692.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample693.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample694.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample695.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample696.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample697.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample698.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample699.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample7.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample7.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample70.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample70.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample700.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample701.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample702.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample703.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample704.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample705.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample706.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample707.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample708.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample709.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample71.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample71.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample710.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample711.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample712.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample713.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample714.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample715.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample716.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample717.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample718.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample719.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample72.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample72.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample720.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample721.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample722.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample723.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample724.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample725.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample726.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample727.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample728.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample729.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample73.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample73.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample730.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample731.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample732.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample733.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample734.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample735.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample736.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample737.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample738.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample739.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample74.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample74.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample740.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample741.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample742.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample743.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample744.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample745.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample746.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample747.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample748.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample749.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample75.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample75.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample750.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample751.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample752.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample753.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample754.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample755.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample756.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample757.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample758.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample759.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample76.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample76.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample760.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample761.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample762.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample763.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample764.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample765.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample766.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample767.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample768.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample769.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample77.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample77.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample770.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample771.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample772.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample773.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample774.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample775.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample776.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample777.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample778.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample779.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample78.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample78.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample780.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample781.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample782.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample783.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample784.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample785.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample786.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample787.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample788.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample789.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample79.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample79.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample790.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample791.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample792.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample793.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample794.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample795.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample796.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample797.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample798.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample799.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample8.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample8.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample80.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample80.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample800.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample801.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample802.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample803.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample804.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample805.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample806.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample807.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample808.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample809.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample81.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample81.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample810.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample811.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample812.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample813.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample814.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample815.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample816.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample817.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample818.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample819.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample82.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample82.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample820.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample821.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample822.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample823.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample824.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample825.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample826.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample827.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample828.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample829.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample83.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample83.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample830.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample831.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample832.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample833.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample834.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample835.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample836.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample837.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample838.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample839.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample84.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample84.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample840.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample841.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample842.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample843.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample844.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample845.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample846.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample847.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample848.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample849.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample85.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample85.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample850.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample851.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample852.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample853.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample854.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample855.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample856.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample857.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample858.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample859.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample86.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample86.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample860.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample861.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample862.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample863.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample864.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample865.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample866.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample867.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample868.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample869.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample87.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample87.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample870.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample871.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample872.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample873.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample874.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample875.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample876.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample877.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample878.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample879.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample88.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample88.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample880.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample881.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample882.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample883.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample884.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample885.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample886.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample887.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample888.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample889.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample89.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample89.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample890.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample891.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample892.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample893.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample894.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample895.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample896.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample897.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample898.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample899.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample9.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample9.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample90.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample90.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample900.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample901.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample902.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample903.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample904.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample905.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample906.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample907.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample908.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample909.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample91.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample91.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample910.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample911.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample912.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample913.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample914.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample915.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample916.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample917.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample918.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample919.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample92.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample92.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample920.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample921.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample922.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample923.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample924.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample925.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample926.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample927.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample928.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample929.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample93.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample93.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample930.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample931.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample932.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample933.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample934.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample935.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample936.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample937.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample938.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample939.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample94.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample94.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample940.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample941.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample942.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample943.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample944.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample945.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample946.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample947.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample948.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample949.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample95.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample95.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample950.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample951.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample952.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample953.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample954.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample955.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample956.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample957.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample958.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample959.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample96.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample96.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample960.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample961.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample962.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample963.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample964.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample965.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample966.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample967.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample968.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample969.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample97.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample97.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample970.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample971.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample972.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample973.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample974.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample975.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample976.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample977.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample978.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample979.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample98.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample98.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample980.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample981.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample982.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample983.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample984.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample985.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample986.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample987.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample988.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample989.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample99.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample99.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample990.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample991.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample992.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample993.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample994.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample995.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample996.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample997.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample998.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample999.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100KB.wsdl3107
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample0.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample1.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample10.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample11.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample12.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample13.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample14.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample15.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample16.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample17.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample18.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample19.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample2.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample20.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample21.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample22.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample23.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample24.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample25.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample26.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample27.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample28.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample29.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample3.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample30.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample31.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample32.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample33.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample34.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample35.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample36.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample37.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample38.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample39.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample4.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample40.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample41.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample42.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample43.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample44.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample45.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample46.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample47.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample48.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample49.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample5.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample50.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample51.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample52.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample53.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample54.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample55.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample56.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample57.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample58.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample59.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample6.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample60.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample61.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample62.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample63.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample64.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample65.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample66.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample67.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample68.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample69.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample7.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample70.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample71.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample72.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample73.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample74.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample75.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample76.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample77.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample78.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample79.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample8.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample80.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample81.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample82.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample83.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample84.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample85.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample86.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample87.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample88.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample89.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample9.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample90.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample91.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample92.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample93.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample94.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample95.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample96.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample97.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample98.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsCrossDepends/sample99.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample0.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample1.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample10.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample11.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample12.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample13.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample14.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample15.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample16.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample17.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample18.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample19.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample2.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample20.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample21.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample22.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample23.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample24.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample25.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample26.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample27.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample28.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample29.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample3.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample30.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample31.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample32.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample33.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample34.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample35.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample36.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample37.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample38.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample39.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample4.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample40.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample41.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample42.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample43.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample44.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample45.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample46.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample47.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample48.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample49.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample5.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample50.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample51.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample52.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample53.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample54.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample55.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample56.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample57.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample58.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample59.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample6.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample60.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample61.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample62.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample63.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample64.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample65.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample66.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample67.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample68.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample69.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample7.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample70.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample71.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample72.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample73.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample74.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample75.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample76.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample77.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample78.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample79.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample8.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample80.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample81.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample82.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample83.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample84.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample85.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample86.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample87.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample88.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample89.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample9.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample90.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample91.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample92.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample93.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample94.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample95.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample96.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample97.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample98.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample99.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample0.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample0.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample1.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample1.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample10.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample10.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample11.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample11.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample12.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample12.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample13.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample13.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample14.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample14.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample15.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample15.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample16.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample16.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample17.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample17.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample18.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample18.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample19.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample19.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample2.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample2.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample20.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample20.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample21.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample21.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample22.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample22.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample23.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample23.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample24.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample24.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample25.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample25.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample26.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample26.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample27.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample27.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample28.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample28.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample29.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample29.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample3.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample3.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample30.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample30.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample31.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample31.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample32.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample32.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample33.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample33.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample34.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample34.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample35.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample35.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample36.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample36.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample37.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample37.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample38.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample38.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample39.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample39.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample4.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample4.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample40.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample40.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample41.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample41.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample42.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample42.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample43.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample43.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample44.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample44.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample45.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample45.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample46.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample46.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample47.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample47.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample48.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample48.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample49.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample49.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample5.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample5.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample50.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample50.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample51.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample51.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample52.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample52.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample53.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample53.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample54.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample54.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample55.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample55.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample56.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample56.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample57.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample57.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample58.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample58.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample59.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample59.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample6.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample6.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample60.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample60.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample61.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample61.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample62.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample62.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample63.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample63.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample64.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample64.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample65.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample65.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample66.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample66.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample67.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample67.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample68.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample68.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample69.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample69.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample7.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample7.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample70.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample70.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample71.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample71.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample72.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample72.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample73.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample73.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample74.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample74.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample75.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample75.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample76.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample76.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample77.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample77.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample78.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample78.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample79.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample79.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample8.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample8.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample80.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample80.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample81.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample81.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample82.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample82.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample83.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample83.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample84.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample84.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample85.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample85.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample86.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample86.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample87.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample87.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample88.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample88.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample89.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample89.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample9.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample9.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample90.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample90.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample91.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample91.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample92.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample92.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample93.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample93.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample94.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample94.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample95.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample95.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample96.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample96.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample97.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample97.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample98.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample98.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample99.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample99.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10KB.wsdl317
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsCrossDepends/sample0.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsCrossDepends/sample1.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsCrossDepends/sample2.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsCrossDepends/sample3.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsCrossDepends/sample4.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsCrossDepends/sample5.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsCrossDepends/sample6.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsCrossDepends/sample7.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsCrossDepends/sample8.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsCrossDepends/sample9.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsNoDepends/sample0.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsNoDepends/sample1.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsNoDepends/sample2.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsNoDepends/sample3.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsNoDepends/sample4.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsNoDepends/sample5.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsNoDepends/sample6.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsNoDepends/sample7.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsNoDepends/sample8.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsNoDepends/sample9.wsdl36
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample0.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample0.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample1.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample1.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample10.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample11.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample12.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample13.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample14.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample15.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample16.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample17.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample18.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample19.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample2.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample2.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample20.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample21.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample22.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample23.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample24.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample25.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample26.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample27.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample28.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample29.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample3.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample3.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample30.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample31.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample32.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample33.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample34.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample35.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample36.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample37.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample38.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample39.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample4.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample4.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample40.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample41.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample42.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample43.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample44.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample45.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample46.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample47.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample48.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample49.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample5.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample5.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample50.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample51.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample52.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample53.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample54.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample55.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample56.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample57.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample58.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample59.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample6.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample6.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample60.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample61.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample62.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample63.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample64.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample65.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample66.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample67.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample68.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample69.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample7.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample7.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample70.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample71.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample72.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample73.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample74.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample75.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample76.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample77.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample78.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample79.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample8.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample8.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample80.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample81.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample82.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample83.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample84.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample85.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample86.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample87.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample88.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample89.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample9.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample9.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample90.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample91.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample92.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample93.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample94.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample95.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample96.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample97.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample98.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/10WSDLsXSDDepends/sample99.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1KB.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/1MB.wsdl31007
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/200KB.wsdl6207
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/500KB.wsdl15507
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/data/StockQuote/StockQuote.wsdl68
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/AllTests.java35
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java141
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java84
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java87
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java92
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java68
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java54
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java45
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java83
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java82
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java59
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java59
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java128
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open100KBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open10KBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open1KBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open1MBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open200KBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open500KBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/OpenWSDLEditorTestCase.java28
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx100TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx10TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx1TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx25TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx50TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx75TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenWSDLEditorTestCase.java33
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatRunWSDLValidatorTestCase.java34
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex100TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex10TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex1TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex25TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex50TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex75TestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RunWSDLValidatorTestCase.java30
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsCrossDependsTestCase.java50
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsNoDependsTestCase.java50
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsXSDDependsTestCase.java50
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100KBFileTestCase.java33
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsCrossDependsTestCase.java50
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsNoDependsTestCase.java50
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsXSDDependsTestCase.java50
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10KBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsCrossDependsTestCase.java50
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsNoDependsTestCase.java50
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsXSDDependsTestCase.java50
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1KBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1MBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate200KBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate500KBFileTestCase.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/WSDLScalabilityTests.java61
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/plugin.properties12
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/test.xml647
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.project28
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/META-INF/MANIFEST.MF13
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/about.html34
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/build.properties15
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/plugin.xml27
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/ConvertWSDL20ActionDelegate.java79
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/GenerateWSDLActionDelegate.java61
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.classpath16
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.project28
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.settings/org.eclipse.jdt.core.prefs258
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.settings/org.eclipse.pde.core.prefs3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/META-INF/MANIFEST.MF22
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/build.properties19
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/BindingFaultReconciliation/BindingFaultSample.wsdl128
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/BindingOperationReconciliation/BindingOperationReconciliation.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/DuplicateSAXException/SAXException.wsdl9
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/FullElementExtensibility/ExtendedWSDL.wsdl35
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/FullElementExtensibility/Imported.wsdl50
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/HandlesDocumentationElements/Documented.wsdl67
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/InlineTypesFromImportsAreVisible/A.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/InlineTypesFromImportsAreVisible/B.wsdl16
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/MissingName.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/WithName.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace.wsdl59
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace2.wsdl57
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/Confirmation.xsd12
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/ContactInfo.xsd22
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/ContactInfoService.wsdl44
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/OperationStyle/OperationStyleTest.wsdl120
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test.wsdl31
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test1.xsd5
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test2.xsd12
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypesExtensibility/TypesExtensibility.wsdl15
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/firstlevel.wsdl7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/main.wsdl24
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/secondlevel.wsdl22
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/Extensions/HTTP/HTTPExample.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/Extensions/HTTP/HTTPTest.wsdl91
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/Extensions/MIME/MIMEExample.wsdl64
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/Extensions/MIME/MIMETest.wsdl55
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/DocumentLiteralSOAPExample.wsdl137
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/RPCEncodedSOAPExample.wsdl47
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/RPCLiteralSOAPExample.wsdl54
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/SOAPTest.wsdl91
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/Imported.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/LoadAndPrintTest.wsdl47
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java57
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/BugFixesTest.java1197
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.java188
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.java222
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LocationTrackingTest.java108
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java35
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java73
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java206
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java486
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.java251
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java387
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java552
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java238
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java127
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/extensions/HTTPExtensionsTest.java314
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/extensions/MIMEExtensionsTest.java208
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/extensions/SOAPExtensionsTest.java512
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/extensions/WSDLExtensionsTest.java74
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java90
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java204
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java218
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java598
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java48
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java181
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java33
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java33
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/test.xml53
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.classpath18
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.project28
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.jdt.core.prefs62
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.pde.prefs13
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF31
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/build.properties19
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidatorTest.java252
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidatorWrapper.java117
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidatorTest.java42
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidatorWrapper.java37
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/validatewsdl.properties12
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverTest.java203
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/AntLoggerTest.java187
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/AntLoggerTestTask.java103
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTask.java29
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTest.java143
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateTest.java221
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateTestLogger.java103
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateWrapper.java113
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGeneratorTest.java222
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGeneratorWrapper.java98
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogTest.java63
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.java54
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.java374
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/LineNumberAdjustmentsTest.java46
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/PathsTest.java585
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java628
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLValidatorTestsPlugin.java79
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.java222
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/test.xml59
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PlatformURL/one.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl-log9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl-log9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/CaseInsensitiveOperationNames/CaseInsensitiveOperationNames.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage1.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage2.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNonExistantFile.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImport.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDL.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWithIncorrectSlash/ImportWithIncorrectSlash.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl-log9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/NoSchemeSchemaNamespaceImport/NoSchemeSchemaNamespaceImport.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/SimpleImport/test-1.0.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingTypes.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLNamespaceAAA.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/NamespaceDoesntResolve/NamespaceDoesntResolve.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/NamespaceResolvesHTML/NamespaceResolvesHTML.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/Empty.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/ReferenceInlineTypes.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfImport/ImportFileWithSelfImport/ImportFileWithSelfImport.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfImport/SimpleFile/SelfImport.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfImport/SimpleFileInvalid/SelfImport.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesInvalid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesValid.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportNoNSSchema/ImportNoNSSchema.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/ImportNoNSSchemaAndSecondSchemaWithNS.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaNoNamespace/InlineSchemaNoNamespace.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/NoNSElementReference/NoNSElementReference.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl-log9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ValueColon/ValueColon.wsdl-log8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.wsdl21
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.wsdl19
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PlatformURL/one.wsdl6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PlatformURL/two.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/CaseInsensitiveOperationNames/CaseInsensitiveOperationNames.wsdl25
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage1.wsdl22
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage2.wsdl22
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl12
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl18
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/simple.wsdl6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNonExistantFile.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImport.wsdl7
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDL.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/B.xsd4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/C.xsd8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/ImportWithIncorrectSlash.wsdl9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl39
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingSchemaNotInDir.xsd6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl7
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/NoSchemeSchemaNamespaceImport/NoSchemeSchemaNamespaceImport.wsdl35
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SchemaNamespaceAAA.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/import-1.0.wsdl6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/test-1.0.wsdl9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingTypes.wsdl8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLNamespaceAAA.wsdl4
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLOnlyTypes.wsdl9
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/schema.xsd5
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/simplewsdl.wsdl2
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedImportingSchema.wsdl11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedWSDLImportedSchema.xsd8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/PlainSchema.xsd8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.wsdl34
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/NamespaceDoesntResolve/NamespaceDoesntResolve.wsdl43
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/NamespaceResolvesHTML/NamespaceResolvesHTML.wsdl44
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/Empty.wsdl0
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl6
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/ReferenceInlineTypes.wsdl12
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl32
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl32
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/ImportFileWithSelfImport/ImportFileWithSelfImport.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/ImportFileWithSelfImport/SelfImport.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/SimpleFile/SelfImport.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/SimpleFileInvalid/SelfImport.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl37
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema1.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema2.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesInvalid.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesValid.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl24
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/schema.xsd11
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchema/ImportNoNSSchema.wsdl27
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchema/NoTns.xsd8
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/ImportNoNSSchemaAndSecondSchemaWithNS.wsdl24
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/noTNS.xsd3
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl24
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaNoNamespace/InlineSchemaNoNamespace.wsdl24
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/NoNSElementReference/NoNSElementReference.wsdl15
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl20
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl29
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl27
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl14
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ValueColon/ValueColon.wsdl19
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.project28
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF20
-rw-r--r--tests/org.eclipse.wst.wsi.tests/about.html34
-rw-r--r--tests/org.eclipse.wst.wsi.tests/build.properties8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/plugin.properties3
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreConformanceTest.java104
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreMessageLogConformanceTest.java139
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreWSDLConformanceTest.java189
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/MessageLogConformanceAPTest.java15
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/MessageLogConformanceSOAP12Test.java21
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/MessageLogConformanceSSBPTest.java17
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/MessageLogConformanceSecureWSTest.java29
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/RegressionBucket.java62
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceAPTest.java75
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceSSBPTest.java73
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSITestsPlugin.java78
-rw-r--r--tests/org.eclipse.wst.wsi.tests/test.xml53
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/SOAP12/SimpleLog/SimpleLog.wsimsg59
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/SOAP12/SimpleLog/testcase.xml21
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/SecureWS/Encryption/Encryption.wsimsg56
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/SecureWS/Encryption/testcase.xml7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/SecureWS/NoSecurity/NoSecurity.wsimsg56
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/SecureWS/NoSecurity/testcase.xml7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/SecureWS/Signature/Signature.wsimsg56
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/SecureWS/Signature/testcase.xml7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/SecureWS/SignatureAndEncryption/SignatureAndEncryption.wsimsg56
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/SecureWS/SignatureAndEncryption/testcase.xml7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/bp/1309-1/1309-1.wsimsg53
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/bp/1309-1/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/bp/1309-2/1309-2.wsimsg53
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/bp/1309-2/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/bp/1600-1/1600-1.wsimsg53
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/bp/1600-1/testcase.xml10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/bugzilla/141966/141966.wsimsg41
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/messageLogs/bugzilla/141966/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/SOAP12/HelloService_schema1.xsd19
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/SOAP12/SimpleLog.wsdl37
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/SecureWS/Encryption.wsdl72
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/SecureWS/NoSecurity.wsdl72
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/SecureWS/Signature.wsdl72
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/SecureWS/SignatureAndEncryption.wsdl72
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/ap/2941-1/2941-1.wsdl111
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/ap/2941-1/testcase.xml7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/2012-1.wsdl82
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/testcase.xml10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/2012-2.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/2013-1.wsdl99
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/testcase.xml13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/2014-1.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/2014-2.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/2014-3.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/2017-1.wsdl105
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/2017-2.wsdl110
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/2018-1.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018-2.wsdl45
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/2018-3.wsdl42
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018-4.wsdl44
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018-5.wsdl13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018a.wsdl43
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/2019-1.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/2019-2.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/2019-3.wsdl116
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/2019-4.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/2020-1.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/testcase.xml12
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/2020-2.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/testcase.xml13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105-1.wsdl45
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105-2.wsdl45
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105a.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105b.wsdl10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/2117-1.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/testcase.xml12
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/2117-2.wsdl104
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/2117-3.wsdl105
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/2406-1.wsdl33
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/testcase.xml10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bugzilla/emptySoapBody/emptySoapBody.wsdl44
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/2010-1.wsdl87
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/testcase.xml13
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011-1.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/next.xsd11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/testcase.xml7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011-2.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011.xsd8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/testcase.xml16
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011-3.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/next.xsd11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/testcase.xml16
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011-4.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/testcase.xml17
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011-5.wsdl84
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011.xsd9
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/next.xsd8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/testcase.xml18
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/2021-1.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/2021-2.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/2021-3.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/2021-4.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/2021-5.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/2021-6.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/testcase.xml14
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/2022-1.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/testcase.xml16
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/2022-2.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/testcase.xml16
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/2032-1.wsdl106
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/testcase.xml15
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/2032-2.wsdl117
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/testcase.xml15
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/addressBook-rpc.wsdl97
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/addressBook.wsdl109
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/testcase.xml8
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/sampleAppCatalog.wsdl17
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/testcase.xml11
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/sampleAppManufacturer.wsdl26
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/testcase.xml10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/sampleAppWarehouse.wsdl20
-rw-r--r--tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/testcase.xml10
8013 files changed, 0 insertions, 667948 deletions
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath
deleted file mode 100644
index 52165ecfb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
deleted file mode 100644
index f3849da1d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project b/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
deleted file mode 100644
index f45485428..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.consumption.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index aed0446d5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Dec 22 19:50:24 EST 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0fd1048cf..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:29:14 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 577040239..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:39 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 2ed822fd5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core; singleton:=true
-Bundle-Version: 1.0.304.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.axis.consumption.core;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.core.command;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.core.common;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.core.context;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.core.plugin;x-internal:=true
-Require-Bundle: org.apache.ant;bundle-version="[1.6.5,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.apache.axis;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html b/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_bujava.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_bujava.properties
deleted file mode 100644
index c0b562dba..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_bujava.properties
+++ /dev/null
@@ -1,71 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-!-- ScenarioType REQUIRED. Differentiates from "client" scenario.
-ScenarioType=service
-
-!-- InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java
-InitialSelection=/dynamicWebProjectName/src/packagename/myService.java
-
-!--Utility property values - use these to list valid values for the following properties:
-!-- Service.RuntimeId, Service.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!-- Service.RuntimeId - ID of web service runtime
-Service.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
-!-- Service.ServerId - ID of target server
-Service.ServerId=org.eclipse.jst.server.tomcat.50
-!-- Service.TypeId - "Top Down EJB" or "Bottom Up EJB"
-!-- Java Bean is default for both Top Down and Bottom Up
-!-- Service.TypeId=Top Down EJB
-
-!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String
-!--ServiceProjectName=serviceProjectName
-!-- ServiceEarProjectName - !--type:String - name of Service project - this property can be used to give the service EAR project a different name than the project containing the initial selection. type: String
-!--ServiceEarProjectName=serviceEarProjectName
-
-!-- Mappings
-!-- Top down or bottom up scenario. Workspace relative URI to property file containing mappings.
-!-- Top Down: Mappings are used to override the default package names of the generated Java template classes.
-!-- The content of the properties file must be of the format namespace=package
-!-- Bottom Up: Mappings are used to override the default namespace names in the generated WSDL.
-!-- The content of the properties file must be of the format package = namespace
-!--Mappings=/testProj/mappings/mappings.txt
-
-!-- JavaOutput
-!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
-!--JavaOutput=/projectName/JavaSource
-
-!-- Methods
-!-- Bottom up - space delimited string of method signatures (i.e. method1(parmType1) method2(parmType2)) to be exposed in output WSDL. If no list is provided, all methods are exposed.
-!-- Methods=
-
-!-- Style
-!-- Bottom up - String: one of: RPC, DOCUMENT, WRAPPED
-!--Style=DOCUMENT
-
-!-- Use
-!-- Bottom up - String: one of: LITERAL, ENCODED
-!--Use=LITERAL
-
-!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!--OverwriteFilesEnabled=true
-
-!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!--CreateFoldersEnabled=true
-
-!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!--CheckoutFilesEnabled=true
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_bujava.xml b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_bujava.xml
deleted file mode 100644
index 30f942e3e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_bujava.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="axis_bujava.properties"/>
-
-<echo message="calling the web services generation ant task: axis_bujava"/>
- <target name="main" >
- <wsgen/>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_client.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_client.properties
deleted file mode 100644
index db3ca4531..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_client.properties
+++ /dev/null
@@ -1,60 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-!--ScenarioType REQUIRED. Differentiates from "service" scenario.
-ScenarioType=client
-
-!--InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java.
-InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl
-
-!--Utility property values - use these to list values for the following properties:
-!-- Client.RuntimeId, Client.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-
-!--Client.RuntimeId - ID of web service runtime
-Client.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
-!--Client.ServerId - ID of target server
-Client.ServerId=org.eclipse.jst.server.tomcat.50
-
-!--ClientProjectName - name of Client project - this property can be used to give the client project a
-!-- different name than the project containing the initial selection
-!--ClientProjectName=clientProjectName
-
-!--ClientEarProjectName- name of Client EAR project - set only if applicable for selected server type
-!--ClientEarProjectName=clientEARProjectName
-
-!--ClientComponentType - type of Client project - the following are valid Axis templates: template.jst.web and template.jst.utility
-!--ClientComponentType=template.jst.web
-
-!-- CustomizeClientMappings - set to true to supply package-namespace mappings type: boolean
-!--CustomizeClientMappings=false
-
-!-- Mappings
-!-- Workspace relative URI to property file containing mappings
-!-- Mappings are used to override the default package names of the generated Java classes.
-!-- Need not be set if CustomizeClientMappings is false
-!-- The content of the properties file must be of the format package = namespace.
-!--Mappings=/testProj/mappings/mappings.txt
-
-!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!-- OverwriteFilesEnabled=true
-
-!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!-- CreateFoldersEnabled=true
-
-!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!-- CheckoutFilesEnabled=true
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_client.xml b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_client.xml
deleted file mode 100644
index 1dbfe251c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_client.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="axis_client.properties"/>
-
-<echo message="calling the web services generation ant task: axis_client"/>
- <target name="main" >
- <wsgen/>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_tdjava.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_tdjava.properties
deleted file mode 100644
index 9e4a6f658..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_tdjava.properties
+++ /dev/null
@@ -1,71 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-!-- ScenarioType REQUIRED. Differentiates from "client" scenario.
-ScenarioType=service
-
-!-- InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java
-InitialSelection=/dynamicWebProjectName/WebContent/myService.wsdl
-
-!--Utility property values - use these to list valid values for the following properties:
-!-- Service.RuntimeId, Service.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!-- Service.RuntimeId - ID of web service runtime
-Service.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
-!-- Service.ServerId - ID of target server
-Service.ServerId=org.eclipse.jst.server.tomcat.50
-!-- Service.TypeId - "Top Down EJB" or "Bottom Up EJB"
-!-- Java Bean is default for both Top Down and Bottom Up
-!-- Service.TypeId=Top Down EJB
-
-!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String
-!--ServiceProjectName=serviceProjectName
-!-- ServiceEarProjectName - !--type:String - name of Service project - this property can be used to give the service EAR project a different name than the project containing the initial selection. type: String
-!--ServiceEarProjectName=serviceEarProjectName
-
-!-- Mappings
-!-- Top down or bottom up scenario. Workspace relative URI to property file containing mappings.
-!-- Top Down: Mappings are used to override the default package names of the generated Java template classes.
-!-- The content of the properties file must be of the format namespace=package
-!-- Bottom Up: Mappings are used to override the default namespace names in the generated WSDL.
-!-- The content of the properties file must be of the format package = namespace
-!--Mappings=/testProj/mappings/mappings.txt
-
-!-- JavaOutput
-!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
-!--JavaOutput=/projectName/JavaSource
-
-!-- Methods
-!-- Bottom up - space delimited string of method signatures (i.e. method1(parmType1) method2(parmType2)) to be exposed in output WSDL. If no list is provided, all methods are exposed.
-!-- Methods=
-
-!-- Style
-!-- Bottom up - String: one of: RPC, DOCUMENT, WRAPPED
-!--Style=DOCUMENT
-
-!-- Use
-!-- Bottom up - String: one of: LITERAL, ENCODED
-!--Use=LITERAL
-
-!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!--OverwriteFilesEnabled=true
-
-!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!--CreateFoldersEnabled=true
-
-!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!--CheckoutFilesEnabled=true
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_tdjava.xml b/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_tdjava.xml
deleted file mode 100644
index fb914b6e1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/ant/axis_tdjava.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="axis_tdjava.properties"/>
-
-<echo message="calling the web services generation ant task: axis_tdjava"/>
- <target name="main" >
- <wsgen/>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
deleted file mode 100644
index bca2baecb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20080301 220877 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-source.. = src/
-bin.includes = .,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html,\
- ant/
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
deleted file mode 100644
index ccf6e62a9..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web service Axis Consumption Core
-PLUGIN_PROVIDER=Eclipse.org
-
-xpWSDDContentType = Axis Web Service Deployment Descriptor
-
-X_WEB_SERVICE_LOCATOR_AXIS=Apache Axis Web Service Locator
-X_WEB_SERVICE_LOCATOR_CATEGORY_AXIS=Apache Axis Components
-
-
-#runtime labels
-
-LABEL_RUNTIME_AXIS=Apache Axis
-
-#scenario labels
-
-LABEL_BOTTOM_UP_JAVA_BEAN=Bottom up Java bean Web Service
-LABEL_TOP_DOWN_JAVA_BEAN=Top down Java bean Web Service
-LABEL_CLIENT=Client
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
deleted file mode 100644
index 30638dbe0..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension point="org.eclipse.jst.ws.consumption.wsfinder">
- <wsfinder
- id="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
- name="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
- description="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
- class="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis">
- </wsfinder>
- </extension>
-
- <!-- Extension providing workspace WSDL discovery -->
- <extension point="org.eclipse.wst.ws.locator">
-
- <webServiceLocatorCategory
- id="org.eclipse.jst.ws.internal.axis.consumption.core.locator.category.axis"
- label="%X_WEB_SERVICE_LOCATOR_CATEGORY_AXIS"/>
-
- <webServiceLocator
- class="org.eclipse.jst.ws.internal.axis.consumption.core.locator.AxisWebServiceLocator"
- id="org.eclipse.jst.ws.internal.axis.consumption.core.locator.axis"
- category="org.eclipse.jst.ws.internal.axis.consumption.core.locator.category.axis"
- label="%X_WEB_SERVICE_LOCATOR_AXIS">
- </webServiceLocator>
-
- </extension>
-
-
- <!-- define a wsdd file type for Axis Web Service Deployment Descriptors -->
- <extension point="org.eclipse.team.core.fileTypes">
- <fileTypes
- type="text"
- extension="wsdd">
- </fileTypes>
- </extension>
-
- <!-- define a wsdd content type for Axis Web Service Deployment Descriptors -->
- <extension point="org.eclipse.core.runtime.contentTypes">
- <content-type
- priority="high"
- name="%xpWSDDContentType"
- id="wsddsource"
- base-type="org.eclipse.core.runtime.xml"
- default-charset="UTF-8"
- file-extensions="wsdd" />
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.ui.antfiles">
- <antfiles
- id="org.eclipse.jst.ws.axis.creation.axisWebServiceRTTopJava"
- runtimeid="axis"
- pluginlocation="org.eclipse.jst.ws.axis.consumption.core"
- path="ant/axis_tdjava.properties"
- wsgenpath="ant/axis_tdjava.xml"
- runtimelabel="%LABEL_RUNTIME_AXIS"
- scenariolabel="%LABEL_TOP_DOWN_JAVA_BEAN">
- </antfiles>
- <antfiles
- id="org.eclipse.jst.ws.axis.creation.axisWebServiceRTBUJava"
- runtimeid="axis"
- pluginlocation="org.eclipse.jst.ws.axis.consumption.core"
- path="ant/axis_bujava.properties"
- wsgenpath="ant/axis_bujava.xml"
- runtimelabel="%LABEL_RUNTIME_AXIS"
- scenariolabel="%LABEL_BOTTOM_UP_JAVA_BEAN">
- </antfiles>
- <antfiles
- id="org.eclipse.jst.ws.axis.creation.axisWebServiceRTClient"
- runtimeid="axis"
- pluginlocation="org.eclipse.jst.ws.axis.consumption.core"
- path="ant/axis_client.properties"
- wsgenpath="ant/axis_client.xml"
- runtimelabel="%LABEL_RUNTIME_AXIS"
- scenariolabel="%LABEL_CLIENT">
- </antfiles>
- </extension>
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties
deleted file mode 100644
index f983fda01..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2007 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070412 177005 pmoogk@ca.ibm.com - Peter Moogk
-###############################################################################
-
-#
-# Messages for AxisDeployCommand
-#
-MSG_ERROR_PROJECT_URL_PARAM_NOT_SET=IWAB0054E Web project URL for deployment of Web service is not set in AxisDeployCommand
-MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET=IWAB0488E Location of Axis deployment file is not set in AxisDeployCommand
-MSG_ERROR_AXIS_DEPLOY=IWAB0489E Error when deploying Web service to Axis runtime
-MSG_AXIS_DEPLOY=Deploying Web service to Axis run-time environment
-
-#
-# Messages for Java2WSDLCommand
-#
-MSG_GENERATE_WSDL=Generating WSDL file: {0}
-MSG_ERROR_JAVA_WSDL_GENERATE=IWAB0398E Error in generating WSDL from Java:
-
-#
-# Messages for WSDL2JavaCommand
-#
-MSG_PARSING_WSDL=Parsing WSDL file: {0}
-MSG_ERROR_WSDL_JAVA_GENERATE=IWAB0399E Error in generating Java from WSDL:
-MSG_ERROR_MOVE_RESOURCE=IWAB0523E Error moving resource: {0}
-MSG_ERROR_CREATE_TEMP_DIR=Error creating temporary directory
-
-#
-# Messages common for all
-#
-MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET=IWAB0397E JavaWSDLParam not set
-MSG_ERROR_FOLDER_NOT_FOUND=Output folder: {0} was not found.
-
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCoreMessages.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCoreMessages.java
deleted file mode 100644
index 2bda89837..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCoreMessages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070412 177005 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AxisConsumptionCoreMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCore";//$NON-NLS-1$
-
- private AxisConsumptionCoreMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_PROJECT_URL_PARAM_NOT_SET;
- public static String MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET;
- public static String MSG_ERROR_AXIS_DEPLOY;
- public static String MSG_AXIS_DEPLOY;
- public static String MSG_GENERATE_WSDL;
- public static String MSG_ERROR_JAVA_WSDL_GENERATE;
- public static String MSG_PARSING_WSDL;
- public static String MSG_ERROR_WSDL_JAVA_GENERATE;
- public static String MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET;
- public static String MSG_ERROR_MOVE_RESOURCE;
- public static String MSG_ERROR_CREATE_TEMP_DIR;
- public static String MSG_ERROR_FOLDER_NOT_FOUND;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, AxisConsumptionCoreMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
deleted file mode 100644
index e90a1ac76..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080227 119964 trungha@ca.ibm.com - Trung Ha
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-
-import org.apache.axis.client.AdminClient;
-import org.apache.axis.tools.ant.axis.AdminClientTask;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.filters.StringInputStream;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class AxisDeployCommand extends AbstractDataModelOperation
-{
- protected static final String SERVICE_EXT = "/services/AdminService"; //$NON-NLS-1$
- protected static final String SERVER_CONFIG = "server-config.wsdd"; //$NON-NLS-1$
-
- private JavaWSDLParameter javaWSDLParam;
- private String project_;
-
- /**
- * Constructor for AxisDeployCommand.
- * @param String description
- * @param String name
- *
- */
- public AxisDeployCommand()
- {
- }
-
- public AxisDeployCommand(String project ){
- this.project_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (javaWSDLParam == null)
- {
- return StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- }
-
- if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
- { //$NON-NLS-1$
- return StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_PROJECT_URL_PARAM_NOT_SET);
- }
-
- if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
- {
- return StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET);
- }
-
- ProgressUtils.report(monitor, AxisConsumptionCoreMessages.MSG_AXIS_DEPLOY);
-
- IStatus status = executeAntTask(monitor);
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
-
- return status;
- }
-
- protected IStatus executeAntTask(IProgressMonitor monitor)
- {
- final class DeployTask extends AdminClientTask
- {
- public DeployTask()
- {
- super.setProject(new Project());
- super.getProject().init();
- super.setTaskType("axis"); //$NON-NLS-1$
- super.setTaskName("axis-admin"); //$NON-NLS-1$
- super.setOwningTarget(new Target());
- }
- }
-
- DeployTask adminClient = new DeployTask();
- String url = javaWSDLParam.getProjectURL() + SERVICE_EXT;
- adminClient.setUrl(url);
- adminClient.setXmlFile(new File(javaWSDLParam.getDeploymentFiles()[0]));
-
- // Since the admin server may not be available right away we will try
- // several times to execute it.
- try
- {
- BuildException lastException = null;
-
- for( int index = 0; index < 20; index++ )
- {
- try
- {
- lastException = null;
- adminClient.execute();
- }
- catch( BuildException exc )
- {
- lastException = exc;
-
- try
- {
- Thread.sleep( 200 );
- }
- catch( InterruptedException threadException )
- {
- }
- }
-
- // If no exception occured then we should break out of the loop.
- if( lastException == null ) break;
- }
-
- // If after many tries we still get an exception, then we will re throw it.
- if( lastException != null ) throw lastException;
-
- return createConfigFile(monitor, url);
- }
- catch (BuildException e)
- {
- e.printStackTrace();
- String message = e.getMessage();
- if (e.getCause() != null)
- {
- message = e.getCause().toString();
- }
-
- IStatus[] childStatus = new Status[1];
- childStatus[0] = StatusUtils.errorStatus( message);
- return StatusUtils.multiStatus(AxisConsumptionCoreMessages.MSG_ERROR_AXIS_DEPLOY, childStatus);
- }
- }
-
- /** Creates 'server-config.wsdd' in the WebContent folder in the Eclipse workspace project
- * @param monitor
- * @param url
- * @return
- */
- private IStatus createConfigFile(IProgressMonitor monitor, String url) {
- AdminClient listAdmin = new AdminClient();
- String config = "";
- try {
- config = listAdmin.process(new String[] { "-l" + url, "list" });
-
- IPath webInfPath = J2EEUtils.getWebInfPath(ResourcesPlugin
- .getWorkspace().getRoot().getProject(project_));
- IPath relativeServerConfigPath = webInfPath.append(SERVER_CONFIG);
- IStatusHandler statusHandler = getEnvironment().getStatusHandler();
- ResourceContext context = WebServicePlugin.getInstance()
- .getResourceContext();
- FileResourceUtils.createFile(context, relativeServerConfigPath,
- new StringInputStream(config), monitor, statusHandler);
- } catch (Exception e){
- e.printStackTrace();
- String message = e.getMessage();
- if (e.getCause() != null)
- {
- message = e.getCause().toString();
- }
-
- IStatus[] childStatus = new Status[1];
- childStatus[0] = StatusUtils.errorStatus( message);
- return StatusUtils.multiStatus(AxisConsumptionCoreMessages.MSG_ERROR_AXIS_DEPLOY, childStatus);
- }
- return Status.OK_STATUS;
- }
-
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam = javaWSDLParam;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java
deleted file mode 100644
index 2455a377f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import org.apache.axis.AxisEngine;
-import org.apache.axis.server.AxisServer;
-import org.apache.axis.tools.ant.axis.AdminClientTask;
-import org.apache.axis.utils.ClassUtils;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class GeronimoAxisDeployCommand extends AbstractDataModelOperation
-{
-
- private JavaWSDLParameter javaWSDLParam;
-
- private String projectName_;
- private static final String AXIS_SERVER_CONFIG_FILE = "axis.ServerConfigFile";
-
- IFolder outputRoot;
-
- /**
- * Constructor for GeronimoAxisDeployCommand.
- * @param String projectName
- *
- */
- public GeronimoAxisDeployCommand(String projectName)
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (javaWSDLParam == null)
- {
- return StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- }
-
- if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
- { //$NON-NLS-1$
- return StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_PROJECT_URL_PARAM_NOT_SET);
- }
-
- if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
- {
- return StatusUtils.errorStatus(
- AxisConsumptionCoreMessages.MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET);
- }
-
- ProgressUtils.report(monitor, AxisConsumptionCoreMessages.MSG_AXIS_DEPLOY);
-
- IStatus status = executeAdminTask();
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
-
- status = executeAntTask();
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- return status;
- }
-
- protected IStatus executeAntTask()
- {
- final class DeployTask extends AdminClientTask
- {
- public DeployTask()
- {
- super.setProject(new Project());
- super.getProject().init();
- super.setTaskType("axis"); //$NON-NLS-1$
- super.setTaskName("axis-admin"); //$NON-NLS-1$
- super.setOwningTarget(new Target());
- }
- }
-
- DeployTask adminClient = new DeployTask();
- String url = javaWSDLParam.getProjectURL() + AxisDeployCommand.SERVICE_EXT;
- adminClient.setUrl(url);
- adminClient.setXmlFile(new File(javaWSDLParam.getDeploymentFiles()[0]));
-
- // Since the admin server may not be available right away we will try
- // several times to execute it.
- try
- {
- BuildException lastException = null;
-
- for( int index = 0; index < 20; index++ )
- {
- try
- {
- lastException = null;
- adminClient.execute();
- }
- catch( BuildException exc )
- {
- lastException = exc;
-
- try
- {
- Thread.sleep( 200 );
- }
- catch( InterruptedException threadException )
- {
- }
- }
-
- // If no exception occured then we should break out of the loop.
- if( lastException == null ) break;
- }
-
- // If after many tries we still get an exception, then we will re throw it.
- if( lastException != null ) throw lastException;
- }
- catch (BuildException e)
- {
- e.printStackTrace();
- String message = e.getMessage();
- if (e.getCause() != null)
- {
- message = e.getCause().toString();
- }
-
- IStatus[] childStatus = new Status[1];
- childStatus[0] = StatusUtils.errorStatus( message);
- return StatusUtils.multiStatus(AxisConsumptionCoreMessages.MSG_ERROR_AXIS_DEPLOY, childStatus);
- }
- return Status.OK_STATUS;
-
- }
-
- protected IStatus executeAdminTask(){
-
- IStatus status = Status.OK_STATUS;
- // check if server-config.wsdd exists
- IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_ );
- outputRoot = J2EEUtils.getOutputContainerRoot( component );
- IPath path = new Path( "WEB-INF" ).append( "server-config.wsdd" );
- IFile descriptorFile = outputRoot.getFile( path );
-
- if (!descriptorFile.exists()){
- status = createServerConfigFile();
- if (status.getSeverity()==Status.ERROR)
- return status;
- }
-
- // check if deploy.wsdd exists
- String deployWSDD = javaWSDLParam.getDeploymentFiles()[0];
- File deployFile = new File(deployWSDD);
- if (deployFile==null || !deployFile.exists()){
- return status;
- }
-
- try {
- // get Classpath
- String jarsCP = new String();
- // classes dir
- IPath classesPath = new Path("WEB-INF").append("classes");
- IFile classesDir = outputRoot.getFile(classesPath);
- jarsCP = "\""+classesDir.getRawLocation().toOSString()+"\"";
-
- // lib JARs
- IPath libPath = new Path("WEB-INF").append("lib");
- IFile libEntry = outputRoot.getFile(libPath);
- IFolder libFolder = (IFolder)ResourceUtils.findResource(libEntry.getFullPath());
- IResource[] JARfiles = libFolder.members();
- for (int i=0;i<JARfiles.length;i++){
- IResource res = JARfiles[i];
- if (res.getFileExtension().equals("jar")){
- jarsCP = jarsCP + ";\""+ res.getRawLocation().toOSString()+"\"";
- }
- }
-
- // form and run utils.Admin command
- String adminCommand = new String("java -Daxis.ServerConfigFile="+ descriptorFile.getRawLocation().toOSString()
- +" -cp "+jarsCP+" org.apache.axis.utils.Admin server "+deployFile.getCanonicalPath());
- Runtime.getRuntime().exec(adminCommand);
-
- }
- catch(Exception e){
- System.setProperty(AXIS_SERVER_CONFIG_FILE,"server-conifg.wsdd");
- e.printStackTrace();
- String message = e.getMessage();
- if (e.getCause() != null)
- {
- message = e.getCause().toString();
- }
-
- IStatus[] childStatus = new Status[1];
- childStatus[0] = StatusUtils.errorStatus( message);
- return StatusUtils.multiStatus(AxisConsumptionCoreMessages.MSG_ERROR_AXIS_DEPLOY, childStatus);
- }
-
- return status;
- }
-
- /**t
- * Creates the initial server-config.wsdd file from a template in Axis
- * @return
- */
- private IStatus createServerConfigFile(){
- try{
-
- // server-config.wsdd file
- IPath path = new Path( "WEB-INF" ).append( "server-config.wsdd" );
- IFile descriptorFile = outputRoot.getFile( path );
-
- // create the initial server-config.wsdd file
- AxisEngine preEngine = new AxisServer();
- InputStream is = ClassUtils.getResourceAsStream(preEngine.getClass(), "server-config.wsdd");
- FileOutputStream fos = new FileOutputStream(descriptorFile.getRawLocation().toOSString());
- ResourceUtils.copyStream(is, fos);
- fos.close();
-
- return Status.OK_STATUS;
- }
- catch(Exception e){
- e.printStackTrace();
- String message = e.getMessage();
- if (e.getCause() != null)
- {
- message = e.getCause().toString();
- }
-
- IStatus[] childStatus = new Status[1];
- childStatus[0] = StatusUtils.errorStatus( message);
- return StatusUtils.multiStatus(AxisConsumptionCoreMessages.MSG_ERROR_AXIS_DEPLOY, childStatus);
-
- }
- }
-
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam = javaWSDLParam;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
deleted file mode 100644
index 621abe3e7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060106 121199 jesper@selskabet.org - Jesper Møller
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070813 188999 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask;
-import org.apache.axis.tools.ant.wsdl.NamespaceMapping;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterDefaults;
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Commands are executable, undoable, redoable objects.
- * Every Command has a name and a description.
- */
-
-public class Java2WSDLCommand extends AbstractDataModelOperation
-{
-
- private JavaWSDLParameter javaWSDLParam_;
- private File tempOutputWsdlFile;
- private final String TEMP = "temp"; //$NON-NLS-1$
- private final String WSDL_EXT = ".wsdl"; //$NON-NLS-1$
-
- public Java2WSDLCommand() {
- }
- /**
- * Constructor for Java2WSDLCommand.
- */
- public Java2WSDLCommand(JavaWSDLParameter javaWSDLParam) {
- super();
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status;
- if (javaWSDLParam_ == null) {
- status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (javaWSDLParam_.getBeanName() == null) {
- status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- ProgressUtils.report(monitor, NLS.bind(AxisConsumptionCoreMessages.MSG_GENERATE_WSDL, javaWSDLParam_.getBeanName() ));
-
- return executeAntTask(environment, monitor);
- }
-
- protected IStatus executeAntTask(IEnvironment environment, IProgressMonitor monitor) {
-
- final class Emitter extends Java2WsdlAntTask {
- public Emitter() {
- super.setProject(new Project());
- super.getProject().init();
- super.setTaskType("axis"); //$NON-NLS-1$
- super.setTaskName("axis-java2wsdl"); //$NON-NLS-1$
- super.setOwningTarget(new Target());
- }
- }
-
- IStatus status = Status.OK_STATUS;
- ILog envLog = environment.getLog();
- Emitter emitter = new Emitter();
- emitter.createClasspath().setPath(javaWSDLParam_.getClasspath());
- envLog.log(ILog.INFO, 5008, this, "executeAntTask", "Class Path = "+ javaWSDLParam_.getClasspath());
-
- emitter.setPortTypeName(javaWSDLParam_.getPortTypeName());
- envLog.log(ILog.INFO, 5009, this, "executeAntTask", "Port Type Name = "+ javaWSDLParam_.getPortTypeName());
-
- emitter.setServiceElementName(javaWSDLParam_.getServiceName());
- envLog.log(ILog.INFO, 5010, this, "executeAntTask", "Service Name = "+ javaWSDLParam_.getServiceName());
-
- emitter.setLocation(javaWSDLParam_.getUrlLocation());
- envLog.log(ILog.INFO, 5011, this, "executeAntTask", "URL Location = "+ javaWSDLParam_.getUrlLocation());
-
- emitter.setMethods(javaWSDLParam_.getMethodString());
- envLog.log(ILog.INFO, 5012, this, "executeAntTask", "Methods = "+ javaWSDLParam_.getMethodString());
-
- emitter.setStyle(javaWSDLParam_.getStyle());
- envLog.log(ILog.INFO, 5013, this, "executeAntTask", "Style = "+ javaWSDLParam_.getStyle());
-
- emitter.setUse(javaWSDLParam_.getUse());
- envLog.log(ILog.INFO, 5014, this, "executeAntTask", "Use = "+ javaWSDLParam_.getUse());
-
- // create temporary directory to use as output directory for java2wsdl
- IPath pluginStateLoc = WebServiceAxisConsumptionCorePlugin.getInstance().getStateLocation();
- File tempDir = new File(pluginStateLoc.toString());
- File newTempFile = null;
- try {
- newTempFile = File.createTempFile(TEMP, WSDL_EXT, tempDir);
- tempOutputWsdlFile = newTempFile;
- } catch (Exception e) {
- tempOutputWsdlFile = new File (pluginStateLoc.append(TEMP+WSDL_EXT).toString());
- }
-
- emitter.setOutput(tempOutputWsdlFile);
-
- envLog.log(ILog.INFO, 5015, this, "executeAntTask", "WSDL Location = "+ javaWSDLParam_.getOutputWsdlLocation());
-
- emitter.setNamespace(javaWSDLParam_.getNamespace());
- envLog.log(ILog.INFO, 5016, this, "executeAntTask", "Name Space = "+ javaWSDLParam_.getNamespace());
-
- emitter.setClassName(javaWSDLParam_.getBeanName());
- envLog.log(ILog.INFO, 5017, this, "executeAntTask", "Bean name = "+ javaWSDLParam_.getBeanName());
-
- emitter.setImplClass(javaWSDLParam_.getBeanName());
-
- AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
-
- if (context.isUseInheritedMethodsEnabled() != AxisEmitterDefaults.getUseInheritedMethodsDefault())
- {
- emitter.setUseInheritedMethods(context.isUseInheritedMethodsEnabled());
- envLog.log(ILog.INFO, 5099, this, "executeAntTask", " set UseInheritedMethods : " + context.isUseInheritedMethodsEnabled() );
- }
-
- HashMap mappings = javaWSDLParam_.getMappings();
- if(mappings != null){
- Iterator keys = mappings.keySet().iterator();
- while(keys.hasNext()){
- String pakage = (String)keys.next();
- String namespace = (String)mappings.get(pakage);
- NamespaceMapping map = new NamespaceMapping();
- map.setPackage(pakage);
- map.setNamespace(namespace);
- emitter.addMapping(map);
- }
- }
-
-
- try {
- emitter.execute();
- status = moveGeneratedWSDL(environment, monitor);
- } catch (BuildException e) {
- envLog.log(ILog.ERROR, 5018, this, "executeAntTask", e);
- status = StatusUtils.errorStatus(
- AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_GENERATE + " " //$NON-NLS-1$
- +e.getCause().toString(), e.getCause());
- environment.getStatusHandler().reportError(status);
- return status;
- } finally {
- if (tempOutputWsdlFile.exists()) {
- tempOutputWsdlFile.delete();
- }
- }
- return status;
-
- }
-
- public IStatus moveGeneratedWSDL(IEnvironment environment,
- IProgressMonitor monitor) {
- IStatus status = Status.OK_STATUS;
- FileInputStream finStream = null;
-
- ResourceContext context = ((BaseEclipseEnvironment)environment).getResourceContext();
- IStatusHandler statusHandler = environment.getStatusHandler();
-
- String outputWsdlLocation = javaWSDLParam_.getOutputWsdlLocation();
- IPath targetPath = new Path(outputWsdlLocation);
- try {
- finStream = new FileInputStream(tempOutputWsdlFile);
- if (finStream != null) {
- FileResourceUtils.createFileAtLocation(context, targetPath.makeAbsolute(), finStream,
- monitor, statusHandler);
- finStream.close();
- }
- } catch (Exception e) {
- status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE,new String[]{e.getLocalizedMessage()}), e);
- environment.getStatusHandler().reportError(status);
- } finally {
- try {
- if (finStream != null) {
- finStream.close();
- }
- } catch (IOException e) {
- }
- }
- return status;
- }
-
- public Status undo(IEnvironment environment) {
- return null;
- }
-
- public Status redo(IEnvironment environment) {
- return null;
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParm) {
- this.javaWSDLParam_ = javaWSDLParm;
- }
-
- public String getWsdlURI()
- {
- File file = new File(getJavaWSDLParam().getOutputWsdlLocation());
- String url = "";
- try {
- url = file.toURL().toString();
- }
- catch(MalformedURLException mue){}
- return url;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
deleted file mode 100644
index 87574b2b0..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * yyyymmdd bug Email and other contact information
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- * 20060404 134791 andyzhai@ca.ibm.com - Andy Zhai
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070813 188999 pmoogk@ca.ibm.com - Peter Moogk
- * 20070927 204649 kelvinhc@ca.ibm.com - Kelvin Cheung
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.axis.constants.Scope;
-import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.GeneratedFileInfo;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterDefaults;
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class WSDL2JavaCommand extends AbstractDataModelOperation {
-
- private final String DEPLOY_TYPE = "deploy"; //$NON-NLS-1$
- private final String UNDEPLOY_TYPE = "undeploy"; //$NON-NLS-1$
- private final String TEMP = "temp"; //$NON-NLS-1$
- private JavaWSDLParameter javaWSDLParam;
- private String wsdlURI;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
- private List deployFiles;
- private List javaFiles;
- private File tempOutputFile;
-
- public WSDL2JavaCommand() {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- ILog envLog = environment.getLog();
- IStatus status;
- if (javaWSDLParam == null) {
- status = StatusUtils.errorStatus(
- AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (wsdlURI != null) //bottom up case has already has the correct WSDL on javaWSDLParam
- {
- javaWSDLParam.setInputWsdlLocation(wsdlURI);
- }
- javaWSDLParam.setHTTPUsername(httpBasicAuthUsername);
- javaWSDLParam.setHTTPPassword(httpBasicAuthPassword);
-
- Emitter wsdl2Java = new Emitter();
- if (envLog.isEnabled("emitter")) {
- wsdl2Java.setVerbose(true);
- } else {
- wsdl2Java.setVerbose(false);
- }
- boolean serverSide = javaWSDLParam.getServerSide() == JavaWSDLParameter.SERVER_SIDE_BEAN;
- wsdl2Java.setServerSide(serverSide);
- if (serverSide) {
- wsdl2Java.setSkeletonWanted(javaWSDLParam.isSkeletonDeploy());
- }
-
- // create temporary directory to use as output directory for wsdl2java
- tempOutputFile = createTempDir();
- wsdl2Java.setOutputDir(tempOutputFile.toString());
-
- try {
- if (javaWSDLParam.isMetaInfOnly()) {
- // for the case Java2WSDL-WSDL2Java
- HashMap pck2nsMap = javaWSDLParam.getMappings();
- if (pck2nsMap != null) {
- HashMap ns2pckMap = new HashMap();
- Iterator keys = pck2nsMap.keySet().iterator();
- while (keys.hasNext()) {
- String pakage = (String) keys.next();
- String namespace = (String) pck2nsMap.get(pakage);
- ns2pckMap.put(namespace, pakage);
- }
- wsdl2Java.setNamespaceMap(ns2pckMap);
- }
- } else {
- // for the case WSDL2Java
- if (javaWSDLParam.getMappings() != null) {
- wsdl2Java.setNamespaceMap(javaWSDLParam.getMappings());
- }
- }
- envLog.log(ILog.INFO, 5019, this, "execute", "Java output = " + javaWSDLParam.getJavaOutput());
- if (javaWSDLParam.getHTTPPassword() != null) {
- wsdl2Java.setPassword(javaWSDLParam.getHTTPPassword());
- envLog.log(ILog.INFO, 5081, this, "execute", "password: " + javaWSDLParam.getHTTPPassword());
- }
- if (javaWSDLParam.getHTTPUsername() != null) {
- wsdl2Java.setUsername(javaWSDLParam.getHTTPUsername());
- envLog.log(ILog.INFO, 5082, this, "execute", "username: " + javaWSDLParam.getHTTPUsername());
- }
- envLog.log(ILog.INFO, 5020, this, "execute", "WSDL Location = " + javaWSDLParam.getInputWsdlLocation());
-
- // If timeout is not set, the default timeout for wsdl2java is 45 seconds.
- // The user can change the timeout value by setting
- // "-DAxisWsdl2JavaTimeout=<timeout_value_in_milliseconds>" as VM argument
- // when starting the Eclipse workbench.
- //
- // For example, enter the following command to start the Eclipse workbench
- // in order to set the Axis WSDL to Java emitter timeout to 60 seconds:
- //
- // eclipse -vmargs "-DAxisWsdl2JavaTimeout=60000"
- //
- // When AxisWsdl2JavaTimeout is set, the Axis emitter preference page timeout setting is ignored
- AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
- String wsdl2JavaTimeoutProperty = System.getProperty("AxisWsdl2JavaTimeout");
- long timeout;
- if (wsdl2JavaTimeoutProperty != null) {
- timeout = new Integer(wsdl2JavaTimeoutProperty).longValue();
- wsdl2Java.setTimeout(timeout);
- envLog.log(ILog.INFO, 5091, this, "execute", "AxisWsdl2JavaTimeout = " + timeout);
- }
- else if(context.getTimeOut() != AxisEmitterDefaults.getTimeOutDefault())
- {
- timeout = context.getTimeOut() == -1 ? -1 : context.getTimeOut()* 1000;
- wsdl2Java.setTimeout(timeout);
- envLog.log(ILog.INFO, 5100, this, "execute", "Timeout = " + timeout);
- }
- if (context.getDeployScopeType() != AxisEmitterDefaults.getDeployScopeDefault())
- {
- switch (context.getDeployScopeType())
- {
- case AxisEmitterContext.DEPLOY_SCOPE_TYPE_APPLICATION:
- wsdl2Java.setScope(Scope.APPLICATION);
- envLog.log(ILog.INFO, 5101, this, "execute", " Deploy Scope: Application" );
- break;
- case AxisEmitterContext.DEPLOY_SCOPE_TYPE_REQUEST:
- wsdl2Java.setScope(Scope.REQUEST);
- envLog.log(ILog.INFO, 5102, this, "execute", " Deploy Scope: Request" );
- break;
- case AxisEmitterContext.DEPLOY_SCOPE_TYPE_SESSTION:
- wsdl2Java.setScope(Scope.SESSION);
- envLog.log(ILog.INFO, 5103, this, "execute", " Deploy Scope: Session" );
- break;
- default:
- }
- }
-
- if (context.isAllWantedEnabled() != AxisEmitterDefaults.getAllWantedDefault())
- {
- wsdl2Java.setAllWanted(context.isAllWantedEnabled());
- envLog.log(ILog.INFO, 5104, this, "execute", " set AllWanted : " + context.isAllWantedEnabled() );
- }
-
- if (context.isHelperWantedEnabled() != AxisEmitterDefaults.getHelperWantedDefault())
- {
- wsdl2Java.setHelperWanted(context.isHelperWantedEnabled());
- envLog.log(ILog.INFO, 5105, this, "execute", " set HelperWanted : " + context.isHelperWantedEnabled() );
- }
- if (context.isWrapArraysEnabled() != AxisEmitterDefaults.getWrapArraysDefault())
- {
- wsdl2Java.setWrapArrays(context.isWrapArraysEnabled());
- envLog.log(ILog.INFO, 5106, this, "execute", " set WrapArrays : " + context.isWrapArraysEnabled() );
- }
-
- ProgressUtils.report(monitor, NLS.bind(AxisConsumptionCoreMessages.MSG_PARSING_WSDL, javaWSDLParam.getInputWsdlLocation() ) );
-
- wsdl2Java.run(javaWSDLParam.getInputWsdlLocation());
-
- javaFiles = wsdl2Java.getGeneratedFileNames();
-
- deployFiles = new ArrayList();
- if (serverSide) {
- // set deployment files
- List deploymentFiles1 = wsdl2Java.getGeneratedFileInfo().findType(DEPLOY_TYPE);
- List deploymentFiles2 = wsdl2Java.getGeneratedFileInfo().findType(UNDEPLOY_TYPE);
- if (deploymentFiles1 != null && deploymentFiles2 != null) {
- deploymentFiles1.addAll(deploymentFiles2);
- for (int i = 0; i < deploymentFiles1.size(); i++) {
- GeneratedFileInfo.Entry entry = (GeneratedFileInfo.Entry) deploymentFiles1.get(i);
- deployFiles.add(entry.fileName);
- }
- }
- javaFiles.removeAll(deployFiles);
- }
-
- status = moveGeneratedFiles(environment, monitor);
-
- } catch (Exception e) {
- envLog.log(ILog.ERROR, 5021, this, "execute", e);
- status = StatusUtils.errorStatus(
- AxisConsumptionCoreMessages.MSG_ERROR_WSDL_JAVA_GENERATE + " " //$NON-NLS-1$
- + e.toString(), e);
- environment.getStatusHandler().reportError(status);
- } finally {
- deleteDir(tempOutputFile);
- }
- return status;
- }
-
- public IStatus moveGeneratedFiles( IEnvironment environment, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- IStatusHandler statusHandler = environment.getStatusHandler();
- FileInputStream finStream = null;
-
- try {
- String outputDir, javaOutput;
- outputDir = removeFileProtocol(javaWSDLParam.getOutput());
- javaOutput = removeFileProtocol(javaWSDLParam.getJavaOutput());
-
- ResourceContext context = ((BaseEclipseEnvironment)environment).getResourceContext();
- IPath outputPath = new Path (outputDir);
-
- String fileName;
- IPath targetPath=null;
-
- String deployFile;
- Iterator iterator;
-
- String tempOutputDir = tempOutputFile.toString();
- String [] movedDeployFiles = new String [deployFiles.size()];
- iterator = deployFiles.iterator();
- int i = 0;
- while (iterator.hasNext()) {
- deployFile = (String) iterator.next();
- File source = new File(deployFile);
- finStream = new FileInputStream(source);
- if (finStream != null) {
- if (deployFile.startsWith(tempOutputDir)) {
- fileName = deployFile.substring(tempOutputDir.length());
- targetPath = outputPath.append(fileName).makeAbsolute();
- FileResourceUtils.createFileAtLocation(context,
- targetPath,
- finStream,
- monitor,
- statusHandler);
- movedDeployFiles[i++]= ResourceUtils.getWorkspaceRoot().getFileForLocation(targetPath).getLocation().toString();
- }
- finStream.close();
- }
- }
-
- javaWSDLParam.setDeploymentFiles(movedDeployFiles);
-
- IPath javaOutputPath = new Path (javaOutput);
-
- String javaFile;
- String fullClassName = null;
- String [] movedJavaFiles = new String [javaFiles.size()];
- iterator = javaFiles.iterator();
- i = 0;
- while (iterator.hasNext()) {
- javaFile = (String) iterator.next();
- File source = new File(javaFile);
- finStream = new FileInputStream(source);
- if (finStream != null) {
- // for the case Java2WSDL-WSDL2Java, no need to move Java files, just delete them
- if (!javaWSDLParam.isMetaInfOnly()) {
- // for the case WSDL2Java, move Java files to Java output directory
- if (javaFile.startsWith(tempOutputDir)) {
- fullClassName = javaFile.substring(tempOutputDir.length());
- targetPath = javaOutputPath.append(fullClassName).makeAbsolute();
- IFile file = FileResourceUtils.createFileAtLocation(context,
- targetPath,
- finStream,
- monitor,
- statusHandler);
- file.setCharset("UTF-8", monitor);
- movedJavaFiles[i++]= ResourceUtils.getWorkspaceRoot().getFileForLocation(targetPath).getLocation().toString();
- }
- }
-
- finStream.close();
- }
- }
- javaWSDLParam.setJavaFiles(movedJavaFiles);
-
- } catch (Exception e) {
- status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE,new String[]{e.getLocalizedMessage()}), e);
- statusHandler.reportError(status);
-
- } finally {
- if (finStream != null) {
- try {
- finStream.close();
- } catch (IOException e) {
- }
- }
- }
-
- return status;
- }
-
- /**
- * Deletes all files and subdirectories under dir.
- * Just ignore and keep going if delete is not successful
- *
- * @param dir directory to delete
- */
- public void deleteDir(File dir) {
- if (dir.isDirectory()) {
- String[] children = dir.list();
- for (int i = 0; i < children.length; i++) {
- deleteDir(new File(dir, children[i]));
- }
- }
- // The directory is now empty so delete it
- dir.delete();
- }
-
- /**
- * Creates a temporary directory under the plugin's state location (i.e.
- * .metadata/.plugin directory)
- *
- * @return File
- */
- private File createTempDir() {
- String pluginTempDir = WebServiceAxisConsumptionCorePlugin
- .getInstance().getStateLocation().toString();
- File tempDir = new File(pluginTempDir);
- File newTempDir = null;
- try {
- newTempDir = File.createTempFile(TEMP, "", tempDir);
- // delete the temp file and create a temp directory instead
- if (newTempDir.delete()) {
- if (newTempDir.mkdir()) {
- tempDir = newTempDir;
- }
- }
- return tempDir;
- } catch (Exception e) {
- return tempDir;
- }
- }
-
- /*
- * Hack: Axis doesn't like file URLs
- */
- private String removeFileProtocol(String s) {
- if (s.startsWith("file:")) {
- String newS = s.substring(5, s.length());
- int i = newS.indexOf(':');
- if (i != -1) {
- String protocol = newS.substring(0, i);
- int j = protocol.indexOf('/');
- int k = protocol.indexOf('\\');
- int max = Math.max(j, k);
- if (max != -1)
- newS = newS.substring(max + 1, newS.length());
- }
- return newS;
- }
- return s;
- }
-
- public Status undo(IEnvironment environment) {
- return null;
- }
-
- public Status redo(IEnvironment environment) {
- return null;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- /**
- * @param httpBasicAuthPassword
- * The httpBasicAuthPassword to set.
- */
- public void setHttpBasicAuthPassword(String httpBasicAuthPassword) {
- this.httpBasicAuthPassword = httpBasicAuthPassword;
- }
-
- /**
- * @param httpBasicAuthUsername
- * The httpBasicAuthUsername to set.
- */
- public void setHttpBasicAuthUsername(String httpBasicAuthUsername) {
- this.httpBasicAuthUsername = httpBasicAuthUsername;
- }
-
- public void setWsdlURI(String wsdlURI) {
- this.wsdlURI = wsdlURI;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParamModifier.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParamModifier.java
deleted file mode 100644
index 8afc43985..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParamModifier.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070412 177005 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.common;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.wst.command.internal.env.core.data.BeanModifier;
-import org.eclipse.wst.common.internal.environment.eclipse.FileResourceUtils;
-
-public class JavaWSDLParamModifier implements BeanModifier {
-
- public void modify(Object bean, Object propertyHolder)
- {
- JavaWSDLParameter javaWSDLParam;
- if (bean != null)
- {
- javaWSDLParam = (JavaWSDLParameter)bean;
- }
- else
- {
- javaWSDLParam = new JavaWSDLParameter();
- }
-
- //look for each known key in the map & if there, convert the properties and set on javaWSDLParam
- if (propertyHolder instanceof Map)
- {
- Map propertyMap = (Map)propertyHolder;
-
- if (propertyMap.containsKey("Use"))
- {
- javaWSDLParam.setUse((String)propertyMap.get("Use"));
- }
- if (propertyMap.containsKey("Style"))
- {
- javaWSDLParam.setStyle((String)propertyMap.get("Style"));
- }
- if (propertyMap.containsKey("JavaOutput"))
- {
- String outputLocation = (String)propertyMap.get("JavaOutput");
- int index = outputLocation.indexOf( ':' );
-
- if( index == -1 )
- {
- // A colon was not found in the string so we will assume that
- // it is a workspace relative uri for now.
- IResource resource = FileResourceUtils.findResource( new Path( outputLocation ) );
-
- if( resource == null || resource.getLocation() == null )
- {
- throw new IllegalArgumentException( AxisConsumptionCoreMessages.bind( AxisConsumptionCoreMessages.MSG_ERROR_FOLDER_NOT_FOUND,
- outputLocation ) );
- }
-
- outputLocation = resource.getLocation().toString();
- }
-
- javaWSDLParam.setJavaOutput( outputLocation );
- }
- if (propertyMap.containsKey("Methods"))
- {
- //get Method list from the map
- String methodList = (String)propertyMap.get("Methods");
-
- //tokenize the method list
- StringTokenizer tok = new StringTokenizer(methodList, " ");
- Hashtable methods = new Hashtable();
- while (tok.hasMoreTokens())
- {
- String method = (String)tok.nextToken();
-
- if( method.indexOf( '(' ) == -1 )
- {
- method = method + "()";
- }
-
- methods.put( method, new Boolean(true));
- }
- javaWSDLParam.setMethods(methods);
- }
- if (propertyMap.containsKey("Mappings"))
- {
- //get name of the file that has the mappings in it from the map
- String filename = (String)propertyMap.get("Mappings");
-
- //get the list of mapping from the file
- HashMap mappings = readMappingsFromFile(filename);
-
- javaWSDLParam.setMappings(mappings);
-
- String beanName = javaWSDLParam.getBeanName();
-
- if( beanName != null && !beanName.equals("") )
- {
- int lastDot = beanName.lastIndexOf( '.' );
- String packageName = lastDot == -1 ? null : beanName.substring( 0, lastDot );
-
- if( mappings != null && packageName != null )
- {
- String tns = (String)mappings.get( packageName );
-
- if( tns != null )
- {
- javaWSDLParam.setNamespace(tns);
- }
- }
- }
- }
- }
- }
-
- private HashMap readMappingsFromFile(String filename)
- {
- HashMap hashmap = new HashMap();
- IFile resource = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filename));
-
- if (resource != null )
- {
- try
- {
- Properties props = new Properties();
- props.load(resource.getContents());
- hashmap.putAll(props);
- }
- catch (Exception e)
- {
- // TODO Report some error here.
- }
- }
- return hashmap;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
deleted file mode 100644
index 03fa1f860..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.common;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-
-public class JavaWSDLParameter {
-
- public static final byte SERVER_SIDE_NONE = 0;
- public static final byte SERVER_SIDE_BEAN = 1;
- public static final byte SERVER_SIDE_EJB = 2;
-
- public static final String STYLE_RPC = "RPC"; //$NON-NLS-1$
- public static final String STYLE_DOCUMENT = "DOCUMENT"; //$NON-NLS-1$
- public static final String STYLE_WRAPPED = "WRAPPED"; //$NON-NLS-1$
-
- public static final String USE_LITERAL = "LITERAL"; //$NON-NLS-1$
- public static final String USE_ENCODED = "ENCODED"; //$NON-NLS-1$
-
- private String beanName = null; // The name of the Java bean
- private String classpath = null;
- // The class path for loading the bean and command execution
- private String beanPackage = null; // The package location of the bean
- private String portTypeName = null; // The name of the port type element
- private String serviceName = null; // The name of the service element
- private String outputWsdlLocation = null;
- // The output location of the WSDL file
- private String inputWsdlLocation = null;
- // The input location of the WSDL file
- private String urlLocation = null; // The URL location of the web service
- private Hashtable methods = null; // The array of method names
- private String methodString_ = ""; //$NON-NLS-1$
- //The string representation of the method array
- private String style = null;
- // The style (RPC | DOCUMENT | WRAPPED) attribute for the generated WSDL
- private String use = null;
- // The use (LITERAL | ENCODED) attribtue for the generated WSDL
- private String output = null;
- // The output location for deployment descriptors & Java code (output from WSDL2Java command)
- private String javaOutput = null;
- // The output location for Java code (output from WSDL2Java command)
- private boolean metaInfOnly = false; // META-INF-ONLY flag
- private byte serverSide = SERVER_SIDE_NONE;
- // server-side flag (SERVER_SIDE_NONE | SERVER_SIDE_BEAN | SERVER_SIDE_EJB)
- private String namespace = null;
- private boolean skeletonDeploy = true;
- private String container = null;
- private String[] deploymentFiles = null;
- private String[] javaFiles = null;
- private String projectURL = null;
- private boolean guessProjectURL = false;
- private HashMap mappingPairs;
- private String httpUsername_ = null;
- private String httpPassword_ = null;
-
- public void setContainer(String container) {
- this.container = container;
- }
-
- public String getContainer() {
- return container;
- }
-
- /**
- * Constructor for JavaWSDLParameter.
- */
- public JavaWSDLParameter() {
- }
-
- /**
- * Returns the beanName.
- * @return String
- */
- public String getBeanName() {
- return beanName;
- }
-
- public String getBeanPackage() {
- return beanPackage;
- }
-
- /**
- * Returns the portTypeName.
- * @return String
- */
- public String getPortTypeName() {
- return portTypeName;
- }
-
- /**
- * Returns the serviceName.
- * @return String
- */
- public String getServiceName() {
- return serviceName;
- }
-
- /**
- * Returns the output.
- * @return String
- */
- public String getOutput() {
- return output;
- }
-
- /**
- * Returns the methods.
- * @return String[]
- */
- public Hashtable getMethods() {
- return methods;
- }
-
- /**
- * Returns the comma seperated string represetation of the methods.
- * @return String
- */
- public String getMethodString() {
- if (methodString_.equals(""))
- {
- Enumeration e = methods.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
-
- String signature = (String) e.nextElement();
- if (((Boolean) methods.get(signature)).booleanValue()){
- int index = signature.indexOf('(');
- String name = signature.substring(0, index);
- methodString_ += name;
- }
- if (i != methods.size() -1) // this is not the last array item
- {
- methodString_ += ",";
- }
- }
- }
- return methodString_;
- }
-
- /**
- * Sets a comma separated string of methods *
- */
- public void setMethodString(String methods)
- {
- methodString_ = methods;
- }
-
- /**
- * Returns the style attribute.
- * @return String
- */
- public String getStyle() {
- return style;
- }
-
- /**
- * Returns the urlLocation.
- * @return String
- */
- public String getUrlLocation() {
- return urlLocation;
- }
-
- /**
- * Returns the use attribute.
- * @return String
- */
- public String getUse() {
- return use;
- }
-
- /**
- * Returns the outputWsdlLocation.
- * @return String
- */
- public String getOutputWsdlLocation() {
- return outputWsdlLocation;
- }
-
- /**
- * Sets the beanName.
- * @param beanName The beanName to set
- */
- public void setBeanName(String beanName) {
- this.beanName = beanName;
- }
-
- public void setBeanPackage(String beanPackage) {
- this.beanPackage = beanPackage;
- }
-
- /**
- * Sets the portTypeName.
- * @param portTypeName The portTypeName to set
- */
- public void setPortTypeName(String portTypeName) {
- this.portTypeName = portTypeName;
- }
-
- /**
- * Sets the serviceName.
- * @param serviceName The serviceName to set
- */
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-
- /**
- * Sets the output.
- * @param output The output to set
- */
- public void setOutput(String output) {
- this.output = output;
- }
-
- /**
- * Sets the methods.
- * @param methods The methods to set
- */
- public void setMethods(Hashtable methods) {
- this.methods = methods;
- }
-
- /**
- * Sets the style.
- * @param style The style to set
- */
- public void setStyle(String style) {
- this.style = style;
- }
-
- /**
- * Sets the urlLocation.
- * @param urlLocation The urlLocation to set
- */
- public void setUrlLocation(String urlLocation) {
- this.urlLocation = urlLocation;
- }
-
- /**
- * Sets the use.
- * @param use The use to set
- */
- public void setUse(String use) {
- this.use = use;
- }
-
- /**
- * Sets the outputWsdlLocation.
- * @param outputWsdlLocation The outputWsdlLocation to set
- */
- public void setOutputWsdlLocation(String wsdlLocation) {
- this.outputWsdlLocation = wsdlLocation;
- }
-
- /**
- * Returns the metaInfOnly.
- * @return boolean
- */
- public boolean isMetaInfOnly() {
- return metaInfOnly;
- }
-
- /**
- * Sets the metaInfOnly.
- * @param metaInfOnly The metaInfOnly to set
- */
- public void setMetaInfOnly(boolean metaInfOnly) {
- this.metaInfOnly = metaInfOnly;
- }
-
- /**
- * Returns the serverSide.
- * @return byte
- */
- public byte getServerSide() {
- return serverSide;
- }
-
- /**
- * Sets the serverSide.
- * @param serverSide The serverSide to set
- */
- public void setServerSide(byte serverSide) {
- this.serverSide = serverSide;
- }
-
- /**
- * Returns the inputWsdlLocation.
- * @return String
- */
- public String getInputWsdlLocation() {
- return inputWsdlLocation;
- }
-
- /**
- * Sets the inputWsdlLocation.
- * @param inputWsdlLocation The inputWsdlLocation to set
- */
- public void setInputWsdlLocation(String inputWsdlLocation) {
- this.inputWsdlLocation = inputWsdlLocation;
- }
-
- /**
- * Returns the namespace.
- * @return String
- */
- public String getNamespace() {
- return namespace;
- }
-
- /**
- * Sets the namespace.
- * @param namespace The namespace to set
- */
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- /**
- * Returns the Java output.
- * @return String
- */
- public String getJavaOutput() {
- return javaOutput;
- }
-
- /**
- * Sets the javaOutput.
- * @param javaOutput The Java output to set
- */
- public void setJavaOutput(String javaOutput) {
- this.javaOutput = javaOutput;
- }
-
- /**
- * @return
- */
- public String getClasspath() {
- return classpath;
- }
-
- /**
- * @param string
- */
- public void setClasspath(String string) {
- classpath = string;
- }
-
- /**
- * @return
- */
- public boolean isSkeletonDeploy() {
- return skeletonDeploy;
- }
-
- /**
- * @param b
- */
- public void setSkeletonDeploy(boolean b) {
- skeletonDeploy = b;
- }
-
- /**
- * @return
- */
- public String[] getDeploymentFiles() {
- return deploymentFiles;
- }
-
- /**
- * @param strings
- */
- public void setDeploymentFiles(String[] strings) {
- deploymentFiles = strings;
- }
-
- /**
- * @return
- */
- public String[] getJavaFiles() {
- return javaFiles;
- }
-
- /**
- * @param strings
- */
- public void setJavaFiles(String[] strings) {
- javaFiles = strings;
- }
-
- /**
- * @return
- */
- public String getProjectURL() {
- return projectURL;
- }
-
- /**
- * @param string
- */
- public void setProjectURL(String string) {
- projectURL = string;
- }
-
- public HashMap getMappings()
- {
- return mappingPairs;
- }
-
- public void setMappings(HashMap map)
- {
- mappingPairs = map;
- }
-
- /**
- * Returns the user name for HTTP basic authentication
- * @return String
- */
- public String getHTTPUsername()
- {
- return httpUsername_;
- }
-
- /**
- * Sets the user name for HTTP basic authentication
- * @param String
- */
- public void setHTTPUsername(String httpUsername)
- {
- httpUsername_ = httpUsername;
- }
-
- /**
- * Returns the password for HTTP basic authentication
- * @return String
- */
- public String getHTTPPassword()
- {
- return httpPassword_;
- }
-
- /**
- * @param string
- */
- public void setHTTPPassword(String httpPassword) {
- httpPassword_ = httpPassword;
- }
-
- public boolean isGuessProjectURL() {
- return guessProjectURL;
- }
-
- public void setGuessProjectURL(boolean guessProjectURL) {
- this.guessProjectURL = guessProjectURL;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/NameMappingUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/NameMappingUtils.java
deleted file mode 100644
index 061fdac56..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/NameMappingUtils.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-
-package org.eclipse.jst.ws.internal.axis.consumption.core.common;
-
-import java.util.Map;
-
-import org.apache.axis.utils.JavaUtils;
-import org.apache.axis.wsdl.toJava.Utils;
-
-public class NameMappingUtils {
-
- private NameMappingUtils() {
- }
-
- public static String getPackageName(String namespace, Map ns2pkgMap)
- {
- if (namespace != null)
- {
- if (ns2pkgMap != null)
- {
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return namespaceURI2PackageName(namespace);
- }
- else
- return "";
- }
-
- /**
- * namespaceURI2PackageName
- * @param namespaceURI
- * @return package name based on namespace
- */
- public static String namespaceURI2PackageName(String namespaceURI)
- {
- return Utils.makePackageName(namespaceURI);
- }
-
- /**
- * xmlNameToJavaClass
- * @param xmlname
- * @return Java class name
- */
- public static String xmlNameToJavaClass(String xmlname)
- {
- return Utils.xmlNameToJavaClass(xmlname);
- }
-
- /**
- * getPortName
- * @param partName
- * @return port name used by the Axis emitter
- */
- public static String getPortName(String portName)
- {
- if (!JavaUtils.isJavaId(portName))
- portName = xmlNameToJavaClass(portName);
- return portName;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/AxisEmitterContext.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/AxisEmitterContext.java
deleted file mode 100644
index e5a281e98..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/AxisEmitterContext.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.context;
-
-public interface AxisEmitterContext {
- /**
- * This constant string is used to lookup the all_wanted general preference
- * from the plugins local preferences store.
- */
- public static final String PREFERENCE_ALL_WANTED = "allWanted";
-
- /**
- * This constant string is used to lookup the helper_wanted general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_HELPER_WANTED = "helperWanted";
-
- /**
- * This constant string is used to lookup the wrap_arrays general preference
- * from the plugins local preferences store.
- */
- public static final String PREFERENCE_WRAP_ARRAYS = "wrapArrays";
-
- /**
- * This constant string is used to lookup the deploy_scope general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_DEPLOY_SCOPE = "deployScope";
-
- /**
- * This constant string is used to lookup the time_out general preference
- * from the plugins local preferences store.
- */
- public static final String PREFERENCE_TIME_OUT = "timeOut";
-
- /*
- * Ensure the order is the same as it in deployScopeTypes.setItems(...) for
- * class
- * org.eclipse.jst.ws.internal.axis.consumption.ui.preferences.AxisEmitterPreferencePage.
- */
- public static final int DEPLOY_SCOPE_TYPE_APPLICATION = 0;
-
- public static final int DEPLOY_SCOPE_TYPE_REQUEST = 1;
-
- public static final int DEPLOY_SCOPE_TYPE_SESSTION = 2;
-
- /**
- * This constant string is used to lookup the use_inherited_methods general
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_USE_INHERITED_METHODS = "useInheritedMethods";
-
- /**
- * This constant string is used to lookup the "validate against JAXRPC"
- * preference from the plugins local preferences store.
- */
- public static final String PREFERENCE_VALIDATE_AGAINST_JAXRPC = "validateAgainstJAXRPC";
-
- /**
- *
- * @param enable
- * set whether generating code for all elements is enabled.
- */
- public void setAllWantedEnabled(boolean enable);
-
- /**
- *
- * @return returns whether generating code for all elements is enabled.
- */
- public boolean isAllWantedEnabled();
-
- /**
- *
- * @param enable
- * set whether emitting separate Helper classes for meta data is
- * enabled.
- */
- public void setHelperWantedEnabled(boolean enable);
-
- /**
- *
- * @param returns
- * whether emitting separate Helper classes for meta data is
- * enabled.
- */
- public boolean isHelperWantedEnabled();
-
- /**
- *
- * @param enable
- * set whether wrapping arrays is enabled.
- */
-
- public void setWrapArraysEnabled(boolean enable);
-
- /**
- *
- * @param returns
- * whether wrapping arrays is enabled.
- */
-
- public boolean isWrapArraysEnabled();
-
- /**
- *
- * @param enable
- * set whether using inherited methods is enabled.
- */
- public void setUseInheritedMethodsEnabled(boolean enable);
-
- /**
- *
- * @param returns
- * whether using inherited methods is enabled.
- */
-
- public boolean isUseInheritedMethodsEnabled();
-
- /**
- *
- * @param enable
- * set whether JAX-RPC analysis of the service class is enabled.
- */
- public void setValidateAgainstJAXRPCEnabled(boolean enable);
-
- /**
- *
- * @param returns
- * whether JAX-RPC analysis of the service class is enabled.
- */
-
- public boolean isValidateAgainstJAXRPCEnabled();
-
- /**
- *
- * @param selection
- * set the deploy scope type.
- */
-
- public void selectDeployScopeType(int selection);
-
- /**
- *
- * @param returns
- * the deploy scope type.
- */
-
- public int getDeployScopeType();
-
- /**
- *
- * @param seconds
- * set the time out.
- */
-
- public void setTimeOut(int seconds);
-
- /**
- *
- * @param returns
- * the time out.
- */
-
- public int getTimeOut();
-
- /**
- *
- * @return returns a copy of this AxisEmitterContext.
- */
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/AxisEmitterDefaults.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/AxisEmitterDefaults.java
deleted file mode 100644
index 19adc6e1b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/AxisEmitterDefaults.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.context;
-
-public class AxisEmitterDefaults
-{
- private static final boolean PREFERENCE_ALL_WANTED_DEFAULT = false;
- private static final boolean PREFERENCE_HELPER_WANTED_DEFAULT = false;
- private static final boolean PREFERENCE_WRAP_ARRAYS_DEFAULT = false;
- private static final boolean PREFERENCE_USE_INHERITED_METHODS_DEFAULT = false;
- private static final boolean PREFERENCE_VALIDATE_AGAINST_JAXRPC = true;
- private static final int DEPLOY_SCOPE_DEFAULT = AxisEmitterContext.DEPLOY_SCOPE_TYPE_REQUEST;
- private static final int TIME_OUT_DEFAULT = 45;
-
- /**
- *
- * @return returns the default setting for generating code for all elements.
- */
- public static boolean getAllWantedDefault ()
- {
- return PREFERENCE_ALL_WANTED_DEFAULT;
- }
-
- /**
- *
- * @return returns the default setting for emitting seperate helpser class for metadata.
- */
- public static boolean getHelperWantedDefault ()
- {
- return PREFERENCE_HELPER_WANTED_DEFAULT;
- }
-
- /**
- *
- * @return returns the default seting for wrapping arrays.
- */
- public static boolean getWrapArraysDefault()
- {
- return PREFERENCE_WRAP_ARRAYS_DEFAULT;
- }
-
- /**
- *
- * @return returns the default setting for using inherited methods.
- */
- public static boolean getUseInheritedMethodsDefault()
- {
- return PREFERENCE_USE_INHERITED_METHODS_DEFAULT;
- }
-
- /**
- *
- * @return returns the default setting for JAX-RPC validation of the service class.
- * Note: This is not a true Axis emitter preference. This preference controls whether
- * the Axis Web service bottom-up scenario analyzes the service class for compliance
- * to JAX-RPC some time before calling the emitters.
- */
- public static boolean getValidateAgainstJAXRPC()
- {
- return PREFERENCE_VALIDATE_AGAINST_JAXRPC;
- }
-
- /**
- *
- * @return returns the default setting for deploy scope type.
- */
- public static int getDeployScopeDefault()
- {
- return DEPLOY_SCOPE_DEFAULT;
- }
-
- /**
- *
- * @return returns the default setting for time out.
- */
- public static int getTimeOutDefault()
- {
- return TIME_OUT_DEFAULT;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/PersistentAxisEmitterContext.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/PersistentAxisEmitterContext.java
deleted file mode 100644
index e8543e1fe..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/context/PersistentAxisEmitterContext.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.context;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-public class PersistentAxisEmitterContext extends PersistentContext implements AxisEmitterContext
-{
- private static PersistentAxisEmitterContext context_ = null;
-
- public static PersistentAxisEmitterContext getInstance()
- {
- if (context_ == null) {
- context_ = new PersistentAxisEmitterContext();
- context_.load();
- }
-
- return context_;
- }
-
- private PersistentAxisEmitterContext()
- {
- super(WebServiceAxisConsumptionCorePlugin.getInstance());
- }
-
- public void load()
- {
- setDefault(PREFERENCE_ALL_WANTED, AxisEmitterDefaults.getAllWantedDefault());
- setDefault(PREFERENCE_HELPER_WANTED, AxisEmitterDefaults.getHelperWantedDefault());
- setDefault(PREFERENCE_WRAP_ARRAYS, AxisEmitterDefaults.getWrapArraysDefault());
- setDefault(PREFERENCE_USE_INHERITED_METHODS, AxisEmitterDefaults.getUseInheritedMethodsDefault());
- setDefault(PREFERENCE_VALIDATE_AGAINST_JAXRPC, AxisEmitterDefaults.getValidateAgainstJAXRPC());
- setDefault(PREFERENCE_DEPLOY_SCOPE, AxisEmitterDefaults.getDeployScopeDefault());
- setDefault(PREFERENCE_TIME_OUT, AxisEmitterDefaults.getTimeOutDefault());
- }
-
- public void setAllWantedEnabled(boolean enable)
- {
- setValue(PREFERENCE_ALL_WANTED, enable);
- }
-
- public boolean isAllWantedEnabled()
- {
- return getValueAsBoolean(PREFERENCE_ALL_WANTED);
- }
-
- public void setHelperWantedEnabled(boolean enable)
- {
- setValue(PREFERENCE_HELPER_WANTED, enable);
- }
-
- public boolean isHelperWantedEnabled()
- {
- return getValueAsBoolean(PREFERENCE_HELPER_WANTED);
- }
-
- public void setWrapArraysEnabled(boolean enable)
- {
- setValue(PREFERENCE_WRAP_ARRAYS, enable);
- }
-
- public boolean isWrapArraysEnabled()
- {
- return getValueAsBoolean(PREFERENCE_WRAP_ARRAYS);
- }
-
- public void setUseInheritedMethodsEnabled(boolean enable)
- {
- setValue(PREFERENCE_USE_INHERITED_METHODS, enable);
- }
-
- public boolean isUseInheritedMethodsEnabled()
- {
- return getValueAsBoolean(PREFERENCE_USE_INHERITED_METHODS);
- }
-
- public void setValidateAgainstJAXRPCEnabled(boolean enable)
- {
- setValue(PREFERENCE_VALIDATE_AGAINST_JAXRPC, enable);
- }
-
- public boolean isValidateAgainstJAXRPCEnabled()
- {
- return getValueAsBoolean(PREFERENCE_VALIDATE_AGAINST_JAXRPC);
- }
-
- public void selectDeployScopeType(int selection) {
- setValue(PREFERENCE_DEPLOY_SCOPE, selection);
- }
-
- public int getDeployScopeType() {
- return getValueAsInt(PREFERENCE_DEPLOY_SCOPE);
- }
-
- public void setTimeOut(int seconds) {
- setValue(PREFERENCE_TIME_OUT, seconds);
- }
-
- public int getTimeOut() {
- return getValueAsInt(PREFERENCE_TIME_OUT);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisServicesSaxHandler.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisServicesSaxHandler.java
deleted file mode 100644
index 3f652163c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisServicesSaxHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060517 140832 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.core.locator;
-
-import java.util.List;
-import java.util.Vector;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class AxisServicesSaxHandler extends DefaultHandler
-{
- private Vector webServicesNames = new Vector();
-
- public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException
- {
- if (localName.trim().toLowerCase().equals("service"))
- {
- for (int i = 0; i < atts.getLength(); i++)
- {
- if (atts.getLocalName(i).trim().toLowerCase().equals("name"))
- {
- String serviceName = atts.getValue(i);
- webServicesNames.add(serviceName);
- }
- }
- }
- }
-
- public List getWebServicesNames()
- {
- return this.webServicesNames;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisServletSaxHandler.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisServletSaxHandler.java
deleted file mode 100644
index 098bcc8cb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisServletSaxHandler.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060517 140832 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.core.locator;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class AxisServletSaxHandler extends DefaultHandler
-{
- private final static String AXIS_SERVLET_CLASS_NAME = "org.apache.axis.transport.http.AxisServlet";
-
- private final static String SERVLET_CLASS_NAME = "servlet-class";
-
- private boolean isThereAxisServlet = false;
-
- private String currentElement = null;
-
- public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException
- {
- currentElement = localName;
- }
-
- public void characters(char[] ch, int start, int length) throws SAXException
- {
- if ( !isThereAxisServlet && SERVLET_CLASS_NAME.equals(currentElement.trim()) && String.valueOf(ch).indexOf(AXIS_SERVLET_CLASS_NAME) > -1)
- {
- isThereAxisServlet = true;
- }
- }
-
- public boolean isThereAxisServlet()
- {
- return this.isThereAxisServlet;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisWebServiceLocator.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisWebServiceLocator.java
deleted file mode 100644
index 5c5af6016..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/AxisWebServiceLocator.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060317 127456 cbrealey@ca.ibm.com - Chris Brealey
- * 20060517 140832 andyzhai@ca.ibm.com - Andy Zhai
- * 20060620 147862 cbrealey@ca.ibm.com - Chris Brealey
- * 20060620 147864 cbrealey@ca.ibm.com - Chris Brealey
- * 20061214 165716 makandre@ca.ibm.com - Andrew Mak, Web Service finder does not locate Axis Web service deployed on certain servers
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.core.locator;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.wsrt.WebServiceJavaClientInfo;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerPort;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.ws.internal.wsfinder.AbstractWebServiceLocator;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.xml.sax.SAXException;
-
-/**
- * @author cbrealey
- * The Axis Web service locator plugs itself into the
- * Web Services Finder framework and does the job of
- * locating Axis clients and services.
- */
-public class AxisWebServiceLocator extends AbstractWebServiceLocator
-{
- private String AXIS_STUB = "org.apache.axis.client.Stub";
-
- /**
- * Searches the workspace for Axis clients as
- * identified by non-stub classes that implement
- * SEIs that are implemented by stubs that implement
- * org.apache.axis.client.Stub.
- * @param monitor A progress monitor, possibly null.
- * @return A possibly empty list of WebServiceClientInfo objects.
- */
- public List getWebServiceClients (IProgressMonitor monitor)
- {
- List list = new LinkedList();
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IJavaModel javaModel = JavaCore.create(root);
- try
- {
- javaModel.open(monitor);
- IJavaProject[] javaProjects = javaModel.getJavaProjects();
- for (int i=0; i<javaProjects.length; i++)
- {
- // We're only interested in Java projects within which
- // the Axis runtime's client "Stub" class is loadable:
- IType axisStub = javaProjects[i].findType(AXIS_STUB);
- if (axisStub != null)
- {
- // Find "Proxy" classes in the project and add to the list.
- addAxisProxies(javaProjects[i],axisStub,list,monitor);
- }
- }
- javaModel.close();
- }
- catch (Exception e)
- {
- // Fall thru and return an empty list.
- }
- return list;
- }
-
- /**
- * Searches the workspace for Axis clients as
- * identified by non-stub classes that implement
- * SEIs that are implemented by stubs that implement
- * org.apache.axis.client.Stub.
- * @param projects The projects to confine the search to.
- * @param monitor A progress monitor, possibly null.
- * @return A possibly empty list of WebServiceClientInfo objects.
- */
- public List getWebServiceClients (IProject[] projects, IProgressMonitor monitor)
- {
- if (projects == null)
- {
- return getWebServiceClients(monitor);
- }
- List list = new LinkedList();
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IJavaModel javaModel = JavaCore.create(root);
- try
- {
- javaModel.open(monitor);
- for (int i=0; i<projects.length; i++)
- {
- IJavaProject javaProject = javaModel.getJavaProject(projects[i].getName());
- // We're only interested in Java projects within which
- // the Axis runtime's client "Stub" class is loadable:
- IType axisStub = javaProject.findType(AXIS_STUB);
- if (axisStub != null)
- {
- // Find "Proxy" classes in the project and add to the list.
- addAxisProxies(javaProject,axisStub,list,monitor);
- }
- }
- javaModel.close();
- }
- catch (Exception e)
- {
- // Fall thru and return an empty list.
- }
- return list;
- }
-
- /**
- * Tries to find Axis "Proxy" classes related the given Stub.
- * @param axisStub The Axis client "Stub" from which to search.
- * @param list A list to which we'll add and WebServiceClientInfo
- * objects for "Proxy" classes we find in the search.
- */
- private void addAxisProxies (IJavaProject javaProject, IType axisStub, List list, IProgressMonitor monitor)
- {
- try
- {
- // Compute a hierarchy to help us find all the
- // generated Stub subclasses of the Axis "Stub"
- // class across the entire workspace:
- ITypeHierarchy axisStubHierarchy = axisStub.newTypeHierarchy(javaProject,monitor);
- IType[] stubs = axisStubHierarchy.getSubtypes(axisStub);
- for (int s=0; s<stubs.length; s++)
- {
- // For each stub, find all its super-interfaces of which
- // there should be one, namely the generated SEI:
- IType seis[] = axisStubHierarchy.getSuperInterfaces(stubs[s]);
- for (int i=0; i<seis.length; i++)
- {
- try
- {
- // Compute a hierarchy to help us find all the
- // generated classes that implement the SEI
- // confined to the current project:
- ITypeHierarchy seiHierarchy = seis[i].newTypeHierarchy(javaProject,monitor);
- IType[] proxies = seiHierarchy.getSubtypes(seis[i]);
- for (int p=0; p<proxies.length; p++)
- {
- // Under normal circumstances we should find two subclasses:
- // 1. The generated stub that got us here (two loops above).
- // 2. The generated "Proxy" that we're looking for.
- // Skip #1 and capture #2:
- if (!proxies[p].getFullyQualifiedName().equals(stubs[s].getFullyQualifiedName()))
- {
- WebServiceClientInfo wscInfo = newWebServiceClientInfo(proxies[p]);
- if (wscInfo != null)
- {
- list.add(wscInfo);
- }
- }
- }
- }
- catch (Exception e)
- {
- // We'll land here if the JDT was unable to compute
- // a type hierarchy for the current SEI.
- // This should never happen, but if it does,
- // there's not much we can do except bypass the SEI
- // and loop on to the next one.
- }
- }
- }
- }
- catch (Exception e)
- {
- // We'll land here if JDT was unable to compute
- // a type hierarchy for the Axis client "Stub" class.
- // This should never happen, but if it does,
- // there's not much we can do except bail out, having
- // added nothing to the list.
- }
- }
-
- /**
- * Creates a new WebServiceClientInfo object for a
- * JDT IType object representing a generated Proxy.
- * @param axisProxy The IType of the generated Proxy.
- * @return A new WebServiceClientInfo object describing the Proxy,
- * or null if the IType does not appear to describe a normal Proxy.
- */
- private WebServiceClientInfo newWebServiceClientInfo (IType axisProxy)
- {
- WebServiceJavaClientInfo wscInfo = null;
- try
- {
- IResource resource = axisProxy.getUnderlyingResource();
- if (resource != null)
- {
- IPath proxyPath = resource.getLocation();
- if (proxyPath != null)
- {
- String proxyURL = proxyPath.toFile().toURL().toString();
- wscInfo = new WebServiceJavaClientInfo();
- wscInfo.setType(axisProxy);
- wscInfo.setImplURL(proxyURL);
- }
- }
- }
- catch (Exception e)
- {
- // We'll land here if we could not convert the IType
- // into an IResource, or if we could not compute a URL
- // from that resource. Either way, it definitely isn't
- // a normal generated Proxy, so get out and return null.
- }
- return wscInfo;
- }
-
- /**
- * Searches the workspace for Axis services as
- * identified by server-config.wsdd <service> elements
- * in projects with an Axis servlet registered
- * in the web.xml descriptor.
- * @param monitor A progress monitor, possibly null.
- * @return A possibly empty list of WebServiceInfo objects.
- */
- public List getWebServices (IProgressMonitor monitor)
- {
- return getWebServices(null,monitor);
- }
-
- /**
- * Searches the workspace for Axis services as
- * identified by server-config.wsdd <service> elements
- * in projects with an Axis servlet registered
- * in the web.xml descriptor.
- * @param projects The projects to confine the search to.
- * @param monitor A progress monitor, possibly null.
- * @return A possibly empty list of WebServiceInfo objects.
- */
- public List getWebServices (IProject[] projects, IProgressMonitor monitor)
- {
- Vector webServices = new Vector();
- if (projects == null)
- {
- projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- }
- for (int i = 0; i < projects.length; i++)
- {
- // we are only intersted in dynamic web project
- if (J2EEUtils.isWebComponent(projects[i]))
- {
- try
- {
- webServices.addAll(getWebServicesFromProject(projects[i], monitor));
- }
- catch (Exception e)
- {
- // Fall thru and return an empty list.
- }
- }
- }
- return webServices;
- }
-
- /**
- * Searches for a particular web project for Axis services as
- * identified by server-config.wsdd <service> elements
- * with an Axis servlet registered
- * in the web.xml descriptor.
- * @param monitor A progress monitor, possibly null.
- * @return A possibly empty list of WebServiceInfo objects.
- */
- private List getWebServicesFromProject(IProject project, IProgressMonitor monitor) throws CoreException, ParserConfigurationException, SAXException, IOException
- {
- // Search the web.xml in fixed location
- IPath webDescriptorPath = J2EEUtils.getWebInfPath(project).append("/web.xml");
- IFile webXmlFile = ResourcesPlugin.getWorkspace().getRoot().getFile(webDescriptorPath);
-
- if (webXmlFile != null && isAxisServletExisted(webXmlFile, monitor))
- {
- // Search for all server-config.wsdd inside this project
- ServerConfigWSDDVisitor visitor = new ServerConfigWSDDVisitor();
- project.accept(visitor);
- visitor.visit(project);
- Vector wsddFiles = visitor.getWsddFiles();
- Vector servicesNames = new Vector();
- for (int i = 0; i < wsddFiles.size(); i++)
- {
- servicesNames.addAll(getWebServicesNamesFromAxisConfig((IFile)wsddFiles.get(i), monitor));
- }
- return getWebServices(project, servicesNames, monitor);
- }
- else
- {
- return new Vector();
- }
- }
-
- /*
- * Determine whether web.xml contains axis servlet
- */
- private boolean isAxisServletExisted(IFile file, IProgressMonitor monitor) throws CoreException, ParserConfigurationException, SAXException, IOException
- {
- InputStream inputStream = file.getContents();
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setNamespaceAware(true);
- SAXParser parser = factory.newSAXParser();
- AxisServletSaxHandler handler = new AxisServletSaxHandler();
- parser.parse(inputStream, handler);
- inputStream.close();
- return handler.isThereAxisServlet();
- }
-
- /*
- * Given a list of services, find the servers this project is associated,
- * Combine them and form various end point
- */
- private List getWebServices(IProject project, List servicesNames, IProgressMonitor monitor)
- {
- Vector webServices = new Vector();
- IServer[] servers = ServerUtil.getServersByModule(ServerUtil.getModule(project),monitor);
- for (int i = 0; i < servers.length; i++)
- {
- String host = servers[i].getHost();
- ServerPort httpPort = getHttpPort(servers[i].getServerPorts(monitor));
- if (httpPort != null)
- {
- for (int j = 0; j < servicesNames.size(); j++)
- {
- WebServiceInfo wsInfo = new WebServiceInfo();
- String endPointURL = "http://" + host + ":" + httpPort.getPort() + "/" + J2EEUtils.getFirstWebModuleName(project) + "/services/" + (String)servicesNames.get(j);
- wsInfo.setEndPointURL(endPointURL);
- wsInfo.setWsdlURL(endPointURL+"?wsdl");
- webServices.add(wsInfo);
- }
- }
- }
- return webServices;
- }
-
- /*
- * Parse the server-config.wsdd file, return a list of names of web services
- */
- private List getWebServicesNamesFromAxisConfig(IFile file, IProgressMonitor monitor) throws CoreException, ParserConfigurationException, SAXException, IOException
- {
- InputStream inputStream = file.getContents();
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setNamespaceAware(true);
- SAXParser parser = factory.newSAXParser();
- AxisServicesSaxHandler handler = new AxisServicesSaxHandler();
- parser.parse(inputStream, handler);
- inputStream.close();
- return handler.getWebServicesNames();
- }
-
- /*
- * find the right port (http) from a list or ports
- */
- private ServerPort getHttpPort(ServerPort[] ports)
- {
- for (int i = 0; i < ports.length; i++)
- {
- String protocol = ports[i].getProtocol();
- if ( protocol != null && protocol.trim().toLowerCase().equals("http")) return ports[i];
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/ServerConfigWSDDVisitor.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/ServerConfigWSDDVisitor.java
deleted file mode 100644
index 314d13f9d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/locator/ServerConfigWSDDVisitor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060517 140832 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.core.locator;
-
-import java.util.Vector;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-
-public class ServerConfigWSDDVisitor implements IResourceVisitor
-{
- private static final String AXIS_SERVER_CONFIG_FILE_NAME = "Server-config.wsdd";
- Vector wsddFiles = new Vector();
-
- public boolean visit(IResource resource)
- {
- if (resource.getType() == IResource.FILE)
- {
- if (resource.getName().equalsIgnoreCase(AXIS_SERVER_CONFIG_FILE_NAME))
- {
- wsddFiles.add((IFile)resource);
- }
- }
- return true;
- }
- public Vector getWsddFiles()
- {
- return wsddFiles;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/plugin/WebServiceAxisConsumptionCorePlugin.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/plugin/WebServiceAxisConsumptionCorePlugin.java
deleted file mode 100644
index c6cf7c666..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/plugin/WebServiceAxisConsumptionCorePlugin.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.core.plugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.PersistentAxisEmitterContext;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.osgi.framework.BundleContext;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisConsumptionCorePlugin extends Plugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID =
- "org.eclipse.jst.ws.axis.consumption.core";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceAxisConsumptionCorePlugin instance_;
- private ILog log_;
-
- private PersistentAxisEmitterContext axisEmitterContext_;
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.axis.consumption.core".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceAxisConsumptionCorePlugin() {
- super();
- if (instance_ == null) {
- instance_ = this;
- }
- log_ = EnvironmentService.getEclipseLog();
-
- }
-
- // This method is needed to keep the logging from blowing up.
- public String toString()
- {
- return ID;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceWasConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp");
- * @return The WebServiceAxisConsumptionCorePlugin singleton.
- */
- static public WebServiceAxisConsumptionCorePlugin getInstance() {
- return instance_;
- }
-
- public AxisEmitterContext getAxisEmitterContext()
- {
- if (axisEmitterContext_ == null)
- axisEmitterContext_ = PersistentAxisEmitterContext.getInstance();
- return axisEmitterContext_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- * @throws CoreException If this plugin fails to start.
- */
- public void start( BundleContext bundle ) throws CoreException {
- log_.log(ILog.INFO, 5087, this, "start", "Starting plugin org.eclipse.jst.ws.axis.consumption.core");
-
- try
- {
- super.start( bundle );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5088, this, "start", exc );
- }
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- * @throws CoreException If this plugin fails to shutdown.
- */
- public void stop( BundleContext context ) throws CoreException {
- log_.log(ILog.INFO, 5089, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.core");
-
- try
- {
- super.stop( context );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5090, this, "stop", exc );
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
deleted file mode 100644
index 196d49a46..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
deleted file mode 100644
index 849a03b73..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis-ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
deleted file mode 100644
index 12dac8571..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.consumption.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f9b73ed9d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Thu May 31 13:10:18 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index a2bb559df..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:34 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 3fb12992a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,48 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.ui; singleton:=true
-Bundle-Version: 1.0.303.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.axis.consumption.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.command;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.task;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.util;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.axis.consumption.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.apache.axis;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
deleted file mode 100644
index c772b640e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = .,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
deleted file mode 100644
index 7a4927e6a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Consumption UI
-PLUGIN_PROVIDER=Eclipse.org
-
-WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS=Java proxy
-LABEL_RUNTIME_AXIS_11=Apache Axis
-DESC_RUNTIME_AXIS_11=Apache Axis
-#
-# Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_AXIS_EMITTER=Axis Emitter
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
deleted file mode 100644
index 7c50c1792..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisClientConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand"
- class="org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisClientConfigWidgetFactory"/>
- </extension>
- <extension
- point="org.eclipse.wst.command.env.antDataMapping">
- <map
- key="ClientProjectName"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand"
- property="ClientProject"
- transform="org.eclipse.jst.ws.internal.common.StringToIProjectTransformer"/>
- <map
- key="CustomizeClientMappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand"
- property="CustomizeClientMappings"/>
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.task.ClientCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- </extension>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- name="%PREFERENCE_CATEGORY_AXIS_EMITTER"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.axis.consumption.ui.preferences.AxisEmitterPreferencePage"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.preferences.AxisEmitterPreferencePage">
- </page>
-
- </extension>
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties
deleted file mode 100644
index e8aa87065..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060216 126989 pmoogk@ca.ibm.com - Peter Moogk
-# 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
-# 20060424 120137 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-MSG_ERROR_DEFAULT_BEAN=IWAB0491E Error encountered while setting up default values for Java bean
-MSG_ERROR_WSDL_NO_DEFINITION=IWAB0495E WSDL file at {0} has no definition element
-MSG_ERROR_WSDL_NO_PORT=IWAB0496E WSDL file at {0} has no port element
-MSG_ERROR_WRITE_WSDL=IWAB0497E Error in writing WSDL file {0}
-
-#
-# Messages for CopyClientWSDLTask
-#
-MSG_ERROR_IMPORT_WSDL=IWAB0531E Error in resolving WSDL file {0}, import WSDL file must have absolute URL or relative URL in the same directory
-
-
-#
-#DefaultsForClientJavaWSDLCommand
-#
-MSG_ERROR_WSDL_LOCATION_NOT_SET=IWAB0501E WSDL location not set.
-
-#
-#AddJarsToProjectBuildPathTask
-#
-MSG_WARN_NO_JAVA_NATURE=IWAB0502W The project is not a Java project.
-MSG_ERROR_BAD_BUILDPATH=IWAB0503E Unable to update Java build path. Please check your system environment.
-
-#
-#CopyAxisJarCommand
-#
-PROGRESS_INFO_COPY_AXIS_CFG=IWAB0505I Copying Axis jar files to web project.
-MSG_ERROR_FILECOPY=IWAB0506E Error when copying Axis jar files to web project
-
-#
-#RefreshProjectTask
-#
-MSG_ERROR_REFRESH_PROJECT=IWAB0508E Unable to refresh project.
-
-#
-#WebServiceAxisProxyPage
-#
-TOOLTIP_PWJB_PAGE=Page
-TOOLTIP_PWJB_TEXT_FOLDER=Folder for proxy to be generated for the selected binding.
-TOOLTIP_PWJB_CHECKBOX_GENPROXY=Check to enable/disable the generation of a proxy.
-
-PAGE_TITLE_WS_AXIS_PROXY=Web Service Proxy Page
-PAGE_DESC_WS_AXIS_PROXY=Select generate proxy if you want to generate proxy for your service.
-CHECKBOX_GENPROXY=Generate proxy
-LABEL_FOLDER_NAME=Output folder
-
-#
-# Messages for WebSerivceAxisMappingsPage
-#
-PAGE_TITLE_WS_BEAN2XML=Web Service Package to Namespace Mapping
-PAGE_TITLE_WS_XML2PROXY=Web Service Client Namespace to Package Mapping
-PAGE_DESC_P2N_MAPPINGS=Define custom mapping for package to namespace.
-
-
-LABEL_MAPPING_PAIRS=Mapping pairs
-TABLE_COLUMN_LABEL_PACKAGE=package
-TABLE_COLUMN_LABEL_NAMESPACE=namespace
-LABEL_EXPLORE_MAPPINGS_XML2BEAN=Define custom mapping for namespace to package.
-TOOLTIP_N2P_SHOW_MAPPINGS=Define namespace to package mapping for customization.
-
-# Messages for Axis Emitter Preference Page
-TOOLTIP_PPAE_PAGE=Set preferences that control Axis Emitter.
-TOOLTIP_PPAE_CHECKBOX_ALL_WANTED=By default, code is generated only for referenced elements. \nCall bGenerateAll(true) and WSDL2Java will generate code \nfor all elements in the scope regardless of whether they are referenced. \nScope means: by default, all WSDL files; if generateImports(false),\nthen only the immediate WSDL file.
-TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED=Emits separate Helper classes for meta data.
-TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS=Prefers building beans to straight arrays for wrapped XML array types.
-TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS=If this option is selected, the Java2WSDL parser will look into extended classes to determine the list of methods to export into the WSDL file.
-TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC=If selected, the tools will examine the Java service class and its value types to determine if it satisfies important requirements of the JAX-RPC specification.
-TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE=Add scope to deploy.wsdd.
-TOOLTIP_PPAE_FIELD_TIME_OUT=Timeout in seconds (default is 45, specify -1 to disable).
-TOOLTIP_PPAE_GROUP_WSDL2JAVA=Set preferences for wsdl2java.
-TOOLTIP_PPAE_GROUP_JAVA2WSDL=Set preferences for java2wsdl.
-BUTTON_ALL_WANTED=&Generate code for all elements, even unreferenced ones
-BUTTON_HELPER_WANTED=Emits separate &helper classes for meta data
-BUTTON_WRAP_ARRAYS=Prefers building beans to straight arrays for &wrapped XML array types
-BUTTON_USE_INHERITED_METHODS=Look for allowed &methods in inherited class
-BUTTON_VALIDATE_AGAINST_JAXRPC=Analyze the service class for compliance to JAX-RPC before generating code
-LABEL_DEPLOY_SCOPE=Add &scope to deploy.wsdd:
-LABEL_TIME_OUT=&Timeout in seconds:
-GROUP_WSDL2JAVA_NAME=Wsdl2Java
-GROUP_JAVA2WSDL_NAME=Java2Wsdl
-DEPLOY_SCOPE_APPLICATION=Application
-DEPLOY_SCOPE_REQUEST=Request
-DEPLOY_SCOPE_SESSION=Session
-MSG_ERROR_INVALID_TIME_OUT=Invalid timeout! Timeout should be positive integer or -1 to disable.
-MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT=Using timeout value (in milliseconds) from JVM arguments AxisWsdl2JavaTimeout
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java
deleted file mode 100644
index 6f4038ef6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * yyyymmdd bug Email and other contact information
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AxisConsumptionUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUI";//$NON-NLS-1$
-
- private AxisConsumptionUIMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_DEFAULT_BEAN;
- public static String MSG_ERROR_WSDL_NO_DEFINITION;
- public static String MSG_ERROR_WSDL_NO_PORT;
- public static String MSG_ERROR_WRITE_WSDL;
- public static String MSG_ERROR_IMPORT_WSDL;
- public static String MSG_ERROR_WSDL_LOCATION_NOT_SET;
- public static String MSG_WARN_NO_JAVA_NATURE;
- public static String MSG_ERROR_BAD_BUILDPATH;
- public static String PROGRESS_INFO_COPY_AXIS_CFG;
- public static String MSG_ERROR_FILECOPY;
- public static String MSG_ERROR_REFRESH_PROJECT;
- public static String TOOLTIP_PWJB_PAGE;
- public static String TOOLTIP_PWJB_TEXT_FOLDER;
- public static String TOOLTIP_PWJB_CHECKBOX_GENPROXY;
- public static String PAGE_TITLE_WS_AXIS_PROXY;
- public static String PAGE_DESC_WS_AXIS_PROXY;
- public static String CHECKBOX_GENPROXY;
- public static String LABEL_FOLDER_NAME;
- public static String PAGE_TITLE_WS_BEAN2XML;
- public static String PAGE_TITLE_WS_XML2PROXY;
- public static String PAGE_DESC_P2N_MAPPINGS;
- public static String LABEL_MAPPING_PAIRS;
- public static String TABLE_COLUMN_LABEL_PACKAGE;
- public static String TABLE_COLUMN_LABEL_NAMESPACE;
- public static String LABEL_EXPLORE_MAPPINGS_XML2BEAN;
- public static String TOOLTIP_N2P_SHOW_MAPPINGS;
- public static String TOOLTIP_PPAE_PAGE;
- public static String TOOLTIP_PPAE_CHECKBOX_ALL_WANTED;
- public static String TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED;
- public static String TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS;
- public static String TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS;
- public static String TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC;
- public static String TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE;
- public static String TOOLTIP_PPAE_FIELD_TIME_OUT;
- public static String TOOLTIP_PPAE_GROUP_WSDL2JAVA;
- public static String TOOLTIP_PPAE_GROUP_JAVA2WSDL;
- public static String BUTTON_ALL_WANTED;
- public static String BUTTON_HELPER_WANTED;
- public static String BUTTON_WRAP_ARRAYS;
- public static String BUTTON_USE_INHERITED_METHODS;
- public static String BUTTON_VALIDATE_AGAINST_JAXRPC;
- public static String LABEL_DEPLOY_SCOPE;
- public static String LABEL_TIME_OUT;
- public static String GROUP_WSDL2JAVA_NAME;
- public static String GROUP_JAVA2WSDL_NAME;
- public static String DEPLOY_SCOPE_APPLICATION;
- public static String DEPLOY_SCOPE_REQUEST;
- public static String DEPLOY_SCOPE_SESSION;
- public static String MSG_ERROR_INVALID_TIME_OUT;
- public static String MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT;
- static {
- NLS.initializeMessages(BUNDLE_NAME, AxisConsumptionUIMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
deleted file mode 100644
index dd21b834d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- * AxisClientDefaultingCommand
- *
- */
-public class AxisClientDefaultingCommand extends AbstractDataModelOperation
-{
- private boolean isClientScenario_ = true;
- private boolean customizeMappings_ = false;
- private boolean generateProxy_ = true;
- private String clientRuntimeId_;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject proxyProject_ = null;
- private IProject clientProjectEAR_ = null;
- private String wsdlURL_;
- private boolean testProxySelected_;
- private IServer clientExistingServer_;
- private String clientServer_;
- private boolean clientIsExistingServer_;
- private String proxyProjectFolder_;
- private WebServicesParser webServicesParser_;
- public AxisClientDefaultingCommand( )
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- clientExistingServer_ = getServerFromServerLabel();
-// if (clientExistingServer_ != null) {
-// //TODO The following line should no longer be necessary.
-// clientExistingServer_.getServerType().getId();
-// } else {
-// //TODO get the factory id for the type.
-// }
- //javaWSDLParam
- javaWSDLParam_ = new JavaWSDLParameter();
-
- // proxyProjectFolber_
-
- webServicesParser_ = WSDLParserFactory.getWSDLParser();
- return status;
- }
-
- public void setClientRuntimeID(String clientRuntimeId) {
- clientRuntimeId_ = clientRuntimeId;
- }
-
- public String getClientRuntimeID() {
- return this.clientRuntimeId_;
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * @return Returns the clientProject.
- */
- public IProject getClientProject() {
- return proxyProject_;
- }
-
- /**
- * @param clientProject
- * The clientProject to set.
- */
- public void setClientProject(IProject clientProject) {
- this.proxyProject_ = clientProject;
- }
-
- /**
- * @return Returns the clientProjectEAR.
- */
- public IProject getClientProjectEAR() {
- return clientProjectEAR_;
- }
-
- /**
- * @param clientProjectEAR
- * The clientProjectEAR to set.
- */
- public void setClientProjectEAR(IProject clientProjectEAR) {
- this.clientProjectEAR_ = clientProjectEAR;
- }
-
- /**
- * @return Returns the testProxySelected.
- */
- public boolean getTestProxySelected() {
- return testProxySelected_;
- }
-
- /**
- * @param testProxySelected
- * The testProxySelected to set.
- */
- public void setTestProxySelected(boolean testProxySelected) {
- this.testProxySelected_ = testProxySelected;
- }
-
- /**
- * @return Returns the wsdlURL.
- */
- public String getWsdlURL() {
- return wsdlURL_;
- }
-
- /**
- * @param wsdlURL
- * The wsdlURL to set.
- */
- public void setWsdlURL(String wsdlURL) {
- this.wsdlURL_ = wsdlURL;
- }
-
- /**
- * @return Returns the clientServer.
- */
- public IServer getClientExistingServer() {
- return clientExistingServer_;
- }
-
- /**
- * @param clientServer
- * The clientServer to set.
- */
- public void setClientServer(String clientServer) {
- this.clientServer_ = clientServer;
- }
-
- /**
- * @return Returns the clientIsExistingServer.
- */
- public boolean isClientIsExistingServer() {
- return clientIsExistingServer_;
- }
-
- /**
- * @param clientIsExistingServer
- * The clientIsExistingServer to set.
- */
- public void setClientIsExistingServer(boolean clientIsExistingServer) {
- this.clientIsExistingServer_ = clientIsExistingServer;
- }
-
- public boolean getCustomizeClientMappings() {
- return customizeMappings_;
- }
-
- public void setCustomizeClientMappings(boolean value) {
- customizeMappings_ = value;
- }
-
- private IServer getServerFromServerLabel() {
- if (true)
- // rsk revisit if (clientIsExistingServer_)
- {
- // Maybe this should be in WebServiceServerRuntimeTypeRegistry
- {
- IServer[] servers = ServerCore.getServers();
- if (servers != null && servers.length!=0) {
- for (int i = 0; i < servers.length; i++) {
- IServer server = (IServer) servers[i];
- if ((server.getName()).equals(clientServer_))
- return server;
- }
- }
- }
- //
- } else {
- //TODO create the server
- }
- return null;
- }
- /**
- * @return Returns the proxyProjectFolder.
- */
- public String getProxyProjectFolder() {
- if (proxyProject_!=null) {
- proxyProjectFolder_ = ResourceUtils.getJavaSourceLocation(proxyProject_ ).toString();
- }
- return proxyProjectFolder_;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser_;
- }
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser_ = webServicesParser;
- }
- /**
- * @return Returns the generateProxy.
- */
- public boolean getGenerateProxy() {
- return generateProxy_;
- }
- /**
- * @param generateProxy The generateProxy to set.
- */
- public void setGenerateProxy(boolean generateProxy) {
- this.generateProxy_ = generateProxy;
- }
-
- /**
- * @return Returns the isClientScenario_.
- */
- public boolean getIsClientScenario()
- {
- return isClientScenario_;
- }
-
- /**
- * @param isClientScenario_ The isClientScenario_ to set.
- */
- public void setIsClientScenario(boolean isClientScenario)
- {
- isClientScenario_ = isClientScenario;
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public String getSetEndpointMethod()
- {
- return "setEndpoint";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
deleted file mode 100644
index 7c9edf127..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-
-public class AxisClientInputCommand extends AbstractDataModelOperation {
-
- private IWebServiceClient wsc_;
-
- private String clientProject_ = null;
- private String wsdlURL_;
- private String clientServer_;
- private WebServicesParser webServicesParser_;
-
- /**
- * Default CTOR
- */
- public AxisClientInputCommand() {
- }
-
- public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String project) {
- wsc_ = wsc;
- clientProject_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- wsdlURL_ = wsc_.getWebServiceClientInfo().getWsdlURL();
- clientServer_ = wsc_.getWebServiceClientInfo().getServerInstanceId();
-
- return Status.OK_STATUS;
- }
-
- public String getClientServer() {
- return clientServer_;
- }
-
- public String getClientProject() {
- return clientProject_;
- }
-
- public WebServicesParser getWebServicesParser() {
- return webServicesParser_;
- }
-
- public String getWsdlURL() {
- return wsdlURL_;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
deleted file mode 100644
index 9f729fce0..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-
-public class AxisClientOutputCommand extends AbstractDataModelOperation {
-
- private IWebServiceClient wsc_;
- private String proxyBean_;
- private String proxyEndpoint_;
-
- /**
- * Default CTOR
- */
- public AxisClientOutputCommand() {
- }
-
- public AxisClientOutputCommand(IWebServiceClient wsc, IContext context) {
- wsc_ = wsc;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
- wsc_.getWebServiceClientInfo().setProxyEndpoint(proxyEndpoint_);
- return Status.OK_STATUS;
- }
-
- public void setProxyBean(String proxyBean) {
- this.proxyBean_ = proxyBean;
- }
-
- public void setProxyEndpoint(String proxyEndpoint) {
- this.proxyEndpoint_ = proxyEndpoint;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
deleted file mode 100644
index 7a9277f76..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070815 188999 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- *
- */
-public class CopyClientWSDLCommand extends AbstractDataModelOperation
-{
-
- private String wsdlURL_;
- private String clientWSDLPathName_;
- private WebServicesParser wsParser_;
-
- public CopyClientWSDLCommand()
- {
-
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- Definition def = wsParser_.getWSDLDefinition(wsdlURL_);
- if(def==null)
- {
- status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_DEFINITION, new String[]{wsdlURL_}));
- env.getStatusHandler().reportError(status);
- return status;
- }
- IPath clientWSDLPath = new Path(clientWSDLPathName_);
- IWorkspaceRoot workspaceRoot = FileResourceUtils.getWorkspaceRoot();
- status = resolveWSDL(workspaceRoot, def, clientWSDLPath, env, monitor);
- return status;
- }
-
- private IStatus resolveWSDL(
- IWorkspaceRoot workspace,
- Definition wsdlDef,
- IPath wsdlPath,
- IEnvironment env,
- IProgressMonitor monitor) {
- try {
- writeWSDLFile(workspace, wsdlDef, wsdlPath, env, monitor);
- Map importDefs = wsdlDef.getImports();
- Set keysSet = importDefs.keySet();
- for (Iterator e = keysSet.iterator(); e.hasNext();) {
- Object keyName = e.next();
- Vector vector = (Vector) importDefs.get(keyName);
- for (int i = 0; i < vector.size(); i++) {
- Import importDef = (Import) vector.get(i);
- Definition def = importDef.getDefinition();
- String newPathString =
- wsdlPath.toString().substring(
- 0,
- wsdlPath.toString().lastIndexOf("/") + 1); //$NON-NLS-1$
- if (isInvalidImportWSDL(importDef.getLocationURI())) {
- return StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_IMPORT_WSDL,new String[]{importDef.getLocationURI()}));
- }
- IPath newPath =
- new Path(newPathString + importDef.getLocationURI());
- IStatus status = resolveWSDL(workspace, def, newPath, env, monitor);
- if (status != null
- && status.getSeverity() == Status.ERROR) {
- return status;
- }
- }
- }
- } catch (Exception e) {
- return StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WRITE_WSDL,new String[] { wsdlPath.toString() }), e);
- }
- return Status.OK_STATUS;
- }
-
- private boolean isInvalidImportWSDL(String wsdlPath) {
-
- // relative url
- if (!wsdlPath.toLowerCase().startsWith("http://")) { //$NON-NLS-1$
-
- if (wsdlPath.indexOf("/") != -1) { //$NON-NLS-1$
- if (!wsdlPath.startsWith("./")) { //$NON-NLS-1$
- return true;
- }
- }
-
- }
- return false;
- }
-
- private void writeWSDLFile(
- IWorkspaceRoot workspace,
- Definition wsdlDef,
- IPath wsdlPath,
- IEnvironment env,
- IProgressMonitor monitor)
- throws Exception {
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- //WSDLFactory wsdlFactory = WSDLFactory.newInstance();
- //WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- WSDLWriter wsdlWriter = (new org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl()).newWSDLWriter();
- wsdlWriter.writeWSDL(wsdlDef, baos);
- byte[] b = baos.toByteArray();
- ByteArrayInputStream bais = new ByteArrayInputStream(b);
-
- ResourceContext context = ((BaseEclipseEnvironment)env).getResourceContext();
-
- FileResourceUtils.createFile(
- context,
- wsdlPath.makeAbsolute(),
- bais,
- monitor,
- env.getStatusHandler());
-
- baos.close();
- bais.close();
-
- }
-
- /**
- * @param clientWSDLPathName_ The clientWSDLPathName_ to set.
- */
- public void setClientWSDLPathName(String clientWSDLPathName)
- {
- this.clientWSDLPathName_ = clientWSDLPathName;
- }
- /**
- * @param wsdlURL_ The wsdlURL_ to set.
- */
- public void setWsdlURL(String wsdlURL)
- {
- this.wsdlURL_ = wsdlURL;
- }
- /**
- * @param wsParser_ The wsParser_ to set.
- */
- public void setWsParser(WebServicesParser wsParser)
- {
- this.wsParser_ = wsParser;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
deleted file mode 100644
index 12c5ec38a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20080122 215866 trungha@ca.ibm.com - Trung Ha
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class DefaultsForClientJavaWSDLCommand extends AbstractDataModelOperation
-{
- private JavaWSDLParameter javaWSDLParam_;
- private IProject proxyProject_;
- private String WSDLServiceURL_;
- private String WSDLServicePathname_;
- private String outputFolder_;
-
- public DefaultsForClientJavaWSDLCommand()
- {
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable)
- {
- IEnvironment environment = getEnvironment();
- IStatus status;
-
- if( outputFolder_ == null )
- {
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(proxyProject_);
- outputFolder_ = paths[0].toString();
- }
-
- if (javaWSDLParam_ == null)
- {
- status = StatusUtils
- .errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- javaWSDLParam_.setMetaInfOnly(false);
- javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_NONE);
- ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(proxyProject_);
- if (mn != null)
- {
- IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_);
- // String output = PlatformUtils.getPlatformURL(webModuleServerRoot);
- String output = ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
- // String output =
- // ResourceUtils.getWorkspaceRoot().getFolder(webModuleServerRoot).getLocation().toString();
- IPath javaOutput = ResourceUtils.findResource( new Path( outputFolder_ )).getLocation();
- javaWSDLParam_.setJavaOutput(javaOutput.toString());
-
-
- IPath webModulePath = ResourceUtils.getWebComponentServerRootPath(proxyProject_);
- // output = PlatformUtils.getPlatformURL(webModulePath);
- IResource res = ResourceUtils.findResource(webModulePath);
- if (res != null) {
- output = res.getLocation().toString();
- }
- javaWSDLParam_.setOutput(output);
- }
- else
- {
- // Check if it's a plain old Java project
- if (ResourceUtils.isJavaProject(proxyProject_))
- {
- IPath output = ResourceUtils.findResource( new Path( outputFolder_ )).getLocation();
- javaWSDLParam_.setJavaOutput(output.toString());
- javaWSDLParam_.setOutput(output.toString());
- }
- else
- {
- // Not familiar with this kind of project
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- if (WSDLServicePathname_ == null)
- {
- if (WSDLServiceURL_ == null)
- {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_WSDL_LOCATION_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- else
- {
- WSDLServiceURL_ = PlatformUtils.getFileFromPlatform(WSDLServicePathname_);
- }
- javaWSDLParam_.setInputWsdlLocation(WSDLServiceURL_);
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the javaWSDLParam.
- *
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- *
- * @param javaWSDLParam
- * The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- /**
- * @param proxyProject_
- * The proxyProject_ to set.
- */
- public void setProxyProject(IProject proxyProject)
- {
- this.proxyProject_ = proxyProject;
- }
-
- /**
- * @param serviceURL_
- * The wSDLServiceURL_ to set.
- */
- public void setWSDLServiceURL(String serviceURL)
- {
- WSDLServiceURL_ = serviceURL;
- }
-
- /**
- * @param servicePathname_
- * The wSDLServicePathname_ to set.
- */
- public void setWSDLServicePathname(String servicePathname)
- {
- WSDLServicePathname_ = servicePathname;
- }
-
- public String getOutputFolder()
- {
- return outputFolder_;
- }
-
- public void setOutputFolder(String outputFolder)
- {
- outputFolder_ = outputFolder;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
deleted file mode 100644
index 1330bdddb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.plugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.osgi.framework.BundleContext;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisConsumptionUIPlugin extends Plugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID =
- "org.eclipse.jst.ws.axis.consumption.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceAxisConsumptionUIPlugin instance_;
- private ILog log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceAxisConsumptionUIPlugin() {
- super();
- if (instance_ == null) {
- instance_ = this;
- }
- log_ = EnvironmentService.getEclipseLog();
-
- }
-
- // This method is needed to keep the logging from blowing up.
- public String toString()
- {
- return ID;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceWasConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp");
- * @return The WebServiceWasConsumptionPlugin singleton.
- */
- static public WebServiceAxisConsumptionUIPlugin getInstance() {
- return instance_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- * @throws CoreException If this plugin fails to start.
- */
- public void start( BundleContext bundle ) throws CoreException {
- log_.log(ILog.INFO, 5066, this, "start", "Starting plugin org.eclipse.jst.ws.axis.consumption.ui");
-
- try
- {
- super.start( bundle );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5066, this, "start", exc );
- }
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- * @throws CoreException If this plugin fails to shutdown.
- */
- public void stop( BundleContext context ) throws CoreException {
- log_.log(ILog.INFO, 5067, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.ui");
-
- try
- {
- super.stop( context );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5066, this, "stop", exc );
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java
deleted file mode 100644
index 5b8b22deb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060329 127016 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.preferences;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterDefaults;
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-
-
-
-public class AxisEmitterPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
- /*CONTEXT_ID PPAE0001 for the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_PAGE = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0001";
- //
- private Button allWanted;
- /*CONTEXT_ID PPAE0002 for the all wanted check box on the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_CHECKBOX_ALL_WANTED = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0002";
- //
- private Button helperWanted;
- /*CONTEXT_ID PPAE0003 for helper wanted check box on the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_CHECKBOX_HELPER_WANTED = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0003";
- //
- private Button wrapArrays;
- /*CONTEXT_ID PPAE0004 for the wrap arrays check box on the Axis Emitter Preference Page*/
- private String INFOPOP_PPAE_CHECKBOX_WRAP_ARRAYS = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0004";
-
- private Combo deployScopeTypes;
- //*CONTEXT_ID PPAE0005 for the deploy scope type combo box on the Axis Emitter page*/
- private String INFOPOP_PPAE_COMBO_DEPLOY_SCOPE = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0005";
-
- private StackLayout timeOutSubCompositeStackLayout;
-
- private Text timeOutField;
- int timeOut;
- String wsdl2JavaTimeoutProperty = System.getProperty("AxisWsdl2JavaTimeout");
-
- private Text timeOutMsgText;
- /*CONTEXT_ID PPAE0006 for the time out field on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_FIELD_TIME_OUT = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0006";
-
- private Button useInheritedMethods;
- /*CONTEXT_ID PPAE0007 for the use inherited methods check box on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_CHECKBOX_USE_INHERITED_METHODS = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0007";
-
- private Button validateAgainstJAXRPC;
- /*CONTEXT_ID PPAE0010 for the "validate against JAXRPC..." check box on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0010";
-
- /*CONTEXT_ID PPAE0008 for the wsdl2java group on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_GROUP_WSDL2JAVA = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0008";
- /*CONTEXT_ID PPAE0009 for the java2wsdl group on the Axis Emitter Preference page*/
- private String INFOPOP_PPAE_GROUP_JAVA2WSDL = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0009";
-/**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
- UIUtils utils = new UIUtils( WebServiceAxisConsumptionUIPlugin.ID );
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout( layout );
- parent.setToolTipText(AxisConsumptionUIMessages.TOOLTIP_PPAE_PAGE);
- helpSystem.setHelp(parent, INFOPOP_PPAE_PAGE);
- Group wsdl2JavaGroup = utils.createGroup(parent, AxisConsumptionUIMessages.GROUP_WSDL2JAVA_NAME, AxisConsumptionUIMessages.TOOLTIP_PPAE_GROUP_WSDL2JAVA, INFOPOP_PPAE_GROUP_WSDL2JAVA, 2, 10,10);
- allWanted = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_ALL_WANTED,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_ALL_WANTED,INFOPOP_PPAE_CHECKBOX_ALL_WANTED);
-
- helperWanted = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_HELPER_WANTED,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED,INFOPOP_PPAE_CHECKBOX_HELPER_WANTED);
-
- wrapArrays = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_WRAP_ARRAYS,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS,INFOPOP_PPAE_CHECKBOX_WRAP_ARRAYS);
-
- deployScopeTypes = utils.createCombo(wsdl2JavaGroup, AxisConsumptionUIMessages.LABEL_DEPLOY_SCOPE, AxisConsumptionUIMessages.TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE, INFOPOP_PPAE_COMBO_DEPLOY_SCOPE, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
- /*
- * Ensure the order is the same as it in the fields for class
- * org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext
- */
- deployScopeTypes.setItems(new String []{AxisConsumptionUIMessages.DEPLOY_SCOPE_APPLICATION, AxisConsumptionUIMessages.DEPLOY_SCOPE_REQUEST,AxisConsumptionUIMessages.DEPLOY_SCOPE_SESSION});
-
- Label timeoutLabel = new Label(wsdl2JavaGroup, SWT.WRAP);
- timeoutLabel.setText(AxisConsumptionUIMessages.LABEL_TIME_OUT);
- timeoutLabel.setToolTipText(AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT);
-
- Composite timeOutSubComposite = utils.createComposite(wsdl2JavaGroup, 1);
- timeOutSubCompositeStackLayout = new StackLayout();
- timeOutSubComposite.setLayout(timeOutSubCompositeStackLayout);
-
- // only one of this is displayed at one time, they share infopop and tooltip text
- timeOutField = createTextField(timeOutSubComposite, null ,AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT,INFOPOP_PPAE_FIELD_TIME_OUT);
- timeOutMsgText = createTextField(timeOutSubComposite, null ,AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT,INFOPOP_PPAE_FIELD_TIME_OUT);
-
- timeOutMsgText.setEditable(false);
-
- Group java2WsdlGroup = utils.createGroup(parent, AxisConsumptionUIMessages.GROUP_JAVA2WSDL_NAME, AxisConsumptionUIMessages.TOOLTIP_PPAE_GROUP_JAVA2WSDL, INFOPOP_PPAE_GROUP_JAVA2WSDL, 2, 10,10);
- useInheritedMethods = createCheckBox(java2WsdlGroup, AxisConsumptionUIMessages.BUTTON_USE_INHERITED_METHODS,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS,INFOPOP_PPAE_CHECKBOX_USE_INHERITED_METHODS);
- validateAgainstJAXRPC = createCheckBox(java2WsdlGroup, AxisConsumptionUIMessages.BUTTON_VALIDATE_AGAINST_JAXRPC,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC,INFOPOP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC);
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- /**
- * Creates checkbox with horizontalSpan = 2 in its grid data in order to
- * match the grid layout for combo
- */
- private Button createCheckBox( Composite parent, String labelName, String tooltip, String infopop )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText(labelName);
- button.setToolTipText( tooltip );
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( button, WebServiceAxisConsumptionUIPlugin.ID + "." + infopop );
- GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- gd.horizontalSpan= 2;
- button.setLayoutData(gd);
- return button;
- }
-
- private Text createTextField(Composite parent,String labelName, String tooltip, String infopop)
- { tooltip = tooltip == null ? labelName : tooltip;
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( labelName );
- label.setToolTipText( tooltip );
- }
- Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- text.setLayoutData(data);
- text.setToolTipText(tooltip);
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( text, WebServiceAxisConsumptionUIPlugin.ID + "." + infopop );
-
- text.addModifyListener( new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- numberFieldChanged((Text) e.widget);
- }
- }
- );
- return text;
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- if(validateNumber(timeOutField.getText()).isOK())
- storeValues();
- return true;
- }
-
- protected void performApply()
- {
- performOk();
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * Initializes states of the controls using default values
- * in the preference store.
- */
- private void initializeDefaults()
- {
- allWanted.setSelection( AxisEmitterDefaults.getAllWantedDefault());
- helperWanted.setSelection( AxisEmitterDefaults.getHelperWantedDefault());
- wrapArrays.setSelection( AxisEmitterDefaults.getWrapArraysDefault());
- deployScopeTypes.select(AxisEmitterDefaults.getDeployScopeDefault());
- if (wsdl2JavaTimeoutProperty != null) timeOutField.setText(""+ getTimeOutValueWithProperty());
- else timeOutField.setText("" + AxisEmitterDefaults.getTimeOutDefault());
- useInheritedMethods.setSelection(AxisEmitterDefaults.getUseInheritedMethodsDefault());
- validateAgainstJAXRPC.setSelection(AxisEmitterDefaults.getValidateAgainstJAXRPC());
- }
-
- /**
- * Initializes states of the controls from the preference store.
- */
- private void initializeValues()
- {
- // get the persistent context from the plugin
- AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
- allWanted.setSelection( context.isAllWantedEnabled());
- helperWanted.setSelection( context.isHelperWantedEnabled());
- wrapArrays.setSelection( context.isWrapArraysEnabled());
- deployScopeTypes.select(context.getDeployScopeType());
- useInheritedMethods.setSelection( context.isUseInheritedMethodsEnabled());
- validateAgainstJAXRPC.setSelection( context.isValidateAgainstJAXRPCEnabled() );
- if (wsdl2JavaTimeoutProperty != null)
- { timeOut=getTimeOutValueWithProperty();
- //timeOutField.setEnabled(false);
- timeOutSubCompositeStackLayout.topControl = timeOutMsgText;
- timeOutMsgText.setText(AxisConsumptionUIMessages.MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT);
- }
- else
- {
- timeOut = context.getTimeOut();
- timeOutSubCompositeStackLayout.topControl = timeOutField;
- }
- timeOutField.setText(""+ timeOut);
- }
-
- /**
- * Stores the values of the controls back to the preference store.
- */
- private void storeValues()
- {
- // get the persistent context from the plugin
- AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
- context.setAllWantedEnabled( allWanted.getSelection() );
- context.setHelperWantedEnabled( helperWanted.getSelection() );
- context.setWrapArraysEnabled( wrapArrays.getSelection() );
- context.selectDeployScopeType(deployScopeTypes.getSelectionIndex());
- timeOut = Integer.parseInt(timeOutField.getText().trim());
- context.setTimeOut(timeOut);
- context.setUseInheritedMethodsEnabled( useInheritedMethods.getSelection() );
- context.setValidateAgainstJAXRPCEnabled( validateAgainstJAXRPC.getSelection() );
- }
-
- private void numberFieldChanged(Text textControl) {
- IStatus status = validateNumber(textControl.getText());
- setValid(!status.matches(IStatus.ERROR));
- applyToStatusLine(this,status);
- }
-
- private int getTimeOutValueWithProperty()
- {
- if (wsdl2JavaTimeoutProperty != null)
- { try {
- long timeOutProperty = Long.parseLong(wsdl2JavaTimeoutProperty);
- if (timeOutProperty < 0) return -1; // timeout = -1 equals never time out; treating all negative number as -1
- else return (int)Math.ceil(timeOutProperty/1000.0);
- } catch (NumberFormatException e){
- System.err.print("AxisWSDL2JavaTimeout is not a valid number");
- return AxisEmitterDefaults.getTimeOutDefault();
- }
- }
- else return AxisEmitterDefaults.getTimeOutDefault();
- }
-
- private IStatus validateNumber(String numberString)
- {
- IStatus status;
- try
- {
- int number = Integer.parseInt(numberString);
- if (number <= 0 && number != -1)
- {
- status = new Status(IStatus.ERROR, WebServiceAxisConsumptionUIPlugin.ID, IStatus.ERROR,
- AxisConsumptionUIMessages.MSG_ERROR_INVALID_TIME_OUT, null);
- }
- else
- { timeOut = number;
- status = Status.OK_STATUS;
- //we set param:message="" here, Later in
- //applyToStatusLine(), we do page.setMessage(null,type)
- status = new Status(IStatus.OK, WebServiceAxisConsumptionUIPlugin.ID, IStatus.OK, "",null);
- }
- }
- catch
- (NumberFormatException e)
- {
- status = new Status(IStatus.ERROR, WebServiceAxisConsumptionUIPlugin.ID, IStatus.ERROR,
- AxisConsumptionUIMessages.MSG_ERROR_INVALID_TIME_OUT, null);
- }
- return status;
- }
-
- private void applyToStatusLine(DialogPage page, IStatus status) {
- String message= status.getMessage();
- switch (status.getSeverity()) {
- case IStatus.OK:
- page.setMessage(null, IMessageProvider.NONE);
- page.setErrorMessage(null);
- break;
- case IStatus.WARNING:
- page.setMessage(message, IMessageProvider.WARNING);
- page.setErrorMessage(null);
- break;
- case IStatus.INFO:
- page.setMessage(message, IMessageProvider.INFORMATION);
- page.setErrorMessage(null);
- break;
- default:
- if (message.length() == 0) {
- message= null;
- }
- page.setMessage(null);
- page.setErrorMessage(message);
- break;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java
deleted file mode 100644
index 33ecbe2a8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class ClientCodeGenOperation extends AbstractDataModelOperation {
-
- private CopyAxisJarCommand copyAxisJarCommand = null;
-
- private WSDL2JavaCommand wsdl2JavaCommand = null;
- private JavaWSDLParameter javaWSDLParam;
- private String wsdlURI;
-
- private IProject project;
-
- private Stub2BeanCommand stub2BeanCommand = null;
- private WebServicesParser webServicesParser;
- private String outputFolder;
- private String proxyBean;
- private String proxyEndpoint;
-
- private RefreshProjectCommand refreshProjectCommand = null;
-
- public ClientCodeGenOperation(){
- copyAxisJarCommand = new CopyAxisJarCommand();
- wsdl2JavaCommand = new WSDL2JavaCommand();
- stub2BeanCommand = new Stub2BeanCommand();
- refreshProjectCommand = new RefreshProjectCommand();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
- IEnvironment env = getEnvironment();
- ClientWSModifyOperation buOperation = new ClientWSModifyOperation(info, env);
- try {
- buOperation.execute(monitor);
- }
- catch(CoreException ce){
- IStatus status = ce.getStatus();
- return status;
- }
- return Status.OK_STATUS;
-
- }
-
-
- private class ClientWSModifyOperation extends WorkspaceModifyOperation {
-
- private IAdaptable info = null;
- private IEnvironment env = null;
-
-
- protected ClientWSModifyOperation(IAdaptable adaptable, IEnvironment environment){
- info = adaptable;
- env = environment;
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException{
-
- IStatus status = null;
-
- // CopyAxisJarCommand
- copyAxisJarCommand.setEnvironment(env);
- copyAxisJarCommand.setProject(project);
- status = copyAxisJarCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR){
- throw new CoreException(status);
- }
-
- // WSDL2JavaCommand
- wsdl2JavaCommand.setEnvironment(env);
- wsdl2JavaCommand.setJavaWSDLParam(javaWSDLParam);
- wsdl2JavaCommand.setWsdlURI(wsdlURI);
- status = wsdl2JavaCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // Stub2BeanCommand
- stub2BeanCommand.setEnvironment(env);
- stub2BeanCommand.setWebServicesParser(webServicesParser);
- stub2BeanCommand.setOutputFolder(outputFolder);
- stub2BeanCommand.setJavaWSDLParam(javaWSDLParam);
- stub2BeanCommand.setClientProject(project);
- status = stub2BeanCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- proxyBean = stub2BeanCommand.getProxyBean();
- proxyEndpoint = stub2BeanCommand.getProxyEndpoint();
-
- // RefreshProjectCommand
- refreshProjectCommand.setEnvironment(env);
- refreshProjectCommand.setProject(project);
- status = refreshProjectCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- }
-
- }
-
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setOutputFolder(String outputFolder) {
- this.outputFolder = outputFolder;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
- public void setWsdlURI(String wsdlURI) {
- this.wsdlURI = wsdlURI;
- }
-
- public String getProxyBean() {
- return proxyBean;
- }
-
- public String getProxyEndpoint() {
- return proxyEndpoint;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
deleted file mode 100644
index c2d0fc18f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142342 kathy@ca.ibm.com - Kathy Chan
- * 20060828 155439 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070501 184505 kathy@ca.ibm.com - Kathy Chan
- * 20070502 184505 kathy@ca.ibm.com - Kathy Chan, Update JAR sizes
- * 20071102 208620 kathy@ca.ibm.com - Kathy Chan, Update JAR sizes
- * 20071102 202222 kathy@ca.ibm.com - Kathy Chan
- * 20080122 216165 kathy@ca.ibm.com - Kathy Chan
- * 20080326 224148 makandre@ca.ibm.com - Andrew Mak, Web service scenarios broke in latest builds with Equinox p2
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.common.BundleUtils;
-
-
-public class CopyAxisJarCommand extends AbstractDataModelOperation {
-
- public static String AXIS_JAR = "axis.jar"; //$NON-NLS-1$
- public static String AXIS_RUNTIME_PLUGIN_ID = "org.apache.axis"; //$NON-NLS-1$
- public static String COMMON_DISCOVERY_PLUGIN_ID = "org.apache.commons.discovery"; //$NON-NLS-1$
- public static String COMMON_DISCOVERY_JAR = "commons-discovery-0.2.jar"; //$NON-NLS-1$
- public static String JAVAX_XML_RPC_PLUGIN_ID = "javax.xml.rpc"; //$NON-NLS-1$
- public static String JAVAX_XML_RPC_JAR = "jaxrpc.jar"; //$NON-NLS-1$
- public static String JAVAX_XML_SOAP_PLUGIN_ID = "javax.xml.soap"; //$NON-NLS-1$
- public static String JAVAX_XML_SOAP_JAR = "saaj.jar"; //$NON-NLS-1$
- public static String JAVAX_WSDL_PLUGIN_ID = "javax.wsdl"; //$NON-NLS-1$
- public static String JAVAX_WSDL_JAR = "wsdl4j.jar"; //$NON-NLS-1$
- public static String COMMON_LOGGING_PLUGIN_ID = "org.apache.commons.logging"; //$NON-NLS-1$
- public static String COMMON_LOGGING_JAR = "commons-logging.jar"; //$NON-NLS-1$
- private static long AXIS_JAR_SIZE = 1588063L;
- private static long COMMON_DISCOVERY_JAR_SIZE = 71451L;
- private static long JAVAX_XML_RPC_JAR_SIZE = 32361L;
- private static long JAVAX_XML_SOAP_JAR_SIZE = 19582L;
- private static long JAVAX_WSDL_JAR_SIZE = 134085L;
- private static long COMMON_LOGGING_JAR_SIZE = 39353L;
-
-// Web Services Jars Used in previous Versions of WTP but now obsolete
- private static String[] OBSOLETE_JARS = new String[]{"commons-discovery.jar", "commons-logging-1.0.4.jar", "log4j-1.2.4.jar", "log4j-1.2.8.jar", "wsdl4j-1.5.1.jar", "axis-ant.jar"};
-
- public static String PATH_TO_JARS_IN_PLUGIN = "lib/";
-
- private IProject project;
- private Boolean projectRestartRequired_ = Boolean.FALSE;
- private IClasspathEntry[] oldClasspath;
- private ArrayList newJarNamesList = new ArrayList();
-
- /**
- * Default CTOR;
- */
- public CopyAxisJarCommand() {
- }
-
- /**
- * Execute the command
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
-
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- ProgressUtils.report(monitor, AxisConsumptionUIMessages.PROGRESS_INFO_COPY_AXIS_CFG);
-
- if (J2EEUtils.isWebComponent(project)) {
- copyAxisJarsToProject(project, status, env, monitor);
- }
- else {
- // Check if it's a plain old Java project
- if (J2EEUtils.isJavaComponent(project)) {
- status = addAxisJarsToBuildPath(project, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- else {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- }
-
- return status;
-
- }
-
- private void copyAxisJarsToProject(IProject project, IStatus status, IEnvironment env, IProgressMonitor monitor) {
-
- IPath webModulePath = J2EEUtils.getWebContentPath(project);
- if (webModulePath == null) {
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND);
- env.getStatusHandler().reportError(status);
- return;
- }
-
- deleteObsoleteJars(webModulePath);
-
-
- copyIFile(AXIS_RUNTIME_PLUGIN_ID, "lib/" + AXIS_JAR, webModulePath, "WEB-INF/lib/" + AXIS_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
- copyIFile(COMMON_DISCOVERY_PLUGIN_ID, "lib/" + COMMON_DISCOVERY_JAR, webModulePath, "WEB-INF/lib/" + COMMON_DISCOVERY_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
- copyIFile(JAVAX_XML_RPC_PLUGIN_ID, "lib/" + JAVAX_XML_RPC_JAR, webModulePath, "WEB-INF/lib/" + JAVAX_XML_RPC_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
- copyIFile(JAVAX_XML_SOAP_PLUGIN_ID, "lib/" + JAVAX_XML_SOAP_JAR, webModulePath, "WEB-INF/lib/" + JAVAX_XML_SOAP_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
- copyPluginJar(JAVAX_WSDL_PLUGIN_ID, webModulePath, "WEB-INF/lib/" + JAVAX_WSDL_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
-
- copyPluginJar(COMMON_LOGGING_PLUGIN_ID, webModulePath, "WEB-INF/lib/" + COMMON_LOGGING_JAR, status, env, monitor);
- if (status.getSeverity() == Status.ERROR) {
- return;
- }
- return;
- }
-
- /**
- *
- */
- private void copyIFile(String pluginId, String source, IPath targetPath, String targetFile, IStatus status, IEnvironment env, IProgressMonitor monitor) {
- IPath target = targetPath.append(new Path(targetFile));
- ProgressUtils.report(monitor, ConsumptionMessages.PROGRESS_INFO_COPYING_FILE);
-
- try {
- ResourceContext context = new TransientResourceContext();
- context.setOverwriteFilesEnabled(true);
- context.setCreateFoldersEnabled(true);
- context.setCheckoutFilesEnabled(true);
- URL sourceURL = BundleUtils.getURLFromBundle(pluginId, source);
- IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
- if (!resource.exists()) {
- IFile file = FileResourceUtils.createFile(context, target, sourceURL.openStream(), monitor, env.getStatusHandler());
- if ((projectRestartRequired_.booleanValue() == false) && file.exists()) {
- projectRestartRequired_ = Boolean.TRUE;
- }
-
- }
- }
- catch (Exception e) {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_FILECOPY, e);
- env.getStatusHandler().reportError(status);
-
- }
- }
-
- /**
- * Copy plugins that has been JARed
- */
- private void copyPluginJar(String pluginId, IPath targetPath, String targetFile, IStatus status, IEnvironment env, IProgressMonitor monitor) {
- IPath target = targetPath.append(new Path(targetFile));
- ProgressUtils.report(monitor, ConsumptionMessages.PROGRESS_INFO_COPYING_FILE);
-
- try {
- ResourceContext context = new TransientResourceContext();
- context.setOverwriteFilesEnabled(true);
- context.setCreateFoldersEnabled(true);
- context.setCheckoutFilesEnabled(true);
-
- File jarFile = FileLocator.getBundleFile(Platform.getBundle(pluginId));
- if (jarFile != null && jarFile.isFile()) {
- IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
-
- if (!resource.exists()) {
- InputStream is = new FileInputStream(jarFile);
- IFile file = FileResourceUtils.createFile(context, target, is, monitor, env.getStatusHandler());
- if ((projectRestartRequired_.booleanValue() == false) && file.exists()) {
- projectRestartRequired_ = Boolean.TRUE;
- }
-
- }
- }
- }
- catch (Exception e) {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_FILECOPY, e);
- env.getStatusHandler().reportError(status);
-
- }
- }
-
- /*
- * Check for any obsolete Jars in WEB-INF/lib folder Obsolete jars would
- * be found in projects migrated from older versions of WTP
- */
- private void deleteObsoleteJars(IPath webModulePath) {
- // First check for Any jars that have names that are known to be
- // obsolete
- for (int i = 0; i < OBSOLETE_JARS.length; i++) {
- IPath path = webModulePath.append("WEB-INF/lib/" + OBSOLETE_JARS[i]);
-
- IFile resource = ResourceUtils.getWorkspaceRoot().getFile(path);
- if (resource.exists()) {
- deleteResource(resource);
- }
- }
-
- // delete older JARs of the same name
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + AXIS_JAR), AXIS_JAR_SIZE);
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + COMMON_DISCOVERY_JAR), COMMON_DISCOVERY_JAR_SIZE);
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + JAVAX_XML_RPC_JAR), JAVAX_XML_RPC_JAR_SIZE);
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + JAVAX_XML_SOAP_JAR), JAVAX_XML_SOAP_JAR_SIZE);
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + JAVAX_WSDL_JAR), JAVAX_WSDL_JAR_SIZE);
- deleteOldJar(webModulePath.append("WEB-INF/lib/" + COMMON_LOGGING_JAR), COMMON_LOGGING_JAR_SIZE);
-
- }
-
- private void deleteOldJar(IPath jarPath, long jarSize) {
- IFile resource = ResourceUtils.getWorkspaceRoot().getFile(jarPath);
- if (resource.exists()) {
- // calculate the size of the resource by getting the java.io.File
- long fileSize = resource.getLocation().toFile().length();
- if (fileSize != jarSize) {
- deleteResource(resource);
- }
- }
- }
-
- private void deleteResource(IFile resource) { // delete the resource
- try {
- // System.out.println("Obsolete Jar!! " + resource.getName());
- resource.delete(true, null);
- }
- catch (Exception e) { // e.printStackTrace();
- }
- }
-
-
- /**
- * Addes Axis JARs to the build path of Java project
- *
- * @param env
- * @param monitor
- * @return
- */
- public IStatus addAxisJarsToBuildPath(IProject project, IEnvironment env, IProgressMonitor monitor) {
-
- IStatus status;
-
- try {
- getJavaProjectClasspath(env, monitor);
-
- addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + AXIS_JAR, getTheJarPath(AXIS_RUNTIME_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + AXIS_JAR));
- addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + COMMON_DISCOVERY_JAR, getTheJarPath(COMMON_DISCOVERY_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + COMMON_DISCOVERY_JAR));
- addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_RPC_JAR, getTheJarPath(JAVAX_XML_RPC_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_RPC_JAR));
- addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_SOAP_JAR, getTheJarPath(JAVAX_XML_SOAP_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_SOAP_JAR));
-
- IPath javaxWsdlJarPath = BundleUtils.getJarredPluginPath(JAVAX_WSDL_PLUGIN_ID);
- if (javaxWsdlJarPath != null) {
- addNewJarEntry(javaxWsdlJarPath.toString(), javaxWsdlJarPath);
- }
-
- IPath commonLoggingJarPath = BundleUtils.getJarredPluginPath(COMMON_LOGGING_PLUGIN_ID);
- if (commonLoggingJarPath != null) {
- addNewJarEntry(commonLoggingJarPath.toString(), commonLoggingJarPath);
- }
- updateClasspath(monitor);
- }
- catch (Exception e) {
- status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_BAD_BUILDPATH, e);
- return status;
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * @param env
- * @param monitor
- * @return The Java project classpath
- * @throws JavaModelException
- */
- private IStatus getJavaProjectClasspath(IEnvironment env, IProgressMonitor monitor) throws JavaModelException {
-
- IStatus status = Status.OK_STATUS;
-
- IJavaProject javaProject_ = null;
- oldClasspath = null;
- javaProject_ = JavaCore.create(project);
-
- oldClasspath = javaProject_.getRawClasspath();
-
- return status;
- }
-
- /**
- * Store new JAR name in newJarNamesList if it's not already on build path
- *
- * @param jarName
- * name of the JAR
- * @param jarPath
- * Absolute path to the JAR
- */
- private void addNewJarEntry(String jarName, IPath jarPath) {
-
- boolean found = false;
- for (int i = 0; i < oldClasspath.length; i++) {
- found = oldClasspath[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
- if (found) {
- break;
- }
- }
-
- if (!found) {
- newJarNamesList.add(new JarEntry(jarName, jarPath));
- }
-
- }
-
- /**
- * Update the Java project classpath adding classpath from newJarNamesList
- * to oldClasspath
- *
- * @param monitor
- * @return
- * @throws JavaModelException
- */
- private IStatus updateClasspath(IProgressMonitor monitor) throws JavaModelException {
-
- IStatus status = Status.OK_STATUS;
-
- if (newJarNamesList.size() > 0) {
- JarEntry[] newJarEntries = (JarEntry[]) newJarNamesList.toArray(new JarEntry[]{});
-
- IClasspathEntry[] newClasspath = new IClasspathEntry[oldClasspath.length + newJarEntries.length];
- int i = 0;
- // Add oldClasspath entries
- while (i < oldClasspath.length) {
- newClasspath[i] = oldClasspath[i];
- i++;
- }
-
- int m = 0;
- while (i < newClasspath.length) {
- newClasspath[i] = JavaCore.newLibraryEntry(newJarEntries[m].getJarPath(), null, null);
- m++;
- i++;
- }
-
- //
- // Then update the project classpath.
- //
-
- IJavaProject javaProject = JavaCore.create(project);
- javaProject.setRawClasspath(newClasspath, monitor);
-
- }
-
- return status;
-
- }
-
- //
- // Returns the local native pathname of the jar.
- //
- private IPath getTheJarPath(String pluginId, String theJar) throws MalformedURLException, IOException {
- if (pluginId != null) {
- URL localURL = Platform.asLocalURL(BundleUtils.getURLFromBundle(pluginId, theJar));
- return new Path(localURL.getFile());
- }
- else {
- return new Path(theJar);
- }
-
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public boolean getProjectRestartRequired() {
- return projectRestartRequired_.booleanValue();
- }
-
- public class JarEntry {
- private String jarName;
- private IPath jarPath;
-
- public JarEntry(String name, IPath path) {
- jarName = name;
- jarPath = path;
- }
-
- public String getJarName() {
- return jarName;
- }
-
- public IPath getJarPath() {
- return jarPath;
- }
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
deleted file mode 100644
index cfd7895ab..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class DefaultsForHTTPBasicAuthCommand extends AbstractDataModelOperation
-{
- private WebServicesParser webServicesParser;
- private String wsdlServiceURL;
- private JavaWSDLParameter javaWSDLParam;
-
- public DefaultsForHTTPBasicAuthCommand()
- {
- super();
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- if (wsdlServiceURL != null && wsdlServiceURL.length() > 0)
- {
- if (webServicesParser == null)
- {
- webServicesParser = new WebServicesParserExt();
- //wse.setWSParser(webServicesParser);
- }
- WebServiceEntity wsEntity = webServicesParser.getWebServiceEntityByURI(wsdlServiceURL);
- if (wsEntity == null || !wsEntity.isEntityResolved())
- {
- webServicesParser.setURI(wsdlServiceURL);
- try
- {
- webServicesParser.parse(WebServicesParser.PARSE_NONE);
- }
- catch (WWWAuthenticationException wwwae)
- {
- DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
- dialog.handleWWWAuthentication(wwwae);
- String username = dialog.getUsername();
- String password = dialog.getPassword();
- if (username != null && password != null)
- {
- webServicesParser.setHTTPBasicAuthUsername(username);
- webServicesParser.setHTTPBasicAuthPassword(password);
- try
- {
- webServicesParser.parse(WebServicesParser.PARSE_NONE);
- }
- catch (Throwable t)
- {
- }
- webServicesParser.setHTTPBasicAuthUsername(null);
- webServicesParser.setHTTPBasicAuthPassword(null);
- }
- }
- catch (Throwable t)
- {
- }
- wsEntity = webServicesParser.getWebServiceEntityByURI(wsdlServiceURL);
- }
- if (wsEntity != null && wsEntity.getType() == WebServiceEntity.TYPE_WSDL)
- {
- String httpUsername = wsEntity.getHTTPUsername();
- String httpPassword = wsEntity.getHTTPPassword();
- if (httpUsername != null && httpPassword != null)
- {
- javaWSDLParam.setHTTPUsername(httpUsername);
- javaWSDLParam.setHTTPPassword(httpPassword);
- }
- }
- }
- return Status.OK_STATUS;
- }
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- /**
- * @param wsdlServiceURL The wsdlServiceURL to set.
- */
- public void setWsdlServiceURL(String wsdlServiceURL) {
- this.wsdlServiceURL = wsdlServiceURL;
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
deleted file mode 100644
index 650b52015..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-public class RefreshProjectCommand extends AbstractDataModelOperation
-{
- private IProject project;
-
- public RefreshProjectCommand()
- {
- }
-
- /**
- * Execute RefreshProjectTask
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- try
- {
- if (project!=null)
- project.refreshLocal(IProject.DEPTH_INFINITE, new NullProgressMonitor());
- }
- catch (CoreException e)
- {
- IStatus status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_REFRESH_PROJECT, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
- return Status.OK_STATUS;
- }
-
- public IProject getProject() {
- return project;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
deleted file mode 100644
index 4bcee6bcc..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060515 118315 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.NameMappingUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class Stub2BeanCommand extends AbstractDataModelOperation
-{
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam_;
- private String discoveredWsdlPortElementName;
- private Vector portTypes_;
- private String proxyBean_;
- private String outputFolder_;
- private String proxyEndpoint_;
-
- private IProject clientProject_;
-
- public Stub2BeanCommand(){
- super();
- portTypes_ = new Vector();
- }
-
- /**
- * Execute
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- String inputWsdlLocation = javaWSDLParam_.getInputWsdlLocation();
- Definition def = webServicesParser.getWSDLDefinition(inputWsdlLocation);
- /*
- * Hack: Axis is not using a proper java.net.URL as its inputWsdlLocation.
- * We need to convert it to a proper file URL.
- */
- if (def == null)
- {
- File file = new File(inputWsdlLocation);
- if (file.exists())
- {
- try
- {
- def = webServicesParser.getWSDLDefinition(file.toURL().toString());
- }
- catch (MalformedURLException murle)
- {
- }
- }
- }
-
- //Ensure the client project is either a flexible project or a Java project
- ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(clientProject_);
- if (mn==null)
- {
- // Check if it's a plain old Java project
- if (!ResourceUtils.isJavaProject(clientProject_))
- {
- IStatus status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_WARN_NO_JAVA_NATURE);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- Map pkg2nsMapping = javaWSDLParam_.getMappings();
- Map services = def.getServices();
- for (Iterator it = services.values().iterator(); it.hasNext();)
- {
- Service service = (Service)it.next();
- String servicePkgName = NameMappingUtils.getPackageName(service.getQName().getNamespaceURI(), pkg2nsMapping);
- String serviceClassName = computeClassName(service.getQName().getLocalPart());
- String jndiName = serviceClassName;
- Map ports = service.getPorts();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- if (serviceClassName.equals(computeClassName(((Port)it2.next()).getBinding().getPortType().getQName().getLocalPart())))
- {
- serviceClassName = serviceClassName + "_Service";
- break;
- }
- }
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- if (discoveredWsdlPortElementName != null && !discoveredWsdlPortElementName.equals(port.getName()))
- continue;
- SOAPAddress soapAddress = null;
- List extensibilityElements = port.getExtensibilityElements();
- if (extensibilityElements != null)
- {
- for (Iterator it3 = extensibilityElements.iterator(); it3.hasNext();)
- {
- Object object = it3.next();
- if (object instanceof SOAPAddress)
- {
- soapAddress = (SOAPAddress)object;
- break;
- }
- }
- }
- if (soapAddress != null)
- {
- proxyEndpoint_ = soapAddress.getLocationURI();
- PortType portType = port.getBinding().getPortType();
- QName portTypeQName = portType.getQName();
- StringBuffer portTypeID = new StringBuffer();
- portTypeID.append(portTypeQName.getNamespaceURI());
- portTypeID.append("#");
- portTypeID.append(portTypeQName.getLocalPart());
- if (!portTypes_.contains(portTypeID.toString()))
- {
- portTypes_.add(portTypeID.toString());
- Stub2BeanInfo stub2BeanInfo = new Stub2BeanInfo();
- stub2BeanInfo.setClientProject(clientProject_);
- stub2BeanInfo.setOutputFolder( outputFolder_ );
- String portTypePkgName = NameMappingUtils.getPackageName(portType.getQName().getNamespaceURI(), pkg2nsMapping);
-
- /*
- * If the package name and method name are the same the Axis
- * wsdl2Java Emitter adds a "_pkg" suffix to the package name
- * of generated code.
- *
- * We need to make sure the proxy get's put in this same package
- * if an operation name is the same as the package name.
- * (Mark Hutchinson - Bug 118315)
- */
- List operations = portType.getOperations();
- Iterator operIter = operations.iterator();
- boolean addSuffix = false;
- while (operIter.hasNext())
- {
- Operation operation = (Operation)operIter.next();
- if (operation.getName().equals(portTypePkgName))
- {
- addSuffix = true;
- }
- }
- if (addSuffix) {
- portTypePkgName = portTypePkgName + "_pkg";
- servicePkgName = servicePkgName + "_pkg";
- }
-
- String portTypeClassName = computeClassName(portTypeQName.getLocalPart());
- stub2BeanInfo.setPackage(portTypePkgName);
- stub2BeanInfo.setClass(portTypeClassName + "Proxy");
- proxyBean_ = portTypePkgName+"."+portTypeClassName+"Proxy";
- if (jndiName.equals(portTypeClassName))
- portTypeClassName = portTypeClassName + "_PortType";
- stub2BeanInfo.addSEI(portTypePkgName, portTypeClassName, servicePkgName, serviceClassName, jndiName, NameMappingUtils.getPortName(port.getName()));
- try
- {
- stub2BeanInfo.write( monitor, environment.getStatusHandler() );
- if (discoveredWsdlPortElementName != null)
- {
- // The discovered port was processed. Ignore all other ports and services.
- return Status.OK_STATUS;
- }
- }
- catch (CoreException ce)
- {
- }
- catch (IOException ioe)
- {
- }
- }
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- private String computeClassName(String className)
- {
- return NameMappingUtils.xmlNameToJavaClass(className);
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
-
- /**
- * @param discoveredWsdlPortElementName The discoveredWsdlPortElementName to set.
- */
- public void setDiscoveredWsdlPortElementName(String discoveredWsdlPortElementName) {
- this.discoveredWsdlPortElementName = discoveredWsdlPortElementName;
- }
-
- /**
- * @param clientProject The clientProject to set.
- */
- public void setClientProject(IProject clientProject) {
- this.clientProject_ = clientProject;
- }
-
- /**
- * @return Returns the proxyBean.
- */
- public String getProxyBean() {
- return proxyBean_;
- }
-
- public void setOutputFolder( String outputFolder )
- {
- outputFolder_ = outputFolder;
- }
-
- public String getProxyEndpoint() {
- return proxyEndpoint_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
deleted file mode 100644
index 58805b468..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
+++ /dev/null
@@ -1,622 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- * 20060517 141481 pmoogk@ca.ibm.com - Peter Moogk
- * 20070313 176580 makandre@ca.ibm.com - Andrew Mak, Generate a Client WS Proxy accepting URL
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import com.ibm.icu.util.StringTokenizer;
-
-public class Stub2BeanInfo
-{
- private final String NEW_LINE = System.getProperty("line.separator");
-
- private int indentCount;
-
- private String package_;
- private StringBuffer imports_;
- private StringBuffer seis_;
- private StringBuffer services_;
- private StringBuffer jndiNames_;
- private StringBuffer ports_;
- private String class_;
- private Vector usedNames;
-
- private IProject clientProject_;
- private String outputFolder_;
-
- public Stub2BeanInfo()
- {
- indentCount = 0;
- package_ = null;
- imports_ = new StringBuffer();
- seis_ = new StringBuffer();
- services_ = new StringBuffer();
- jndiNames_ = new StringBuffer();
- ports_ = new StringBuffer();
- class_ = "SEIBean";
- usedNames = new Vector();
- }
-
- public void setClientProject(IProject clientProject) {
- this.clientProject_ = clientProject;
- }
-
- public void setOutputFolder( String outputFolder )
- {
- outputFolder_ = outputFolder;
- }
-
- public void setPackage(String pkgName)
- {
- package_ = pkgName;
- }
-
- public void addImports(String pkgName, String className)
- {
- imports_.append(toFullyQualifiedClassName(pkgName, className));
- imports_.append(";");
- }
-
- public void addSEI(String seiPkgName, String seiClassName, String servicePkgName, String serviceClassName, String portName)
- {
- addSEI(seiPkgName, seiClassName, servicePkgName, serviceClassName, serviceClassName, portName);
- }
-
- public void addSEI(String seiPkgName, String seiClassName, String servicePkgName, String serviceClassName, String jndiName, String portName)
- {
- seis_.append(toFullyQualifiedClassName(seiPkgName, seiClassName));
- seis_.append(";");
- services_.append(toFullyQualifiedClassName(servicePkgName, serviceClassName));
- services_.append(";");
- jndiNames_.append(jndiName);
- jndiNames_.append(";");
- ports_.append(portName);
- ports_.append(";");
- }
-
- public void setClass(String className)
- {
- class_ = className;
- }
-
- private String toFullyQualifiedClassName(String pkgName, String className)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(pkgName);
- sb.append(".");
- sb.append(className);
- return sb.toString();
- }
-
- private String getPackageName(String qname)
- {
- int index = qname.lastIndexOf(".");
- if (index != -1)
- return qname.substring(0, index);
- else
- return qname;
- }
-
- private String getClassName(String qname)
- {
- int index = qname.lastIndexOf(".");
- if (index != -1)
- return qname.substring(index+1, qname.length());
- else
- return qname;
- }
-
- private String firstCharToLowerCase(String s)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(s.substring(0, 1).toLowerCase());
- sb.append(s.substring(1, s.length()));
- return sb.toString();
- }
-
- private String getFullyQualifiedName(JavaHelpers javaHelpers)
- {
- if (javaHelpers.isPrimitive())
- return javaHelpers.getJavaName();
- else
- return javaHelpers.getQualifiedName();
- }
-
- public void write(IProgressMonitor progressMonitor, IStatusHandler statusMonitor) throws CoreException, IOException
- {
- IPath outputPath = new Path( outputFolder_ );
- IProject project = ResourceUtils.getProjectOf( outputPath );
- StringWriter sw = new StringWriter(2048);
-
- writePackage(sw);
- writeImports(sw);
- writeClass(sw);
- sw.close();
- byte[] bytes = sw.getBuffer().toString().getBytes( project.getDefaultCharset() );
- StringBuffer sb = new StringBuffer();
- if (package_ != null && package_.length() > 0)
- {
- sb.append(package_);
- sb.append(".");
- }
- sb.append(class_);
- sb = new StringBuffer(sb.toString().replace('.', '/'));
- sb.append(".java");
-
- ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-
- IPath newFilePath = new Path(outputFolder_).append( sb.toString() );
-
- FileResourceUtils.createFile(WebServicePlugin.getInstance().getResourceContext(), newFilePath, bais, progressMonitor, statusMonitor);
- }
-
- private void writePackage(Writer w) throws IOException
- {
- if (package_ != null && package_.length() > 0)
- {
- w.write("package ");
- w.write(package_);
- w.write(";");
- newLine(w);
- }
- }
-
- private void writeImports(Writer w) throws IOException
- {
- StringTokenizer st = new StringTokenizer(imports_.toString(), ";");
- while (st.hasMoreTokens())
- {
- w.write("import ");
- w.write(st.nextToken());
- w.write(";");
- newLine(w);
- }
- }
-
- private void writeClass(Writer w) throws IOException, CoreException
- {
- newLine(w);
- w.write("public class ");
- w.write(class_);
- w.write(" ");
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- if (st.hasMoreTokens())
- w.write("implements ");
- while (st.hasMoreTokens())
- {
- w.write(st.nextToken());
- if (st.hasMoreTokens())
- w.write(", ");
- }
- w.write(" {");
- incrementIndent();
- newLine(w);
- writeFieldsDeclarations(w);
- writeConstructor(w);
- writeInit(w);
- /*
- * Cannot use JNDI lookup for AXIS
- *
- writeUseJNDI(w);
- */
- writeGetSetEndpoint(w);
- writeSEIGetters(w);
- writeSEIMethods(w);
- decrementIndent();
- newLine(w);
- w.write("}");
- }
-
- private void writeFieldsDeclarations(Writer w) throws IOException
- {
- /*
- * Cannot use JNDI lookup for AXIS
- *
- w.write("private boolean _useJNDI = true;");
- newLine(w);
- */
- w.write("private String _endpoint = null;");
- usedNames.add("_endpoint");
- newLine(w);
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- w.write("private ");
- String sei = st.nextToken();
- w.write(sei);
- w.write(" ");
- String stubName = firstCharToLowerCase(getClassName(sei));
- w.write(stubName);
- usedNames.add(stubName);
- w.write(" = null;");
- newLine(w);
- }
- }
-
- private void writeConstructor(Writer w) throws IOException
- {
- newLine(w);
- w.write("public ");
- w.write(class_);
- w.write("() {");
- incrementIndent();
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
-
- newLine(w);
- w.write("public ");
- w.write(class_);
- w.write("(String endpoint) {");
- incrementIndent();
- newLine(w);
- w.write("_endpoint = endpoint;");
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
-
- private void writeInit(Writer w) throws IOException
- {
- newLine(w);
- w.write("private void _init");
- w.write(class_);
- w.write("() {");
- incrementIndent();
- newLine(w);
- w.write("try {");
- incrementIndent();
- newLine(w);
- /*
- * Cannot use JNDI lookup for AXIS
- *
- w.write("if (_useJNDI) {");
- incrementIndent();
- newLine(w);
- */
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- StringTokenizer serviceTokens = new StringTokenizer(services_.toString(), ";");
- //StringTokenizer jndiNameTokens = new StringTokenizer(jndiNames_.toString(), ";");
- StringTokenizer portTokens = new StringTokenizer(ports_.toString(), ";");
- /*
- if (st.hasMoreTokens())
- {
- w.write("javax.naming.InitialContext ctx = new javax.naming.InitialContext();");
- newLine(w);
- }
- while (st.hasMoreTokens())
- {
- w.write(firstCharToLowerCase(getClassName(st.nextToken())));
- w.write(" = ((");
- w.write(serviceTokens.nextToken());
- w.write(")ctx.lookup(\"java:comp/env/service/");
- w.write(jndiNameTokens.nextToken());
- w.write("\")).get");
- w.write(mangleClassName(portTokens.nextToken()));
- w.write("();");
- newLine(w);
- }
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- w.write("else {");
- incrementIndent();
- newLine(w);
- st = new StringTokenizer(seis_.toString(), ";");
- serviceTokens = new StringTokenizer(services_.toString(), ";");
- portTokens = new StringTokenizer(ports_.toString(), ";");
- */
- while (st.hasMoreTokens())
- {
- String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
- w.write(seiName);
- w.write(" = (new ");
- w.write(serviceTokens.nextToken());
- w.write("Locator()).get");
- w.write(portTokens.nextToken());
- w.write("();");
- newLine(w);
- w.write("if (");
- w.write(seiName);
- w.write(" != null) {");
- incrementIndent();
- newLine(w);
- w.write("if (_endpoint != null)");
- incrementIndent();
- newLine(w);
- w.write("((javax.xml.rpc.Stub)");
- w.write(seiName);
- w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
- decrementIndent();
- newLine(w);
- w.write("else");
- incrementIndent();
- newLine(w);
- w.write("_endpoint = (String)((javax.xml.rpc.Stub)");
- w.write(seiName);
- w.write(")._getProperty(\"javax.xml.rpc.service.endpoint.address\");");
- decrementIndent();
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
- /*
- decrementIndent();
- newLine(w);
- w.write("}");
- */
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- /*
- w.write("catch (javax.naming.NamingException namingException) {}");
- newLine(w);
- */
- w.write("catch (javax.xml.rpc.ServiceException serviceException) {}");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
-
- private void writeSetPropertyEndpoint(Writer w) throws IOException
- {
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
- w.write("if (");
- w.write(seiName);
- w.write(" != null)");
- incrementIndent();
- newLine(w);
- w.write("((javax.xml.rpc.Stub)");
- w.write(seiName);
- w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
- decrementIndent();
- newLine(w);
- }
- }
-
-
- private void writeSEIGetters(Writer w) throws IOException
- {
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- String sei = st.nextToken();
- String seiClassName = getClassName(sei);
- String seiFieldName = firstCharToLowerCase(seiClassName);
- newLine(w);
- w.write("public ");
- w.write(sei);
- w.write(" get");
- w.write(seiClassName);
- w.write("() {");
- incrementIndent();
- newLine(w);
- w.write("if (");
- w.write(seiFieldName);
- w.write(" == null)");
- incrementIndent();
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- w.write("return ");
- w.write(seiFieldName);
- w.write(";");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
- }
-
- private void writeSEIMethods(Writer w) throws IOException, CoreException
- {
- newLine(w);
- //WebServiceElement wse = WebServiceElement.getWebServiceElement(model_);
- if (clientProject_ == null) return;//wse.getProxyProject();
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- String sei = st.nextToken();
- JavaClass javaClass = JavaMOFUtils.getJavaClass(getPackageName(sei), getClassName(sei), clientProject_);
- if (javaClass != null)
- {
- List methods = javaClass.getMethods();
- for (Iterator it = methods.iterator(); it.hasNext();)
- {
- Method method = (Method)it.next();
- if (!method.isConstructor() && !method.isNative() && method.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
- writeSEIMethods(w, javaClass, method);
- }
- }
- }
- }
-
- private void writeSEIMethods(Writer w, JavaClass javaClass, Method method) throws IOException
- {
- w.write("public ");
- // isVoid
- if (method.isVoid())
- w.write("void ");
- else
- {
- w.write(getFullyQualifiedName(method.getReturnType()));
- w.write(" ");
- }
- // method name
- w.write(method.getName());
- w.write("(");
- // input parameters
- JavaParameter[] inputParams = method.listParametersWithoutReturn();
- for (int i = 0; i < inputParams.length; i++)
- {
- if (i > 0)
- w.write(", ");
- JavaHelpers javaHelpers = inputParams[i].getJavaType();
- w.write(getFullyQualifiedName(javaHelpers));
- w.write(" ");
- String paramName = getClassName(inputParams[i].getQualifiedName());
- w.write(getUnusedName(paramName));
- }
- w.write(")");
- // exceptions
- List exceptions = method.getJavaExceptions();
- if (!exceptions.isEmpty())
- w.write(" throws ");
- for (Iterator it = exceptions.iterator(); it.hasNext();)
- {
- JavaClass exception = (JavaClass)it.next();
- w.write(exception.getQualifiedNameForReflection());
- if (it.hasNext())
- w.write(", ");
- }
- // method body
- w.write("{");
- incrementIndent();
- newLine(w);
- String stubName = firstCharToLowerCase(javaClass.getName());
- w.write("if (");
- w.write(stubName);
- w.write(" == null)");
- incrementIndent();
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- if (!method.isVoid())
- w.write("return ");
- w.write(stubName);
- w.write(".");
- w.write(method.getName());
- w.write("(");
- for (int i = 0; i < inputParams.length; i++)
- {
- if (i > 0)
- w.write(", ");
- String paramName = getClassName(inputParams[i].getQualifiedName());
- w.write(getUnusedName(paramName));
- }
- w.write(");");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- newLine(w);
- }
-
- private void writeGetSetEndpoint(Writer w) throws IOException
- {
- newLine(w);
- w.write("public String getEndpoint() {");
- incrementIndent();
- newLine(w);
- w.write("return _endpoint;");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- newLine(w);
- w.write("public void setEndpoint(String endpoint) {");
- incrementIndent();
- newLine(w);
- w.write("_endpoint = endpoint;");
- newLine(w);
- writeSetPropertyEndpoint(w);
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
-
- private void incrementIndent()
- {
- indentCount++;
- }
-
- private void decrementIndent()
- {
- indentCount--;
- }
-
- private void indent(Writer w) throws IOException
- {
- for (int i = 0; i < indentCount; i++)
- w.write(" ");
- }
-
- private void newLine(Writer w) throws IOException
- {
- w.write(NEW_LINE);
- indent(w);
- }
-
- private String getUnusedName(String name)
- {
- if (usedNames.contains(name))
- {
- for (int i = 0; i < 100; i++)
- {
- String newName = (new StringBuffer(name)).append(String.valueOf(i)).toString();
- if (!usedNames.contains(newName))
- return newName;
- }
- }
- return name;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
deleted file mode 100644
index 01cb999ea..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class ValidateWSDLCommand extends AbstractDataModelOperation
-{
- private WebServicesParser webServicesParser;
- private String wsdlURI;
-
- public ValidateWSDLCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (wsdlURI != null && wsdlURI.length() > 0)
- {
- Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
- if (definition != null)
- {
- int numServices = definition.getServices().size();
- if (numServices < 1)
- {
- IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT, new Object[] {wsdlURI}), null);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- /**
- * @param wsdlURI The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
deleted file mode 100644
index f794c782f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060203 126418 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class ClasspathUtils {
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
- private static ClasspathUtils instance_; //$NON-NLS-1$
- private static String DOT_JAR = ".jar"; //$NON-NLS-1$
- private static String JAR = "jar"; //$NON-NLS-1$
- private static String WEBINF_LIB = "/WEB-INF/lib"; //$NON-NLS-1$
-
- private ClasspathUtils() {
- }
-
- public static ClasspathUtils getInstance() {
- if (instance_ == null)
- instance_ = new ClasspathUtils();
- return instance_;
- }
-
- public String getClasspathString(IProject project) {
- StringBuffer classpath = new StringBuffer();
- String[] classpathEntries = getClasspath(project, false);
-
- Vector classpathVector = new Vector();
- for (int i = 0; i < classpathEntries.length; i++) {
- if (!classpathVector.contains(classpathEntries[i])) {
- classpathVector.add(classpathEntries[i]);
- classpath.append(classpathEntries[i]);
- classpath.append(";"); //$NON-NLS-1$
- }
- }
- return classpath.toString();
- }
-
-
- private String[] getClasspath(IProject project, boolean isDependent) {
- String[] moduleClasspath = new String[0];
- ArrayList projectClasspath = new ArrayList();
- boolean needJavaClasspath = false;
-
- IVirtualComponent comp = ComponentCore.createComponent(project);
- if (comp != null) {
- // get the module's classpath
-
- if (J2EEUtils.isEARComponent(comp)) {
- moduleClasspath = getClasspathForEARProject(project, comp.getName());
-// add module classpath to project classpath
- for (int j = 0; j < moduleClasspath.length; j++) {
- projectClasspath.add(moduleClasspath[j]);
- }
- } else if (J2EEUtils.isWebComponent(comp) || J2EEUtils.isJavaComponent(comp)) {
- needJavaClasspath = true;
-
- IContainer outputContainer = null;
- IResource fragmentRoot = null;
- IPackageFragmentRoot[] pkgFragmentRoot = ResourceUtils.getJavaPackageFragmentRoots(project);
- ArrayList webModuleClasspath = new ArrayList();
- try {
- for (int i = 0; i < pkgFragmentRoot.length; i++) {
- fragmentRoot = pkgFragmentRoot[i].getCorrespondingResource();
- if (fragmentRoot != null
- && (fragmentRoot.getProject().equals(project))
- && (fragmentRoot.getType() != IResource.FILE)) {
- outputContainer = J2EEProjectUtilities.getOutputContainer(project, pkgFragmentRoot[i]);
- if (outputContainer != null) {
- webModuleClasspath.add(outputContainer.getLocation().toOSString());
- }
- }
- }
- } catch (JavaModelException e) {
- }
-
- // add Web module classpath to project classpath
- Iterator iter = webModuleClasspath.iterator();
- while (iter.hasNext()) {
- projectClasspath.add((String) iter.next());
- }
- }
-
- if (!isDependent) {
- if (J2EEUtils.isWebComponent(comp)) {
- needJavaClasspath = true;
- moduleClasspath = getWEBINFLib(project);
- for (int j = 0; j < moduleClasspath.length; j++) {
- projectClasspath.add(moduleClasspath[j]);
- }
- }
- }
-
- } else {
- needJavaClasspath = true;
- }
-
- // If there are Web or Java module in the project, get the project's Java classpath
- if (needJavaClasspath) {
- String[] javaClasspath;
- try {
- IJavaProject javaProj = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- if (javaProj != null) {
- javaClasspath = getClasspathForJavaProject(javaProj);
- for (int j = 0; j < javaClasspath.length; j++) {
- projectClasspath.add(javaClasspath[j]);
- }
- }
- } catch (CoreException e) {
- // not able to get Java classpath, just ignore
- }
- }
-
- return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
- }
-
- // Need to get all modules in the project. If there's a EAR module, get the utility JARs
- private String[] getUtilityJarClasspath(IProject project) {
- String[] utilityJarString = new String[0];
- String[] moduleClasspath = new String[0];
- ArrayList utilityJarsClasspath = new ArrayList();
-
- String module;
- IVirtualComponent comp = ComponentCore.createComponent(project);
- if (comp != null) {
- module = comp.getName();
- if (J2EEUtils.isEARComponent(comp)) {
- moduleClasspath = getClasspathForEARProject(project, module);
- for (int j = 0; j < moduleClasspath.length; j++) {
- utilityJarsClasspath.add(moduleClasspath[j]);
- }
- utilityJarString = (String[]) utilityJarsClasspath.toArray(new String[utilityJarsClasspath.size()]);
- }
- }
-
- return utilityJarString;
- }
-
- private String[] getClasspathForEARProject(IProject project, String module) {
- IPath projectPath =
- project.getProject().getLocation().addTrailingSeparator().append(module).addTrailingSeparator();
- return getDirectoryJarFiles(projectPath);
- }
-
- private String[] getDirectoryJarFiles(IPath iPath) {
- File dir = iPath.toFile();
- Vector jarsVector = new Vector();
- if (dir.exists() && dir.isDirectory()) {
- String[] filenames = dir.list();
- for (int i = 0; i < filenames.length; i++) {
- if (filenames[i].endsWith(DOT_JAR))
- jarsVector.add(path2String(iPath) + filenames[i]);
- }
- }
- String[] jars = new String[jarsVector.size()];
- jarsVector.copyInto(jars);
- return jars;
- }
-
- private String[] getWEBINFLib(IProject project) {
- String[] webinfLibJars = new String[0];
- ArrayList anArrayList = new ArrayList();
- try {
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null) {
-
- IVirtualFolder webInfLib = component.getRootFolder().getFolder(new Path(
- WEBINF_LIB));
- if (webInfLib != null) {
- IVirtualResource[] resources = webInfLib.members();
- IResource aResource = null;
- for (int i = 0; i < resources.length; i++) {
- aResource = resources[i].getUnderlyingResource();
- if (JAR.equalsIgnoreCase(aResource.getFileExtension()))
- anArrayList.add( aResource.getLocation().toOSString());
- }
- if (anArrayList.size() != 0)
- webinfLibJars = (String[]) anArrayList.toArray(new String[anArrayList.size()]);
- }
- }
- } catch (CoreException e) {
- }
- return webinfLibJars;
- }
-
- private String[] getClasspathForJavaProject(IJavaProject javaProject) {
- ArrayList projectClasspath = new ArrayList();
- try {
- IClasspathEntry[] buildPath =
- javaProject.getResolvedClasspath(true);
- for (int i = 0; i < buildPath.length; i++) {
- String[] buildPathString =
- classpathEntry2String(
- buildPath[i],
- javaProject.getProject());
- for (int j = 0; j < buildPathString.length; j++) {
- projectClasspath.add(buildPathString[j]);
- }
- }
- } catch (JavaModelException jme) {
- }
-
- String[] utilityJarsClasspath;
- IProject project = javaProject.getProject();
- IProject[] referencingProjects = project.getReferencingProjects();
- for (int i = 0; i < referencingProjects.length; i++) {
- utilityJarsClasspath = getUtilityJarClasspath(referencingProjects[i]);
- for (int j = 0; j < utilityJarsClasspath.length; j++) {
- projectClasspath.add(utilityJarsClasspath[j]);
- }
- }
-
- return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
- }
-
- private String[] classpathEntry2String(
- IClasspathEntry entry,
- IProject project)
- {
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_LIBRARY :
- {
- return new String[] { path2String(entry.getPath())};
- }
- case IClasspathEntry.CPE_PROJECT :
- {
- return getClasspath(
- ResourcesPlugin.getWorkspace().getRoot().getProject(
- entry.getPath().lastSegment()), true);
- }
- case IClasspathEntry.CPE_SOURCE :
- {
- IPath path = entry.getPath();
- if (path.segment(0).equals(project.getName()))
- path = path.removeFirstSegments(1);
- return new String[] {
- path2String(
- project
- .getLocation()
- .addTrailingSeparator()
- .append(
- path))};
- }
- case IClasspathEntry.CPE_VARIABLE :
- {
- return classpathEntry2String(
- JavaCore.getResolvedClasspathEntry(entry),
- project);
- }
- default :
- {
- return new String[] { path2String(entry.getPath())};
- }
- }
- }
-
- private String path2String(IPath path) {
- return path.toOSString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
deleted file mode 100644
index 16dbb8a05..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class FileUtil
-{
- public FileUtil()
- {
- super();
- }
-
- public static void copyFile(String src, String dest)
- {
- InputStream is = null;
- FileOutputStream fos = null;
-
- try
- {
- is = new FileInputStream(src);
- fos = new FileOutputStream(dest);
- int c = 0;
- byte[] array = new byte[1024];
- while ((c = is.read(array)) >= 0)
- {
- fos.write(array, 0, c);
- }
- }
- catch (Exception e)
- {
- }
- finally
- {
- try
- {
- fos.close();
- is.close();
- }
- catch (Exception e)
- {
- }
- }
- }
-
- public static File createFileAndParentDirectories(String fileName) throws Exception
- {
- File file = new File(fileName);
- File parent = file.getParentFile();
- if (!parent.exists())
- {
- parent.mkdirs();
- }
- file.createNewFile();
- return file;
- }
-
- public static void deleteDirectories(File dir) throws Exception
- {
- File[] children = dir.listFiles();
- for (int i = 0; i < children.length; i++)
- {
- if (children[i].list() != null && children[i].list().length > 0)
- {
- deleteDirectories(children[i]);
- }
- else
- {
- children[i].delete();
- }
- }
- dir.delete();
- }
-
- /**
- * Creates a folder and all parent folders if not existing Project must exist
- */
- public static void createFolder(IFolder folder, boolean force, boolean local) throws CoreException
- {
- if (!folder.exists())
- {
- IContainer parent = folder.getParent();
- if (parent instanceof IFolder)
- {
- createFolder((IFolder)parent, force, local);
- }
- folder.create(force, local, new NullProgressMonitor());
- }
- }
-
- public static void createTargetFile(String sourceFileName, String targetFileName) throws Exception
- {
- createTargetFile(sourceFileName, targetFileName, false);
- }
-
- public static void createTargetFile(String sourceFileName, String targetFileName, boolean overwrite) throws Exception
- {
- File idealResultFile = new File(targetFileName);
- if (overwrite || !idealResultFile.exists())
- {
- FileUtil.createFileAndParentDirectories(targetFileName);
- FileUtil.copyFile(sourceFileName, targetFileName);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
deleted file mode 100644
index 2af0e3b16..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-
-public class PlatformUtils {
-
- public static final String PLATFORM_ROOT = "platform:/resource";
- public static final String WIN_FILE_PROTOCOL = "file:/";
- public static final String LNX_FILE_PROTOCOL = "file://";
- public static final String PLATFORM = "platform";
- public static final String RESOURCE = "/resource";
-
- private PlatformUtils() {
- }
-
- /**
- * Returns the string representation of platform URL given an IPath
- * @param IPath path
- * @return String platformURL
- */
- public static String getPlatformURL(IPath path) {
- String platformURL;
- platformURL = URI.createPlatformResourceURI(path.toString()).toString();
- // old method: file system representation
- // platformURL = ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation().toString();
- return platformURL;
- }
-
- /**
- * Returns the URL representation of the Platform URL given an IPath
- * The PlatformResourceManager underdstands this format and therefore
- * this is suited for command URL's
- * @param IPath path
- * @return URL Platform URL
- */
- public static URL getCommandPlatformURL(IPath path) {
- URL url = null;
- try {
- url = new URL(PLATFORM, null, RESOURCE + path.toString());
- } catch (MalformedURLException e) {
- return url;
- }
- return url;
- }
-
- /**
- * Returns the string representation of path given platform URL string
- * @param String platform URL string
- * @return String path string
- */
- public static String getPathFromPlatform(String platformStr) {
- String pathStr = platformStr;
-
- String rootLocation;
- rootLocation = PLATFORM_ROOT;
- // old method: file system representation
- // rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- if (platformStr.startsWith(rootLocation))
- pathStr = platformStr.substring(rootLocation.length());
- return pathStr;
- }
-
- /**
- * Returns the string representation of platform URL given the path string
- * @param String path string
- * @return String platform URL string
- */
- public static String getPlatformFromPath(String pathStr) {
- String platformStr = pathStr;
-
- String rootLocation;
- rootLocation = PLATFORM_ROOT;
- // old method: file system representation
- // rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- platformStr = rootLocation + pathStr;
- return platformStr;
- }
-
- /**
- * Returns the string representation of the local file system file given platform URL string
- * @param String platform URL string
- * @return String file string
- */
- public static String getFileFromPlatform(String platformStr) {
- String fileStr = platformStr;
- String pathStr = getPathFromPlatform(platformStr);
-
- fileStr =
- ResourcesPlugin
- .getWorkspace()
- .getRoot()
- .getFile(new Path(pathStr))
- .getLocation()
- .toString();
-
- // old method: file system representation
- // Do nothing
-
- return fileStr;
- }
-
- /**
- * Returns the file protocol representation of the local file system file given platform URL string
- * @param String platform URL string
- * @return String the file protocol uri
- */
- public static String getFileURLFromPlatform(String platformStr) {
- String fileStr = platformStr;
- String pathStr = getPathFromPlatform(platformStr);
- try {
- fileStr =
- ResourcesPlugin
- .getWorkspace()
- .getRoot()
- .getFile(new Path(pathStr))
- .getLocation()
- .toFile()
- .toURL()
- .toString();
- } catch (MalformedURLException murle) {
- fileStr = getFileURLFromPath(new Path(pathStr));
- }
- return fileStr;
- }
-
- /**
- * Returns the file protocol representation of a local file
- * @param IPath the Path object representing the file
- * @return String the file protocol uri
- */
- public static String getFileURLFromPath(IPath path) {
-
- String file = null;
- if (path != null) {
- if (!path.isAbsolute()) {
- file =
- ResourcesPlugin
- .getWorkspace()
- .getRoot()
- .getFile(path)
- .getLocation()
- .toString();
- if (file.charAt(0) == IPath.SEPARATOR) {
- file = LNX_FILE_PROTOCOL + file;
- } else {
- file = WIN_FILE_PROTOCOL + file;
- }
- } else {
- file = path.toString();
- }
- if (file != null && file.charAt(0) == IPath.SEPARATOR) {
- file = LNX_FILE_PROTOCOL + file;
- } else {
- file = WIN_FILE_PROTOCOL + file;
- }
- }
- return file == null ? null : file;
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
deleted file mode 100644
index 3cb3670e2..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import org.apache.axis.wsdl.toJava.Utils;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import com.ibm.icu.text.Collator;
-import com.ibm.icu.util.StringTokenizer;
-
-public class WSDLUtils {
-
- private static final String DOT = ".";
-
- /**
- * These are java keywords as specified at the following URL (sorted alphabetically).
- * http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#229308
- * Note that false, true, and null are not strictly keywords; they are literal values,
- * but for the purposes of this array, they can be treated as literals.
- */
- static final String keywords[] =
- {
- "abstract", "boolean", "break", "byte", "case",
- "catch", "char", "class", "const", "continue",
- "default", "do", "double", "else", "extends",
- "false", "final", "finally", "float", "for",
- "goto", "if", "implements", "import", "instanceof",
- "int", "interface", "long", "native", "new",
- "null", "package", "private", "protected", "public",
- "return", "short", "static", "strictfp", "super",
- "switch", "synchronized", "this", "throw", "throws",
- "transient", "true", "try", "void", "volatile",
- "while"
- };
-
- /** Collator for comparing the strings */
- static final Collator englishCollator = Collator.getInstance(Locale.ENGLISH);
-
- /** Use this character as suffix */
- static final char keywordPrefix = '_';
-
- private WSDLUtils() {
- }
-
- /**
- * Returns the name of the first service element in the WSDL definition.
- * @return String service element name
- */
- public static String getServiceElementName(Definition definition) {
- Service service = (Service) definition.getServices().values().iterator().next();
- return service.getQName().getLocalPart();
- }
-
- /**
- * Returns the name of the port type element points to by the first service and port element in the WSDL definition.
- * @return String port type element name
- */
- public static String getPortTypeName(Definition definition) {
- Service service = (Service) definition.getServices().values().iterator().next();
- Iterator iterator = service.getPorts().values().iterator();
- while(iterator.hasNext()){
- Port port = (Port) iterator.next();
- for (int i=0; i<port.getExtensibilityElements().size();i++) {
- if (port.getExtensibilityElements().get(i) instanceof SOAPAddress) {
- Binding binding = port.getBinding();
- return binding.getPortType().getQName().getLocalPart();
- }
- }
- }
- return "";
-
- }
-
- /**
- * Returns the name of the port element in the WSDL definition.
- * @return String port name
- */
- public static String getPortName(Definition definition) {
- Service service = (Service) definition.getServices().values().iterator().next();
- Iterator iterator = service.getPorts().values().iterator();
- while(iterator.hasNext()){
- Port port = (Port) iterator.next();
- for (int i=0; i<port.getExtensibilityElements().size();i++) {
- if (port.getExtensibilityElements().get(i) instanceof SOAPAddress)
- return port.getName();
- }
- }
- return "";
- }
-
-
-
- public static String makeNamespace (String clsName) {
- return makeNamespace(clsName, "http");
- }
-
- /**
- * Make namespace from a fully qualified class name
- * and the given protocol
- *
- * @param clsName fully qualified class name
- * @param protocol protocol String
- * @return namespace namespace String
- */
- public static String makeNamespace (String clsName, String protocol) {
- if (clsName.lastIndexOf('.') == -1)
- return protocol + "://" + "DefaultNamespace";
- String packageName = clsName.substring(0, clsName.lastIndexOf('.'));
- return makeNamespaceFromPackageName(packageName, protocol);
- }
-
-
- private static String makeNamespaceFromPackageName(String packageName, String protocol) {
- if (packageName == null || packageName.equals(""))
- return protocol + "://" + "DefaultNamespace";
- StringTokenizer st = new StringTokenizer( packageName, "." );
- String[] words = new String[ st.countTokens() ];
- for(int i = 0; i < words.length; ++i)
- words[i] = st.nextToken();
-
- StringBuffer sb = new StringBuffer(80);
- for(int i = words.length-1; i >= 0; --i) {
- String word = words[i];
- // seperate with dot
- if( i != words.length-1 )
- sb.append('.');
- sb.append( word );
- }
- return protocol + "://" + sb.toString();
- }
-
- /**
- * Return a Definition for the wsdl url given
- *
- */
- public static Definition getWSDLDefinition(String wsdlURL)
- {
- if(wsdlURL == null) return null;
-
- WSDLFactory wsdlFactory;
- Definition definition = null;
- try {
- wsdlFactory = new WSDLFactoryImpl();
- WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
- definition = wsdlReader.readWSDL(wsdlURL);
- }
- catch (Exception e) { // can be WSDLException or IOException
- return null;
- }
- return definition;
- }
-
- public static String getPackageName(Definition definition)
- {
- if (definition != null)
- {
- String namespace = definition.getTargetNamespace();
- return namespaceURI2PackageName(namespace);
- }
- return "";
- }
-
- public static String getPackageNameForBindingImpl(Port port, Map ns2pkgMap)
- {
- if (port != null && ns2pkgMap != null)
- {
- Binding binding = port.getBinding();
- QName bndQName = binding.getQName();
- String namespace = bndQName.getNamespaceURI();
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return getPackageNameForBindingImpl(port);
- }
-
- public static String getPackageNameForBindingImpl(Definition definition, Map ns2pkgMap)
- {
- if (definition != null && ns2pkgMap != null)
- {
- Service service = (Service) definition.getServices().values().iterator().next();
- Port port = (Port) service.getPorts().values().iterator().next();
- return getPackageNameForBindingImpl(port, ns2pkgMap);
- }
- return getPackageNameForBindingImpl(definition);
- }
-
- public static String getPackageNameForBindingImpl(Definition definition)
- {
- Port port = null;
- if (definition != null)
- {
- Service service = (Service)definition.getServices().values().iterator().next();
- port = (Port)service.getPorts().values().iterator().next();
- }
- return getPackageNameForBindingImpl(port);
- }
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the binding namespace as the package name
-// of the BindingImpl class.
-public static String getPackageNameForBindingImpl(Port port)
-{
- if (port != null)
- {
- Binding binding = port.getBinding();
-// PortType portType = binding.getPortType();
- QName bndQName = binding.getQName();
- String namespace = bndQName.getNamespaceURI();
- return namespaceURI2PackageName(namespace);
- }
- return "";
-}
-
-/**
-* Get the namespace for the Port Type
-*
-*/
-public static String getPortTypeNamespace(Definition definition)
-{
- String namespace = "";
- if (definition != null)
- {
- Service service = (Service) definition.getServices().values().iterator().next();
- Iterator iterator = service.getPorts().values().iterator();
- while(iterator.hasNext()){
- Port port = (Port) iterator.next();
- for (int i=0; i<port.getExtensibilityElements().size();i++) {
- if (port.getExtensibilityElements().get(i) instanceof SOAPAddress){
- PortType portType = port.getBinding().getPortType();
- QName bndQName = portType.getQName();
- namespace = bndQName.getNamespaceURI();
- }
- }
- }
- }
- return namespace;
-}
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the porttype namespace as the package name
-// of the Java class (in ejb).
-public static String getPackageNameForPortType(Definition definition)
-{
- if (definition != null)
- {
- String namespace = getPortTypeNamespace(definition);
- return namespaceURI2PackageName(namespace);
- }
- return "";
-}
-
- /**
- * checks if the input string is a valid java keyword.
- * @return boolean true/false
- */
- public static boolean isJavaKeyword(String keyword) {
- return (Arrays.binarySearch(keywords, keyword, englishCollator) >= 0);
- }
-
- /**
- * Turn a java keyword string into a non-Java keyword string. (Right now
- * this simply means appending an underscore.)
- */
- public static String makeNonJavaKeyword(String keyword){
- return keywordPrefix + keyword;
- }
-
- public static String getFullyQualifiedPortTypeName(Definition definition)
- {
- StringBuffer beanName = new StringBuffer();
- beanName.append(getPackageNameForPortType(definition));
- beanName.append(DOT);
- beanName.append(getPortTypeName(definition));
- return beanName.toString();
-
- }
-
- /**
- * getName
- * @param uri String
- * @return get the file name after the last \ and /
- */
- public static String getName(String uri) {
-
- // Get everything after last slash or backslash
- int bslash = uri.lastIndexOf("\\");
- int slash = uri.lastIndexOf("/");
- int i = bslash > slash ? bslash : slash;
- String fileName = uri.substring(i+1).replace('?', '.');
-
- return fileName;
- }
-
-
-/**
- * getWSDLName
- * @param uri String
- * @return get the file name after the last \ and /, trimmed, defaulted to
- * "default.wsdl" if there is no name, and ending with ".wsdl".
- */
- public static String getWSDLName(String uri) {
-
- // Get everything after last slash or backslash from input URI
- // with no whitespace.
- String WSDLName = getName(uri).trim();
-
- // if empty, return the default "default.wsdl"
- if ( WSDLName.equals( "" ) ) {
- WSDLName = "default.wsdl";
- }
-
- // make sure name ends with ".wsdl", lower case.
- else {
- if ( ! WSDLName.endsWith( ".wsdl" ) ) {
- if ( WSDLName.toLowerCase().endsWith( ".wsdl" ) ) {
- int lastDot = WSDLName.lastIndexOf(".");
- WSDLName = WSDLName.substring( 0, lastDot ) + ".wsdl";
- }
- else {
- WSDLName = WSDLName + ".wsdl";
- }
- }
- }
-
- return WSDLName;
- }
-
- /**
- * getPortTypeNameFromBeanName
- * @param beanname String
- * @return get the port type name based on the bean name
- */
- public static String getPortTypeNameFromBeanName(String beanName) {
- return beanName.substring(beanName.lastIndexOf('.') + 1);
- }
-
- public static String getPackageName(Service service, Map ns2pkgMap)
- {
- if (service != null)
- {
- String namespace = service.getQName().getNamespaceURI();
- if (ns2pkgMap != null)
- {
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return namespaceURI2PackageName(namespace);
- }
- else
- return "";
- }
-
- public static String getPackageName(Port port, Map ns2pkgMap)
- {
- if (port != null)
- return getPackageName(port.getBinding(), ns2pkgMap);
- else
- return "";
- }
-
- public static String getPackageName(Binding binding, Map ns2pkgMap)
- {
- if (binding != null)
- {
- String namespace = binding.getQName().getNamespaceURI();
- if (ns2pkgMap != null)
- {
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return namespaceURI2PackageName(namespace);
- }
- else
- return "";
- }
-
- public static String getPackageName(PortType portType, Map ns2pkgMap)
- {
- if (portType != null)
- {
- String namespace = portType.getQName().getNamespaceURI();
- if (ns2pkgMap != null)
- {
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return namespaceURI2PackageName(namespace);
- }
- else
- return "";
- }
-
-
- /**
- * namespaceURI2PackageName
- * @param namespaceURI
- * @return package name based on namespace
- */
- public static String namespaceURI2PackageName(String namespaceURI)
- {
- /**
- * TODO: The makePackageName method from
- * org.apache.axis.wsdl.toJava.Utils in axis-1_1 is called to map namespace to package name.
- * This will be replaced with an extension point to plug in runtime emitter specific namespace to
- * package mapping algorithm
- */
- return Utils.makePackageName(namespaceURI);
-
-// StringBuffer sb = new StringBuffer(80);
-// if (namespaceURI != null && namespaceURI.length() > 0)
-// {
-// String hostname = null;
-// try
-// {
-// hostname = new URL(namespaceURI).getHost();
-// }
-// catch (MalformedURLException e)
-// {
-// int index = namespaceURI.indexOf(":");
-// if (index > -1)
-// {
-// hostname = namespaceURI.substring(index+1);
-// index = hostname.indexOf("/");
-// if (index > -1)
-// hostname = hostname.substring(0, index);
-// }
-// else
-// hostname = namespaceURI;
-// }
-//
-// // if we didn't file a hostname, bail
-// if (hostname == null) {
-// return null;
-// }
-//
-// //convert illegal java identifier
-// hostname = hostname.replace('-', '_');
-// // tokenize the hostname and reverse it
-// StringTokenizer st = new StringTokenizer(hostname, ".");
-// String[] words = new String[st.countTokens()];
-// for (int i = 0; i < words.length; ++i)
-// words[i] = st.nextToken();
-// for(int i = words.length-1; i >= 0; --i)
-// {
-// String word = words[i];
-// if (isJavaKeyword(word))
-// word = makeNonJavaKeyword(word);
-// // seperate with dot
-// if (i != words.length-1)
-// sb.append('.');
-// // convert digits to underscores
-// if (Character.isDigit(word.charAt(0)))
-// sb.append('_');
-// sb.append(word);
-// }
-// }
-// return normalizePackageName(sb.toString(), DOT.charAt(0));
- }
-
-
- public static String resolveDotInPortName(String name) {
- if(name.indexOf(".")<0)
- {
- return name;
- }
- StringBuffer sb = new StringBuffer();
- boolean afterDot = false;
- for(int i=0; i<name.length(); i++)
- {
- if(name.charAt(i)=='.')
- {
- afterDot = true;
- }
- else if(afterDot)
- {
- sb.append(name.substring(i,i+1).toUpperCase());
- afterDot=false;
- }
- else
- {
- sb.append(name.charAt(i));
- }
- }
- return sb.toString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
deleted file mode 100644
index c3d34c362..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-public class AxisMappingsFragment extends BooleanFragment
-{
- private boolean showMappings_;
-
- public AxisMappingsFragment()
- {
- super();
- setTrueFragment( new SimpleFragment( "AxisMappingsWidget" ));
- setCondition( new Condition()
- {
- public boolean evaluate()
- {
- return showMappings_;
- }
- } );
- }
-
- public void setShowMapping( boolean showMappings )
- {
- showMappings_ = showMappings;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
deleted file mode 100644
index 6251594a5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TableViewerWidget;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class AxisMappingsWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-
- private TableViewerWidget mappings_;
-
- private byte mode_;
- private JavaWSDLParameter javaParameter_;
-
- public static final byte MODE_BEAN2XML = (byte)0;
- public static final byte MODE_XML2BEAN = (byte)1;
- public static final byte MODE_XML2PROXY = (byte)2;
- public static final byte MODE_XML2EJB = (byte)3;
- public static final byte MODE_EJB2XML = (byte)4;
-
- private final String DEFAULT_PACKAGE = "default.javapackage";
- private final String DEFAULT_NAMESPACE = "http://default.namespace";
-
- /*CONTEXT_ID PWJM0001 for the WSDL to Java Mappings Page*/
- private String INFOPOP_PWJM_PAGE = "PWJM0001"; //$NON-NLS-1$
-
- public AxisMappingsWidget( byte mode )
- {
- mode_ = mode;
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
-
- // TODO The TOOLTIP_PWJM_PAGE key doesn't seem to exist anywhere???
- //parent.setToolTipText( msgUtils.getMessage( "TOOLTIP_PWJM_PAGE" ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJM_PAGE );
-
- Text mappingLabel = new Text( parent, SWT.READ_ONLY | SWT.WRAP );
- mappingLabel.setText( AxisConsumptionUIMessages.LABEL_MAPPING_PAIRS );
- mappingLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
- List initValues = new ArrayList();
-
- if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML)
- {
- String[] columns = { AxisConsumptionUIMessages.TABLE_COLUMN_LABEL_PACKAGE,
- AxisConsumptionUIMessages.TABLE_COLUMN_LABEL_NAMESPACE};
- mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_PACKAGE, DEFAULT_NAMESPACE}, TableViewerWidget.MAP_ONE_TO_ONE); //$NON-NLS-1$
- }
- else
- {
- String[] columns = { AxisConsumptionUIMessages.TABLE_COLUMN_LABEL_NAMESPACE,
- AxisConsumptionUIMessages.TABLE_COLUMN_LABEL_PACKAGE};
- mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_NAMESPACE, DEFAULT_PACKAGE }, TableViewerWidget.MAP_MANY_TO_ONE); //$NON-NLS-1$
- }
-
- mappings_.addControls( parent, statusListener );
-
- return this;
- }
-
- public IStatus getStatus()
- {
- return mappings_.getStatus();
- }
-
- public void setJavaParameter( JavaWSDLParameter parameter )
- {
- javaParameter_ = parameter;
- }
-
- public JavaWSDLParameter getJavaParameter()
- {
- if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML || mode_ == MODE_XML2BEAN || mode_ == MODE_XML2PROXY)
- {
- //Set the mappings on javaParameter
- TableItem[] pairs = mappings_.getItems();
- HashMap map = new HashMap();
- for (int i=0; i<pairs.length; i++)
- {
- map.put(pairs[i].getText(0),pairs[i].getText(1));
- }
- javaParameter_.setMappings(map);
-
- //Set the namespace on the javaParameter
- String beanName = javaParameter_.getBeanName();
- if(beanName != null && !beanName.equals(""))
- {
- String packageName = beanName.substring(0, beanName.lastIndexOf('.'));
- if(map.containsKey(packageName))
- {
- String tns = (String)map.get(packageName);
- javaParameter_.setNamespace(tns);
- }
- }
-
- }
- return javaParameter_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
deleted file mode 100644
index bc08bf119..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class AxisProxyWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-
- /*CONTEXT_ID PWJB0001 for the WSDL to Java Bindings Page*/
- private final String INFOPOP_PWJB_PAGE = "PWJB0001"; //$NON-NLS-1$
-
- private Combo outputFolderCombo_;
- /*CONTEXT_ID PWJB0003 for the Folder field of the WSDL to Java Bindings Page*/
- private final String INFOPOP_PWJB_TEXT_FOLDER = "PWJB0003"; //$NON-NLS-1$
-
- private Button genProxyCheckbox_;
- /*CONTEXT_ID PWJB0009 Indicates whether to generate a proxy or not. */
- private final String INFOPOP_PWJB_CHECKBOX_GENPROXY = "PWJB0009"; //$NON-NLS-1$
-
- private Button showMappingsCheckbox_;
- /*CONTEXT_ID PWJB0016 for the Show Mappings checkbox of the Bean Methods Page*/
- private String INFOPOP_N2P_SHOW_MAPPINGS = "PWJB0016"; //$NON-NLS-1$
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- UIUtils uiUtils = new UIUtils( pluginId_ );
-
- parent.setToolTipText( AxisConsumptionUIMessages.TOOLTIP_PWJB_PAGE );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJB_PAGE);
-
- genProxyCheckbox_ = uiUtils.createCheckbox( parent, AxisConsumptionUIMessages.CHECKBOX_GENPROXY,
- AxisConsumptionUIMessages.TOOLTIP_PWJB_CHECKBOX_GENPROXY,
- INFOPOP_PWJB_CHECKBOX_GENPROXY );
- genProxyCheckbox_.addListener( SWT.Selection, statusListener );
- genProxyCheckbox_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleGenProxy();
- }
- });
-
- Composite textGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-
- outputFolderCombo_ = uiUtils.createCombo( textGroup, AxisConsumptionUIMessages.LABEL_FOLDER_NAME,
- AxisConsumptionUIMessages.TOOLTIP_PWJB_TEXT_FOLDER,
- INFOPOP_PWJB_TEXT_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- showMappingsCheckbox_ = uiUtils.createCheckbox( parent, AxisConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
- AxisConsumptionUIMessages.TOOLTIP_N2P_SHOW_MAPPINGS,
- INFOPOP_N2P_SHOW_MAPPINGS );
- // Since this widget affects whether the next page is shown or not we
- // need to add the statusListener.
- showMappingsCheckbox_.addListener( SWT.Selection, statusListener );
-
- return this;
- }
-
- private void handleGenProxy()
- {
- boolean enabled = genProxyCheckbox_.getSelection();
-
- outputFolderCombo_.setEnabled( enabled );
- showMappingsCheckbox_.setEnabled( enabled );
- }
-
- public void setClientProject(IProject clientProject)
- {
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(clientProject);
-
- for (int i = 0; i < paths.length ; i++)
- {
- outputFolderCombo_.add(paths[i].toString());
- }
-
- if( paths.length > 0 )
- {
- outputFolderCombo_.select(0);
- }
- }
-
- public String getOutputFolder()
- {
- return outputFolderCombo_.getText();
- }
-
- public void setGenerateProxy( Boolean genProxy )
- {
- genProxyCheckbox_.setSelection( genProxy.booleanValue() );
- }
-
- public Boolean getGenerateProxy()
- {
- return new Boolean( genProxyCheckbox_.getSelection() );
- }
-
- public void setCustomizeClientMappings( boolean showMappings )
- {
- showMappingsCheckbox_.setSelection( showMappings );
- }
-
- public boolean getCustomizeClientMappings()
- {
- return showMappingsCheckbox_.getSelection() && genProxyCheckbox_.getSelection();
- }
-
- public void setIsClientScenario( boolean isClientScenario )
- {
- genProxyCheckbox_.setEnabled( !isClientScenario );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
deleted file mode 100644
index bd851ad71..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060523 143284 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ClientCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-/**
- * Developers who are adding web service clients into the wizard should create
- * a class that implements this interface.
-**/
-public class WebServiceClientAxisType implements CommandWidgetBinding
-{
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // AxisClientDefaultingCommand
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "CustomizeClientMappings", AxisProxyWidget.class );
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "ProxyProjectFolder", AxisProxyWidget.class, "ProxyFolder", null );
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "GenerateProxy", AxisProxyWidget.class);
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "IsClientScenario", AxisProxyWidget.class);
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "ClientProject", AxisProxyWidget.class );
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
- // AxisProxyWidget
- dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", ClientExtensionOutputCommand.class );
- dataRegistry.addMapping( AxisProxyWidget.class, "OutputFolder", DefaultsForClientJavaWSDLCommand.class );
-
- //AxisMappingsWidget
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForHTTPBasicAuthCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForClientJavaWSDLCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", ValidateWSDLCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", ClientCodeGenOperation.class, "JavaWSDLParam", null); //OK
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
-
- widgetRegistry.add( "AxisClientStart",
- AxisConsumptionUIMessages.PAGE_TITLE_WS_AXIS_PROXY,
- AxisConsumptionUIMessages.PAGE_DESC_WS_AXIS_PROXY,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisProxyWidget();
- }
- } );
-
- widgetRegistry.add( "AxisClientBeanMapping",
- AxisConsumptionUIMessages.PAGE_TITLE_WS_XML2PROXY,
- AxisConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2PROXY );
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- //dead code - doesn't matter what gets returned here.
- return new SimpleFragment();
- }
- };
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
deleted file mode 100644
index cdb7e9fbf..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-
-public class AxisClientConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor proxyConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private AxisProxyWidget proxyWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisClientConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WebServiceClientAxisType() );
-
- proxyConfigWidget_ = adapter_.getWidget( "AxisClientStart" );
- proxyWidget_ = (AxisProxyWidget)proxyConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisClientBeanMapping" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return proxyConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == proxyConfigWidget_ && proxyWidget_.getCustomizeClientMappings() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
deleted file mode 100644
index e645096a5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientInputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientOutputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ClientCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-public class AxisWebServiceClient extends AbstractWebServiceClient
-{
-
- public AxisWebServiceClient(WebServiceClientInfo info)
- {
- super(info);
- // TODO Auto-generated constructor stub
- }
-
- public ICommandFactory assemble(IEnvironment env, IContext ctx,
- ISelection sel, String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- EclipseEnvironment environment = (EclipseEnvironment)env;
- registerDataMappings( environment.getCommandManager().getMappingRegistry());
-
- Vector commands = new Vector();
- commands.add(new AxisClientInputCommand(this, ctx, project));
- commands.add(new AxisClientDefaultingCommand());
-// commands.add(new SimpleFragment("AxisClientStart"));
-// commands.add(new SimpleFragment("AxisClientBeanMapping"));
- commands.add(new DefaultsForHTTPBasicAuthCommand());
-// commands.add(new CopyAxisJarCommand());
- commands.add(new DefaultsForClientJavaWSDLCommand());
- commands.add(new ValidateWSDLCommand());
- commands.add(new ClientCodeGenOperation());
- commands.add(new AxisClientOutputCommand(this,ctx));
- commands.add(new BuildProjectCommand());
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- // AxisClientDefaultingCommand
- registry.addMapping(AxisClientInputCommand.class, "ClientProject", AxisClientDefaultingCommand.class, "ClientProject",
- new StringToIProjectTransformer());
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntime", AxisClientDefaultingCommand.class, "ClientRuntimeID",
-// null);
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", AxisClientDefaultingCommand.class);
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", AxisClientDefaultingCommand.class,
-// "ClientProjectEAR", new StringToIProjectTransformer());
- registry.addMapping(AxisClientInputCommand.class, "WsdlURL", AxisClientDefaultingCommand.class); // URI
- // to
- // URL
- // transformer
- // req'd??
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "TestProxySelected", AxisClientDefaultingCommand.class,
-// "TestProxySelected", null);
- registry.addMapping(AxisClientInputCommand.class, "ClientServer", AxisClientDefaultingCommand.class);
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "IsClientScenario", AxisClientDefaultingCommand.class);
- registry.addMapping(AxisClientInputCommand.class, "GenerateProxy", AxisClientDefaultingCommand.class);
- // DefaultsForHTTPBasicAuthCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForHTTPBasicAuthCommand.class); //OK
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForHTTPBasicAuthCommand.class, "WsdlServiceURL", null); //OK
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", DefaultsForHTTPBasicAuthCommand.class); //OK
-
-// registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
-
- // DefaultsForClientJavaWSDLCommand() // javaParam_, model_
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForClientJavaWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", DefaultsForClientJavaWSDLCommand.class, "ProxyProject",
- null);
- // registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL",
- // DefaultsForClientJavaWSDLCommand.class,"WSDLServicePathname",null);
- // //
- // URL to URL??
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForClientJavaWSDLCommand.class, "WSDLServiceURL", null); // URI
- // to
- // URL??
- // ValidateWSDLCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ValidateWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlServiceURL", ValidateWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-
- // WSDL2JavaCommand() // javaParam_
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ClientCodeGenOperation.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", ClientCodeGenOperation.class, "WsdlURI", null);
-
- // RefreshProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", ClientCodeGenOperation.class, "Project", null);
-
- // Stub2BeanCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ClientCodeGenOperation.class);
- registry.addMapping(DefaultsForClientJavaWSDLCommand.class, "OutputFolder", ClientCodeGenOperation.class );
-
- // BuildProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", BuildProjectCommand.class, "Project", null);
- registry.addMapping(AxisClientDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-
- registry.addMapping(ClientCodeGenOperation.class, "ProxyBean", AxisClientOutputCommand.class, "ProxyBean", null);
- registry.addMapping(ClientCodeGenOperation.class, "ProxyEndpoint", AxisClientOutputCommand.class);
-// registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-// registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
deleted file mode 100644
index 196d49a46..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
deleted file mode 100644
index c726c35c9..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-axis-ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project b/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
deleted file mode 100644
index 39e93a923..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.creation.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5c6dd852b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Sep 26 06:28:27 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c63622d4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Thu May 31 13:11:16 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 74dbba73c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:30 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 860968d70..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,50 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.creation.ui; singleton:=true
-Bundle-Version: 1.0.305.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.axis.creation.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.command;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.task;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.axis.consumption.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.axis.consumption.ui;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html b/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
deleted file mode 100644
index 391fee07f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- deploy.xsl,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl b/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
deleted file mode 100644
index 3fdf164ac..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt"
- xmlns:ns1="http://xml.apache.org/axis/wsdd/"
- xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- <xsl:output method="xml" encoding="UTF-8"/>
-
- <xsl:param name="newClassName" select="ss"/>
-
- <xsl:template match="/ns1:deployment/ns1:service/ns1:parameter[@name='className']">
- <xsl:copy>
- <xsl:attribute name="name">className</xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of select="$newClassName"/>
- </xsl:attribute>
- <xsl:apply-templates/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
deleted file mode 100644
index dcaa0bffe..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Creation UI
-PLUGIN_PROVIDER=Eclipse.org
-
-LABEL_RUNTIME_AXIS_11=Apache Axis
-DESC_RUNTIME_AXIS_11=Apache Axis
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-WS_NAME_BEANAXIS=Java bean Axis Web service
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
deleted file mode 100644
index 5fe9a6396..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- Server Defaulters -->
-
- <extension point="org.eclipse.jst.ws.consumption.serverDefaulter">
- <serverDefaulter
- class="org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisServerDefaulter">
- </serverDefaulter>
- </extension>
-
- <!--
- <extension point="org.eclipse.jst.ws.consumption.ui.webServiceRuntime">
- <webServiceRuntime
- id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- label="%LABEL_RUNTIME_AXIS_11"
- serviceTypes="org.eclipse.jst.ws.serviceType.java"
- clientTypes="org.eclipse.jst.ws.clientType.java.webOnly"
- servletLevels="23 24"
- j2eeLevels="13 14"
- servers="org.eclipse.jst.server.tomcat.40 org.eclipse.jst.server.tomcat.41 org.eclipse.jst.server.tomcat.50 org.eclipse.jst.server.tomcat.55 org.eclipse.jst.server.geronimo.10"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
- </webServiceRuntime>
- </extension>
- -->
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisBeanConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.BUConfigCommand"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisBeanConfigWidgetFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisSkeletonConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.TDConfigCommand"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisSkeletonConfigWidgetFactory"/>
- </extension>
-
- <!-- M9 extensions -->
- <extension point="org.eclipse.jst.ws.consumption.ui.runtimes">
- <runtime
- id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- label="%LABEL_RUNTIME_AXIS_11"
- serverRequired="false"/>
- </extension>
-
- <!-- define support for Axis Java bean bottom up and top-down support in web projects -->
- <extension point="org.eclipse.jst.ws.consumption.ui.serviceRuntimes">
- <serviceRuntime
- id="org.eclipse.jst.ws.axis.creation.java"
- serviceImplementationTypeId="org.eclipse.jst.ws.wsImpl.java"
- runtimeId="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- runtimeChecker="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntimeChecker"
- bottomUp="true"
- topDown="true"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-
- <required-facet-version facet="jst.web" version="2.3" allow-newer="true"/>
-
- </serviceRuntime>
- </extension>
-
- <!-- define support for Axis Java clients in Java projects -->
- <extension point="org.eclipse.jst.ws.consumption.ui.clientRuntimes">
- <clientRuntime
- id="org.eclipse.jst.ws.axis.consumption.java"
- clientImplementationTypeId="org.eclipse.jst.ws.client.type.java"
- runtimeId="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-
- <required-facet-version facet="jst.utility" version="1.0" allow-newer="true"/>
-
- </clientRuntime>
- </extension>
-
- <!-- define support for Axis Java clients in Web projects -->
- <extension point="org.eclipse.jst.ws.consumption.ui.clientRuntimes">
- <clientRuntime
- id="org.eclipse.jst.ws.axis.consumption.web"
- clientImplementationTypeId="org.eclipse.jst.ws.client.type.java"
- runtimeId="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-
- <required-facet-version facet="jst.web" version="2.3" allow-newer="true"/>
-
- </clientRuntime>
- </extension>
-
- <!-- extend WebServiceSampleTest to support the Axis client runtimes -->
- <extension point="org.eclipse.jst.ws.consumption.ui.tester">
- <tester
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"
- supportedClientRuntimes="org.eclipse.jst.ws.axis.consumption.web org.eclipse.jst.ws.axis.consumption.java">
- </tester>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.antDataMapping">
- <map
- key="InitialSelection"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand"
- property="ObjectSelection"
- transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
- <map
- key="JavaOutput"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Methods"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Style"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Use"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
-
- <map
- key="JavaOutput"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Methods"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Style"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Use"
- operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- </extension>
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUI.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUI.properties
deleted file mode 100644
index 1db0f5000..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUI.properties
+++ /dev/null
@@ -1,105 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2007 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060216 126989 pmoogk@ca.ibm.com - Peter Moogk
-# 20060329 128827 kathy@ca.ibm.com - Kathy Chan
-# 20060329 124667 kathy@ca.ibm.com - Kathy Chan
-# 20060607 144978 kathy@ca.ibm.com - Kathy Chan
-# 20070509 182274 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-#
-# Error messages used in this plugin
-#
-MSG_ERROR_PROJECT_URL=IWAB0514E Unable to get URL for project {0}
-MSG_ERROR_CANNOT_NO_JAVA_BEAN=IWAB0015E A Java bean was not selected
-MSG_ERROR_NO_PROJECT=IWAB0016E A project was not selected
-MSG_ERROR_CANNOT_LOAD_JAVA_BEAN=IWAB0017E The Java bean, {0}, cannot be loaded from {1}
-MSG_ERROR_JAVA_MOF_REFLECT_FAILED=IWAB0521E Failed to analyze the Java bean: {0}.
-MSG_ERROR_READ_BEAN=IWAB0522E Error in reading methods from Java bean.
-MSG_ERROR_UPDATE_AXIS_WSDD=IWAB0524E Error updating Axis deploy.wsdd file
-
-#
-#JavaToWSDLMethodCommand
-#
-MSG_ERROR_JAVA_TO_METHOD=IWAB0019E Error in getting method from Java bean.
-
-#
-#UpdateWEBXMLCommand
-#
-MSG_ERROR_UPDATE_WEB_XML=IWAB0020E Error in adding servlet in web.xml.
-
-#
-#UpdateAxisWSDDFileTask
-#
-MSG_PLUGIN_FILE_URL=Problem locating plugin file
-
-#
-#WebServiceWSDLAxisSelectionPage
-#
-PAGE_MSG_NO_FILE_SPECIFIED=No file specified.
-PAGE_MSG_NO_METHOD_SELECTED=No methods selected.
-
-#
-#WebServiceSkeletonAxisConfigPage
-#
-TOOLTIP_PBSC_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBCF_TEXT_WSDL_FOLDER=The folder of the WSDL file.
-TOOLTIP_PBCF_TEXT_WSDL_FILE=The name of the WSDL file.
-LABEL_URI=Web service URI:
-LABEL_OUTPUT_FOLDER_NAME=WSDL folder:
-LABEL_OUTPUT_FILE_NAME=WSDL file:
-
-#
-#WebServiceAxisBeanClassPage
-#
-PAGE_TITLE_WSBEAN_CLASS=Web Service Java Bean Selection
-PAGE_DESC_WSBEAN_CLASS=Select a Java bean
-LABEL_EXPLORE_MAPPINGS_BEAN2XML=Define custom mapping for package to namespace.
-TOOLTIP_P2N_SHOW_MAPPINGS=Define package to namespace mapping for customization.
-
-#
-#WebServiceAxisBeanConfigPage
-#
-TOOLTIP_PBCF_PAGE=
-TOOLTIP_PBME_TREE_METHODS=Java bean methods to include.
-PAGE_TITLE_WSBEAN_CONFIG=Web Service Java Bean Identity
-PAGE_DESC_WSBEAN_CONFIG=Configure the Java bean as a Web service.
-LABEL_STYLE_USE=Style and use
-STYLE_RPC_LITERAL=document/literal
-STYLE_DOC_LITERAL=document/literal (wrapped)
-STYLE_RPC_ENCODED=RPC/encoded
-
-#
-# AxisCheckCompilerLevelCommand
-#
-MSG_ERROR_COMPILER_LEVEL_NOT_COMPATIBLE=The workbench is running on Java VM version {0}, however, the compiler compliance level of \
-the project "{1}" is set to Java version {2}. \
-Generation of a Web service from Java cannot proceed because the tools will be unable to process the class file compiled within the project. \
-To correct the problem, take one of the following actions: \
-\n1. Open project properties, select Project Facets, and use Add/Remove Project Facet to change Java version to {0} or lower.\
-\n2. Restart the workbench on a version {2} Java VM.
-
-#
-# ModifyWSDLEndpointAddressCommand
-#
-MSG_ERROR_MODIFY_ENDPOINT=Error in modifying the soap:address location URI for WSDL file {0}.
-
-#
-# Messages for ValidateWSIComplianceCommand
-#
-WSI_INCOMPLIANCE_RPC_ENCODED=RPC Encoded is selected
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUIMessages.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUIMessages.java
deleted file mode 100644
index d037eabb0..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/AxisCreationUIMessages.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060329 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060329 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060607 144978 kathy@ca.ibm.com - Kathy Chan
- * 20070509 182274 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AxisCreationUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUI";//$NON-NLS-1$
-
- private AxisCreationUIMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_PROJECT_URL;
- public static String MSG_ERROR_CANNOT_NO_JAVA_BEAN;
- public static String MSG_ERROR_NO_PROJECT;
- public static String MSG_ERROR_CANNOT_LOAD_JAVA_BEAN;
- public static String MSG_ERROR_JAVA_MOF_REFLECT_FAILED;
- public static String MSG_ERROR_READ_BEAN;
- public static String MSG_ERROR_UPDATE_AXIS_WSDD;
- public static String MSG_ERROR_JAVA_TO_METHOD;
- public static String MSG_ERROR_UPDATE_WEB_XML;
- public static String MSG_PLUGIN_FILE_URL;
- public static String PAGE_MSG_NO_FILE_SPECIFIED;
- public static String PAGE_MSG_NO_METHOD_SELECTED;
- public static String TOOLTIP_PBSC_PAGE;
- public static String TOOLTIP_PBCF_TEXT_URI;
- public static String TOOLTIP_PBCF_TEXT_WSDL_FOLDER;
- public static String TOOLTIP_PBCF_TEXT_WSDL_FILE;
- public static String LABEL_URI;
- public static String LABEL_OUTPUT_FOLDER_NAME;
- public static String LABEL_OUTPUT_FILE_NAME;
- public static String PAGE_TITLE_WSBEAN_CLASS;
- public static String PAGE_DESC_WSBEAN_CLASS;
- public static String LABEL_EXPLORE_MAPPINGS_BEAN2XML;
- public static String TOOLTIP_P2N_SHOW_MAPPINGS;
- public static String TOOLTIP_PBCF_PAGE;
- public static String TOOLTIP_PBME_TREE_METHODS;
- public static String PAGE_TITLE_WSBEAN_CONFIG;
- public static String PAGE_DESC_WSBEAN_CONFIG;
- public static String LABEL_STYLE_USE;
- public static String STYLE_RPC_LITERAL;
- public static String STYLE_DOC_LITERAL;
- public static String STYLE_RPC_ENCODED;
- public static String MSG_ERROR_COMPILER_LEVEL_NOT_COMPATIBLE;
- public static String MSG_ERROR_MODIFY_ENDPOINT;
- public static String WSI_INCOMPLIANCE_RPC_ENCODED;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, AxisCreationUIMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisCheckCompilerLevelCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisCheckCompilerLevelCommand.java
deleted file mode 100644
index 28363ed1b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisCheckCompilerLevelCommand.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Check to make sure that the project containing the service bean is not at a compiler compliance setting
- * that's higher than the Java VM the workbench is launched with.
- */
-public class AxisCheckCompilerLevelCommand extends AbstractDataModelOperation {
-
- private String serverProject_;
-
- /**
- * Default CTOR
- */
- public AxisCheckCompilerLevelCommand() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
-
- IStatus status = Status.OK_STATUS;
- String javaSpecVersion = System.getProperty("java.specification.version");
- if (javaSpecVersion != null)
- {
- IProject project = ProjectUtilities.getProject(serverProject_);
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null)
- {
- String projectCompilerLevel = javaProject.getOption("org.eclipse.jdt.core.compiler.compliance", false);
- if (projectCompilerLevel == null)
- {
- projectCompilerLevel = (String)JavaCore.getDefaultOptions().get("org.eclipse.jdt.core.compiler.compliance");
- }
- if (projectCompilerLevel != null)
- {
- if (!compilerLevelsCompatible(javaSpecVersion, projectCompilerLevel)) {
- status = StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_COMPILER_LEVEL_NOT_COMPATIBLE, new String[] {javaSpecVersion, serverProject_, projectCompilerLevel}));
- getEnvironment().getStatusHandler().reportError(status);
- }
- }
- }
- }
- return status;
- }
-
- /**
- * Returns true if and only if the Java specification level
- * of the Eclipse JRE (<code>javaSpecVersion</code> is not
- * lower than the Java specification level of the compiler
- * (<code>projectCompilerLevel</code>.
- * @param javaSpecVersion The Java Specification Version of the JRE.
- * @param projectCompilerLevel The Java project's compiler level.
- * @return True if the Java specification level of the project's
- * compiler does not exceed the Java specification level of the
- * JRE that Eclipse is running on, and false otherwise.
- */
- private boolean compilerLevelsCompatible(String javaSpecVersion, String projectCompilerLevel) {
- return (javaSpecVersion.compareTo(projectCompilerLevel) >= 0);
- }
-
- /**
- * Sets the project whose compiler level should be checked.
- * @param serverProject The project whose compiler level should be checked.
- */
- public void setServerProject(String serverProject) {
- serverProject_ = serverProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
deleted file mode 100644
index 956da3c2d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceInfo;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class AxisOutputCommand extends AbstractDataModelOperation {
-
- private AxisWebService ws_;
- private JavaWSDLParameter javaWSDLParam_;
-
- private String wsdlURI_;
-
- /**
- * Default CTOR
- */
- public AxisOutputCommand() {
- }
-
- public AxisOutputCommand(AxisWebService ws) {
- ws_ = ws;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- ws_.getWebServiceInfo().setWsdlURL(wsdlURI_);
- AxisWebServiceInfo axisWSInfo = new AxisWebServiceInfo();
- axisWSInfo.setJavaWSDLParameter(javaWSDLParam_);
- ws_.setAxisWebServiceInfo(axisWSInfo);
-
- return status;
- }
-
- /**
- * @param wsdlURI
- * The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
- }
-
- public void setJavaWSDLParam (JavaWSDLParameter javaWSDLParam_) {
- this.javaWSDLParam_ = javaWSDLParam_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
deleted file mode 100644
index 6967480e9..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class AxisRunInputCommand extends AbstractDataModelOperation{
-
- private AxisWebService ws_;
- private JavaWSDLParameter javaWSDLParam_;
- private String serverProject_;
- private String serverInstanceId_;
- private String serverFactoryId_;
- private String wsdlURI_;
-
- public AxisRunInputCommand() {
- }
-
- public AxisRunInputCommand(AxisWebService ws, String project) {
- ws_ = ws;
- serverProject_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- javaWSDLParam_ = ws_.getAxisWebServiceInfo().getJavaWSDLParameter();
- serverInstanceId_ = ws_.getWebServiceInfo().getServerInstanceId();
- serverFactoryId_ = ws_.getWebServiceInfo().getServerFactoryId();
- wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
-
- return Status.OK_STATUS;
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- public String getServerInstanceId() {
- return serverInstanceId_;
- }
-
- public String getServerFactoryId() {
- return serverFactoryId_;
- }
-
- public String getWsdlURI() {
- return wsdlURI_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
deleted file mode 100644
index b378b6b78..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-
-
-
-public class AxisServerDefaulter implements IServerDefaulter
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter#recommendDefaultServer(org.eclipse.core.resources.IProject)
- */
- public ServerInfo recommendDefaultServer(IProject project)
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
deleted file mode 100644
index c193e2a4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext;
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.conformance.JAXRPCWebServiceAnalyzer;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-
-public class BUAxisInputCommand extends AbstractDataModelOperation {
-
- private IWebService ws_;
- private String serverProject_;
- private String javaBeanName_;
-
- private String serviceServerTypeID_;
- private IServer serviceExistingServer_ = null;
-
- /**
- * Default CTOR
- */
- public BUAxisInputCommand() {
- }
-
- public BUAxisInputCommand(IWebService ws, String project) {
- ws_ = ws;
- serverProject_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
-
- String serverInstanceId = ws_.getWebServiceInfo().getServerInstanceId();
- String serverFactoryId = ws_.getWebServiceInfo().getServerFactoryId();
- javaBeanName_ = ws_.getWebServiceInfo().getImplURL();
-
- // The following "if" block drives validation of the given
- // Java service class (javaBeanName_) against JAX-RPC if the
- // JAX-RPC validation preference is switched on.
- // For the most part, the JAX-RPC analyzer returns warnings
- // for violations of the JAX-RPC spec, and errors only if
- // actual JDT model navigation fails due to bad classpaths.
- // This allows users the choice of heeding or ignoring the
- // messages returned by the analyzer.
- IEnvironment environment = getEnvironment();
- AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
- if (javaBeanName_ != null && context.isValidateAgainstJAXRPCEnabled())
- {
- JAXRPCWebServiceAnalyzer analyzer = new JAXRPCWebServiceAnalyzer();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(serverProject_);
- if (project != null)
- {
- IStatus status = analyzer.analyze(project,javaBeanName_,monitor);
- if (!status.isOK())
- {
- try
- {
- environment.getStatusHandler().report(status);
- }
- catch (StatusException e)
- {
- return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"",null);
- }
- }
- }
- }
-
- if (serverInstanceId != null) { // server exists
- serviceExistingServer_ = ServerCore.findServer(serverInstanceId);
- if (serviceExistingServer_ != null)
- {
- serviceServerTypeID_ = serviceExistingServer_.getServerType().getId();
- }
- }
- else
- {
- serviceServerTypeID_ = serverFactoryId;
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public String getServiceServerTypeID()
- {
- return serviceServerTypeID_;
- }
-
- public String getJavaBeanName() {
- return javaBeanName_;
- }
-
- public IServer getServiceExistingServer()
- {
- return serviceExistingServer_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUCodeGenOperation.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUCodeGenOperation.java
deleted file mode 100644
index bae225977..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUCodeGenOperation.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- *
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142327 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class BUCodeGenOperation extends AbstractDataModelOperation {
-
- // CopyAxisJarCommand
- private CopyAxisJarCommand copyAxisJarCommand = null;
-
- // Java2WSDLCommand
- private Java2WSDLCommand java2WSDLCommand = null;
- private JavaWSDLParameter javaWSDLParam;
- private String wsdlURI;
-
- // wsdl2JavaCommand
- private WSDL2JavaCommand wsdl2JavaCommand = null;
-
- // UpdateAxisWSDDFileTask
- private UpdateAxisWSDDFileTask updateAxisWsddCommand = null;
- private IProject serviceProject;
-
- // UpdateWEBXMLCommand
- private UpdateWEBXMLCommand updateWebXMLCommand = null;
-
- // RefreshProjectCommand
- private RefreshProjectCommand refreshProjectCommand = null;
-
- /**
- * This command runs the commands in the constructor in a WorkspaceModifyOperation.
- * The commands are listed above, along with their relevant data registry parameters
- * @param java2WSDL
- * @param wsdl2Java
- * @param updateAxisWsdd
- * @param updateWebXML
- */
- public BUCodeGenOperation(){
- copyAxisJarCommand = new CopyAxisJarCommand();
- java2WSDLCommand = new Java2WSDLCommand();
- wsdl2JavaCommand = new WSDL2JavaCommand();
- updateAxisWsddCommand = new UpdateAxisWSDDFileTask();
- updateWebXMLCommand = new UpdateWEBXMLCommand();
- refreshProjectCommand = new RefreshProjectCommand();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
- IEnvironment env = getEnvironment();
- BottomUpWSModifyOperation buOperation = new BottomUpWSModifyOperation(info, env);
- try {
- buOperation.execute(monitor);
- }
- catch(CoreException ce){
- IStatus status = ce.getStatus();
- return status;
- }
- return Status.OK_STATUS;
-
- }
-
- private class BottomUpWSModifyOperation extends WorkspaceModifyOperation {
-
- private IAdaptable info = null;
- private IEnvironment env = null;
-
-
- protected BottomUpWSModifyOperation(IAdaptable adaptable, IEnvironment environment){
- info = adaptable;
- env = environment;
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException{
-
- IStatus status = null;
-
- // CopyAxisJarCommand
- copyAxisJarCommand.setEnvironment(env);
- copyAxisJarCommand.setProject(serviceProject);
- status = copyAxisJarCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR){
- throw new CoreException(status);
- }
-
- // Java2WSDLCommand
- java2WSDLCommand.setEnvironment(env);
- java2WSDLCommand.setJavaWSDLParam(javaWSDLParam);
- status = java2WSDLCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- wsdlURI = java2WSDLCommand.getWsdlURI();
-
- // WSDL2JavaCommand
- wsdl2JavaCommand.setEnvironment(env);
- wsdl2JavaCommand.setJavaWSDLParam(javaWSDLParam);
- status = wsdl2JavaCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- javaWSDLParam = wsdl2JavaCommand.getJavaWSDLParam();
-
- // UpdateAxisWsddCommand
- updateAxisWsddCommand.setEnvironment(env);
- updateAxisWsddCommand.setJavaWSDLParam(javaWSDLParam);
- updateAxisWsddCommand.setServiceProject(serviceProject);
- status = updateAxisWsddCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- javaWSDLParam = updateAxisWsddCommand.getJavaWSDLParam();
-
- // UpdateWebXMLCommand
- updateWebXMLCommand.setEnvironment(env);
- updateWebXMLCommand.setServerProject(serviceProject);
- status = updateWebXMLCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // RefreshProjectCommand
- refreshProjectCommand.setEnvironment(env);
- refreshProjectCommand.setProject(serviceProject);
- status = refreshProjectCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
-
- }
-
- }
-
- public String getWsdlURI() {
- return wsdlURI;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject = serviceProject;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java
deleted file mode 100644
index 7447e14e6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060524 130755 kathy@ca.ibm.com - Kathy Chan
- * 20061221 168787 kathy@ca.ibm.com - Kathy Chan
- * 20070815 188999 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.IModulePublishHelper;
-
-/**
- *
- * This command copies the server-config.wsdd file to it's proper location in the module.
- *
- */
-
-public class CopyDeploymentFileCommand extends AbstractDataModelOperation
-{
- private final String WEB_INF = "WEB-INF";
- private final String SERVER_CONFIG = "server-config.wsdd";
- private String projectName_;
- private String EARProjectName_;
- private String serverInstanceId_;
-
- /**
- * Constructor for CopyDeploymentFileCommand.
- * @param String description
- * @param String name
- *
- */
- public CopyDeploymentFileCommand( String projectName, String earProjectName )
- {
- projectName_ = projectName;
- EARProjectName_ = earProjectName;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- IEnvironment environment = getEnvironment();
-
- FileInputStream finStream = null;
- try
- {
-
- IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_ );
- IServer server = ServerCore.findServer( serverInstanceId_ );
- IProject project = ProjectUtilities.getProject(projectName_);
- IModule projectModule = ServerUtil.getModule(project);
-
- if (server != null && component != null && projectModule != null) {
- IModulePublishHelper publishHelper = (IModulePublishHelper)
- server.loadAdapter(IModulePublishHelper.class, monitor);
- if (publishHelper != null) {
- IModule[] serverModules;
- if (EARProjectName_ == null) {
- serverModules = new IModule [] {projectModule};
- } else {
- IProject EARProject = ProjectUtilities.getProject(EARProjectName_);
- IModule EARProjectModule = ServerUtil.getModule(EARProject);
- serverModules = new IModule [] {EARProjectModule, projectModule};
- }
- IPath publishDirPath = publishHelper.getPublishDirectory(serverModules);
-
- if (publishDirPath != null) {
- IVirtualFolder rootFolder = component.getRootFolder();
- IPath rootFolderPath = ResourceUtils.getWorkspaceRoot().getFile(rootFolder.getWorkspaceRelativePath()).getLocation();
- if (rootFolderPath != null) {
- File rootFolderFile = rootFolderPath.toFile();
- File publishDirFile = publishDirPath.toFile();
- if (!rootFolderFile.equals(publishDirFile)) {
- // copy the server-config.wsdd if the publish directory is not in the same as the project root folder
- IPath path = new Path( WEB_INF ).append( SERVER_CONFIG );
- IPath serverConfigPath = publishDirPath.append(path);
- if (serverConfigPath != null) {
- IVirtualFile newLocation = rootFolder.getFile(path);
- IPath targetPath = newLocation.getWorkspaceRelativePath();
- if (targetPath != null) {
- finStream = new FileInputStream(serverConfigPath.toString());
- if (finStream != null)
- {
- IStatusHandler statusHandler = environment.getStatusHandler();
- ResourceContext context = ((BaseEclipseEnvironment)environment).getResourceContext();
-
- FileResourceUtils.createFile(context,
- targetPath,
- finStream,
- monitor,
- statusHandler);
- finStream.close();
- }
- }
- }
- }
- }
- }
- }
- }
- }
- catch( Throwable e )
- {
- status = StatusUtils.errorStatus(NLS.bind(AxisConsumptionCoreMessages.MSG_ERROR_MOVE_RESOURCE, new String[]{e.getLocalizedMessage()}), e);
- environment.getStatusHandler().reportError(status);
- } finally {
- if (finStream != null) {
- try {
- finStream.close();
- } catch (IOException e) {
- }
- }
- }
-
- return status;
-
- }
-
- public void setServerInstanceId(String serverInstanceId) {
- this.serverInstanceId_ = serverInstanceId;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
deleted file mode 100644
index 8c3418ebc..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class JavaToWSDLMethodCommand extends AbstractDataModelOperation {
-
- private static String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
- private static String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-
- private Hashtable fMethodNames;
- private String fClassName;
- private String fbeanBaseName;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject serviceProject_;
-
- /**
- * Default CTOR
- */
- public JavaToWSDLMethodCommand() {
- }
- /**
- * Default CTOR
- */
- public JavaToWSDLMethodCommand(
- JavaWSDLParameter javaParameter,
- IProject serviceProject) {
- javaWSDLParam_ = javaParameter;
- serviceProject_ = serviceProject;
-
- }
-
- /**
- * JavaToToWSDLMethod execute
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- fbeanBaseName = javaWSDLParam_.getBeanName();
- environment.getLog().log(ILog.INFO, 5070, this, "execute", "beanBaseName = "+fbeanBaseName);
- IStatus status;
- try {
- //Get the qualified bean name; my.package.MyClass
- fMethodNames = new Hashtable();
- Hashtable oldMethodsNames = javaWSDLParam_.getMethods();
- String qName = fbeanBaseName;
-
- if (qName.toLowerCase().endsWith(JAVA_EXTENSION)
- || qName.toLowerCase().endsWith(CLASS_EXTENSION)) {
- qName = qName.substring(0, qName.lastIndexOf('.'));
- }
-
- JavaClass javaClass = JavaMOFUtils.getJavaClass(qName, serviceProject_);
-
- if (!javaClass.isExistingType()) {
- environment.getLog().log(ILog.ERROR, 5022, this, "execute",
- NLS.bind(AxisCreationUIMessages.MSG_ERROR_JAVA_MOF_REFLECT_FAILED,
- new String[] { qName }));
-
- status = StatusUtils.errorStatus(
- NLS.bind(AxisCreationUIMessages.MSG_ERROR_JAVA_MOF_REFLECT_FAILED,
- new String[] { qName }));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // Get the qualified name
- fClassName = javaClass.getQualifiedName();
- String beanName;
- if (fClassName.lastIndexOf('.') != -1) {
- beanName =
- fClassName.substring(
- fClassName.lastIndexOf('.') + 1,
- fClassName.length());
- } else
- beanName = fClassName;
-
- // Walk the java class and get the method names
- gatherMethods(javaClass, beanName, oldMethodsNames);
- /*
- Iterator m = javaClass.getPublicMethodsExtended().iterator();
- while (m.hasNext()) {
- Method method = (Method) m.next();
- if ( ! method.isConstructor()){
- if (!beanName.equals(method.getName())
- && !(isDuplicateMethodName(method
- .getMethodElementSignature()))
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("javax.ejb.EJBObject")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("javax.ejb.EJBObject[]")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("java.lang.Object")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("java.lang.Object[]"))) { //$NON-NLS-1$
- // add the method name to our list of method names
- String methodName =method.getMethodElementSignature();
- Boolean isSelected = new Boolean(true);
- if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
- isSelected = (Boolean)oldMethodsNames.get(methodName);
- fMethodNames.put(methodName, isSelected);
- }
- }
- }
- */
- javaWSDLParam_.setMethods(fMethodNames);
-
- return Status.OK_STATUS;
-
- } catch (Exception e) {
- environment.getLog().log(ILog.ERROR, 5023, this, "execute", AxisCreationUIMessages.MSG_ERROR_READ_BEAN);
-
- status = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_JAVA_TO_METHOD, e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- private void gatherMethods(JavaClass javaClass, String beanName, Hashtable oldMethodsNames)
- {
- String javaName = javaClass.getJavaName();
- if (!javaClass.isInterface()
- && !javaName.equalsIgnoreCase("javax.ejb.EJBObject[]")
- && !javaName.equalsIgnoreCase("javax.ejb.EJBObject")
- && !javaName.equalsIgnoreCase("java.lang.Object[]")
- && !javaName.equalsIgnoreCase("java.lang.Object"))
- {
- List publicMethods = javaClass.getPublicMethods();
- for (Iterator it = publicMethods.iterator(); it.hasNext();)
- {
- Method method = (Method)it.next();
- if (!method.isConstructor()
- && !beanName.equals(method.getName())
- && !(isDuplicateMethodName(method.getMethodElementSignature())))
- {
- // add the method name to our list of method names
- String methodName = method.getMethodElementSignature();
- Boolean isSelected = new Boolean(true);
- if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
- isSelected = (Boolean)oldMethodsNames.get(methodName);
- fMethodNames.put(methodName, isSelected);
- }
- }
- gatherMethods(javaClass.getSupertype(), beanName, oldMethodsNames);
- }
- }
-
- //Returns true if the provided method name already exists in the
- //fMethodNames vector. This method is used to detect overloaded
- //methods in Beans and EJBs, which are currently unsupported.
- private boolean isDuplicateMethodName(String methodName) {
- return (fMethodNames == null ? false: fMethodNames.containsKey(methodName));
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ModifyWSDLEndpointAddressCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ModifyWSDLEndpointAddressCommand.java
deleted file mode 100644
index 4b4f02674..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ModifyWSDLEndpointAddressCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-
-public class ModifyWSDLEndpointAddressCommand extends AbstractDataModelOperation {
-
- private String serverInstanceId;
- private String serverFactoryId;
- private IProject serviceProject;
- private String wsdlURI;
- private WebServicesParser webServicesParser;
- public final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private JavaWSDLParameter javaWSDLParam;
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
- IStatus status;
- IEnvironment environment = getEnvironment();
- try {
- // the correct project URL has already been obtained, no need to modify <soap:address> location URI
- if (!javaWSDLParam.isGuessProjectURL()) {
- return Status.OK_STATUS;
- }
-
- String projectURL = null;
-
- IServer server = null;
- if(serverInstanceId!=null) {
- server = ServerCore.findServer(serverInstanceId);
- }
-
- if(server!=null) {
- projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject, serverFactoryId, server);
- } else {
- projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject, serverFactoryId);
- }
-
- if(projectURL==null || projectURL.trim().length()==0) {
- status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL, new String[] {serviceProject.getName()}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (javaWSDLParam.getProjectURL() == projectURL) {
- return Status.OK_STATUS;
- }
-
- javaWSDLParam.setProjectURL(projectURL); // project URL needed for Axis deploy
-
- // modify the <soap:address> location URI to reflect the correct project URL
- if(wsdlURI!=null) {
- boolean modified = false;
- if (webServicesParser == null) {
- webServicesParser = new WebServicesParserExt();
- }
- Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
- Map services = definition.getServices();
- for (Iterator it = services.values().iterator(); it.hasNext();) {
- Service ser = (Service)it.next();
- Map ports = ser.getPorts();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();) {
- Port p = (Port)it2.next();
- for (Iterator it3 = p.getExtensibilityElements().iterator(); it3.hasNext();) {
- Object obj = it3.next();
- if (obj instanceof SOAPAddress) {
- SOAPAddress soapAddress = (SOAPAddress)obj;
- String wsdlSoapAddress = soapAddress.getLocationURI();
-
- // check if the WSDL SOAP address has the right project URL, if not, update it
- if(wsdlSoapAddress!=null) {
- if (!wsdlSoapAddress.startsWith(projectURL)) {
- // e.g. "http://tempuri.org/services/ServiceName" becomes "/services/ServiceName"
- String servicesString = wsdlSoapAddress.substring(wsdlSoapAddress.indexOf(SERVICE_EXT));
- soapAddress.setLocationURI(projectURL + servicesString);
- modified = true;
- }
-
- }
- }
- }
- }
- }
-
- if (modified) {
- // update the WSDL file and refresh in workspace
- WSDLFactory wsdlFactory = new WSDLFactoryImpl();
- WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- OutputStream os = environment.getURIFactory().newURI(wsdlURI.toString()).getOutputStream();
- wsdlWriter.writeWSDL(definition, os);
- os.close();
-
- URL wsdlURL = new URL (wsdlURI);
- IResource wsdlFile = ResourceUtils.findResourceAtLocation(wsdlURL.getPath(), serviceProject);
- if (wsdlFile != null) {
- wsdlFile.refreshLocal(IResource.DEPTH_ZERO, monitor);
- }
- }
- } else {
- status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_MODIFY_ENDPOINT, new String[] {wsdlURI}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- } catch(Exception e) {
- status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_MODIFY_ENDPOINT, new String[] {wsdlURI}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- return Status.OK_STATUS;
- }
-
-
- public void setServerInstanceId(String serverId) {
- this.serverInstanceId = serverId;
- }
-
- public void setServerFactoryId(String serverFactoryId) {
- this.serverFactoryId = serverFactoryId;
- }
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject = serviceProject;
- }
-
- public void setWsdlURI(String wsdlURI) {
- this.wsdlURI = wsdlURI;
- }
-
- public void setWebServicesParser(WebServicesParser parser) {
- webServicesParser = parser;
- }
-
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
deleted file mode 100644
index dded685f8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060330 128827 kathy@ca.ibm.com - Kathy Chan
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-
-public class TDAxisInputCommand extends AbstractDataModelOperation {
-
- private IWebService ws_;
- private String serverProject_;
-
- private String serverServer_;
- private String serviceServerTypeID_;
- private IServer serviceExistingServer_ = null;
- private String wsdlURI_;
- private WebServiceInfo webServiceInfo_;
-
- /**
- * Default CTOR
- */
- public TDAxisInputCommand() {
- }
-
- public TDAxisInputCommand(IWebService ws, String project) {
- ws_ = ws;
- serverProject_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- serverServer_ = ws_.getWebServiceInfo().getServerInstanceId();
-
- String serverInstanceId = ws_.getWebServiceInfo().getServerInstanceId();
- String serverFactoryId = ws_.getWebServiceInfo().getServerFactoryId();
- if (serverInstanceId != null) { // server exists
- serviceExistingServer_ = ServerCore.findServer(serverInstanceId);
- if (serviceExistingServer_ != null)
- {
- serviceServerTypeID_ = serviceExistingServer_.getServerType().getId();
- }
- }
- else
- {
- serviceServerTypeID_ = serverFactoryId;
- }
-
- wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
- webServiceInfo_ = ws_.getWebServiceInfo();
-
- return Status.OK_STATUS;
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public String getServerServer()
- {
- return serverServer_;
- }
-
- public String getServiceServerTypeID()
- {
- return serviceServerTypeID_;
- }
-
- public String getWsdlURI() {
- return wsdlURI_;
- }
-
- public WebServiceInfo getWebServiceInfo() {
- return webServiceInfo_;
- }
-
- public IServer getServiceExistingServer()
- {
- return serviceExistingServer_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDCodeGenOperation.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDCodeGenOperation.java
deleted file mode 100644
index c4ab91a82..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDCodeGenOperation.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142327 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.BackupSkelImplCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-public class TDCodeGenOperation extends AbstractDataModelOperation {
-
- // CopyAxisJarCommand
- private CopyAxisJarCommand copyAxisJarCommand = null;
-
- // BackupSkelImplCommand
- private BackupSkelImplCommand backupSkelImplCommand = null;
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam;
- private WebServiceInfo webServiceInfo;
-
- // WSDL2JavaCommand
- private WSDL2JavaCommand wsdl2JavaCommand = null;
- private String wsdlURI;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
-
- // Skeleton2WSDLCommand
- private Skeleton2WSDLCommand skeleton2WSDLCommand = null;
- private IProject serverProject;
- private String serviceServerTypeID;
- private IServer serviceExistingServer;
-
- // UpdateWebXMLCommand
- private UpdateWEBXMLCommand updateWebXMLCommand = null;
-
- // RefreshProjectCommand
- private RefreshProjectCommand refreshProjectCommand = null;
-
- /**
- * This command runs the commands passed by the constructor in a WorkspaceModifyOperation.
- * The commands are listed above, with only some of their data registry parameters since some appear
- * to overlap the commands.
- * @param backupSkelImpl
- * @param wsdl2Java
- * @param skeleton2WSDL
- * @param updateWebXML
- */
- public TDCodeGenOperation() {
- copyAxisJarCommand = new CopyAxisJarCommand();
- backupSkelImplCommand = new BackupSkelImplCommand();
- wsdl2JavaCommand = new WSDL2JavaCommand();
- skeleton2WSDLCommand = new Skeleton2WSDLCommand();
- updateWebXMLCommand = new UpdateWEBXMLCommand();
- refreshProjectCommand = new RefreshProjectCommand();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
- IEnvironment env = getEnvironment();
- TopDownWSModifyOperation tdOperation = new TopDownWSModifyOperation(info, env);
- try {
- tdOperation.execute(monitor);
- }
- catch(CoreException ce){
- IStatus status = ce.getStatus();
- return status;
- }
- return Status.OK_STATUS;
- }
-
-
-
- private class TopDownWSModifyOperation extends WorkspaceModifyOperation {
-
- private IAdaptable info = null;
- private IEnvironment env = null;
-
- protected TopDownWSModifyOperation(IAdaptable adaptable, IEnvironment environment){
- info = adaptable;
- env = environment;
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException {
-
- IStatus status = null;
-
- // CopyAxisJarCommand
- copyAxisJarCommand.setEnvironment(env);
- copyAxisJarCommand.setProject(serverProject);
- status = copyAxisJarCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR){
- throw new CoreException(status);
- }
-
- // backupSkelImplCommand
- backupSkelImplCommand.setEnvironment(env);
- backupSkelImplCommand.setWebServicesParser(webServicesParser);
- backupSkelImplCommand.setJavaWSDLParam(javaWSDLParam);
- backupSkelImplCommand.setWebServiceInfo(webServiceInfo);
- status = backupSkelImplCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // wsdl2JavaCommand
- wsdl2JavaCommand.setEnvironment(env);
- wsdl2JavaCommand.setWsdlURI(wsdlURI);
- wsdl2JavaCommand.setHttpBasicAuthUsername(httpBasicAuthUsername);
- wsdl2JavaCommand.setHttpBasicAuthPassword(httpBasicAuthPassword);
- wsdl2JavaCommand.setJavaWSDLParam(javaWSDLParam);
- status = wsdl2JavaCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- javaWSDLParam = wsdl2JavaCommand.getJavaWSDLParam();
-
- // Skeleton2WSDLCommand
- skeleton2WSDLCommand.setEnvironment(env);
- skeleton2WSDLCommand.setWebServicesParser(webServicesParser);
- skeleton2WSDLCommand.setJavaWSDLParam(javaWSDLParam);
- skeleton2WSDLCommand.setServerProject(serverProject);
- skeleton2WSDLCommand.setServiceServerTypeID(serviceServerTypeID);
- skeleton2WSDLCommand.setServiceExistingServer(serviceExistingServer);
- status = skeleton2WSDLCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
- wsdlURI = skeleton2WSDLCommand.getWsdlURI();
-
- // UpdateWebXMLCommand
- updateWebXMLCommand.setEnvironment(env);
- updateWebXMLCommand.setServerProject(serverProject);
- status = updateWebXMLCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- // RefreshProjectCommand
- refreshProjectCommand.setEnvironment(env);
- refreshProjectCommand.setProject(serverProject);
- status = refreshProjectCommand.execute(monitor, info);
- if (status.getSeverity() == Status.ERROR) {
- throw new CoreException(status);
- }
-
- }
-
- }
-
-
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setWebServiceInfo(WebServiceInfo webServiceInfo) {
- this.webServiceInfo = webServiceInfo;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
- /**
- * @param httpBasicAuthPassword
- * The httpBasicAuthPassword to set.
- */
- public void setHttpBasicAuthPassword(String httpBasicAuthPassword) {
- this.httpBasicAuthPassword = httpBasicAuthPassword;
- }
-
- /**
- * @param httpBasicAuthUsername
- * The httpBasicAuthUsername to set.
- */
- public void setHttpBasicAuthUsername(String httpBasicAuthUsername) {
- this.httpBasicAuthUsername = httpBasicAuthUsername;
- }
-
- public void setWsdlURI(String wsdlURI) {
- this.wsdlURI = wsdlURI;
- }
-
- public String getWsdlURI() {
- return wsdlURI;
- }
-
- /**
- * @param serverProject The serverProject to set.
- */
- public void setServerProject(IProject serverProject) {
- this.serverProject = serverProject;
- }
-
- public void setServiceServerTypeID(String id) {
- this.serviceServerTypeID = id;
- }
-
- public void setServiceExistingServer(IServer server) {
- this.serviceExistingServer = server;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
deleted file mode 100644
index 0efea660a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20070528 186056 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class UpdateWEBXMLCommand extends AbstractDataModelOperation {
-
- private IProject serverProject;
-
- public UpdateWEBXMLCommand( )
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (serverProject != null) {
- IStatus status = null;
- status = addServlet(serverProject, getAxisServletDescriptor());
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- addServlet(serverProject, getAdmintServletDescriptor());
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- return Status.OK_STATUS;
- }
-
- private ServletDescriptor getAxisServletDescriptor() {
-
- ServletDescriptor sd = new ServletDescriptor();
- sd._name = "AxisServlet"; //$NON-NLS-1$
- sd._displayName = "Apache-Axis Servlet"; //$NON-NLS-1$
- sd._className = "org.apache.axis.transport.http.AxisServlet"; //$NON-NLS-1$
- sd._mappings = new String[] { "/servlet/AxisServlet", //$NON-NLS-1$
- "*.jws", //$NON-NLS-1$
- "/services/*" }; //$NON-NLS-1$
- return sd;
- }
-
- private ServletDescriptor getAdmintServletDescriptor() {
- ServletDescriptor sd = new ServletDescriptor();
- sd._name = "AdminServlet"; //$NON-NLS-1$
- sd._displayName = "Axis Admin Servlet"; //$NON-NLS-1$
- sd._className = "org.apache.axis.transport.http.AdminServlet"; //$NON-NLS-1$
- sd._mappings = new String[] { "/servlet/AdminServlet" }; //$NON-NLS-1$
- sd._loadOnStartup = new Integer(100);
- return sd;
- }
-
- public IStatus addServlet(final IProject webProject, final ServletDescriptor servletDescriptor) {
-
- try {
-
- final IModelProvider provider = ModelProviderManager.getModelProvider(webProject);
-
- provider.modify(new Runnable() {
- public void run() {
- Object object = provider.getModelObject();
- if (object instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp javaeeWebApp = (org.eclipse.jst.javaee.web.WebApp) object;
- addJavaeeServlet(webProject, servletDescriptor, javaeeWebApp);
- } else if (object instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- WebApp webApp = (WebApp) object;
- addServlet(webProject, servletDescriptor, webApp);
- }
-
- }
- }
- , null);
-
- return Status.OK_STATUS;
- } catch (Exception e) {
-
- return StatusUtils.errorStatus(
- AxisCreationUIMessages.MSG_ERROR_UPDATE_WEB_XML,
- e);
- }
- }
-
- private void addServlet(IProject webProject, ServletDescriptor servletDescriptor, WebApp webapp) {
-
- List theServlets = webapp.getServlets();
- for (int i = 0; i < theServlets.size(); i++) {
- Servlet aServlet = (Servlet) theServlets.get(i);
- if (aServlet.getServletName().equals(servletDescriptor._name)) {
- return;
- }
- }
-
- WebapplicationFactory factory = WebapplicationFactory.eINSTANCE;
-
- Servlet servlet = factory.createServlet();
- ServletType servletType = factory.createServletType();
- servlet.setWebType(servletType);
- servlet.setServletName(servletDescriptor._name);
- servletType.setClassName(servletDescriptor._className);
- if(servletDescriptor._displayName != null){
- servlet.setDisplayName(servletDescriptor._displayName);
- }
- if(servletDescriptor._loadOnStartup != null){
- servlet.setLoadOnStartup(servletDescriptor._loadOnStartup);
- }
- if(servletDescriptor._params != null){
- Properties properties = servlet.getParamsAsProperties();
- properties.putAll(servletDescriptor._params);
- }
- webapp.getServlets().add(servlet);
-
- if(servletDescriptor._mappings != null){
- for(int i=0; i<servletDescriptor._mappings.length; i++){
- ServletMapping servletMapping = factory.createServletMapping();
- servletMapping.setServlet(servlet);
- servletMapping.setUrlPattern(servletDescriptor._mappings[i]);
- webapp.getServletMappings().add(servletMapping);
- }
- }
- }
-
- private void addJavaeeServlet(IProject webProject, ServletDescriptor servletDescriptor, org.eclipse.jst.javaee.web.WebApp webapp) {
-
- List theServlets = webapp.getServlets();
- for (int i = 0; i < theServlets.size(); i++) {
- org.eclipse.jst.javaee.web.Servlet aServlet = (org.eclipse.jst.javaee.web.Servlet) theServlets.get(i);
- if (aServlet.getServletName().equals(servletDescriptor._name)) {
- return;
- }
- }
-
- WebFactory factory = WebFactory.eINSTANCE;
-
- org.eclipse.jst.javaee.web.Servlet servlet = factory.createServlet();
-
- servlet.setServletName(servletDescriptor._name);
- servlet.setServletClass(servletDescriptor._className);
-
- if(servletDescriptor._displayName != null){
- DisplayName displayNameObj = JavaeeFactory.eINSTANCE.createDisplayName();
- displayNameObj.setValue(servletDescriptor._displayName);
- servlet.getDisplayNames().add(displayNameObj);
- }
- if(servletDescriptor._loadOnStartup != null){
- servlet.setLoadOnStartup(servletDescriptor._loadOnStartup);
- }
-// if(servletDescriptor._params != null){
-// Properties properties = servlet.getParamsAsProperties();
-// properties.putAll(servletDescriptor._params);
-// }
- webapp.getServlets().add(servlet);
-
- if(servletDescriptor._mappings != null){
- for(int i=0; i<servletDescriptor._mappings.length; i++){
- org.eclipse.jst.javaee.web.ServletMapping servletMapping = factory.createServletMapping();
- servletMapping.setServletName(servlet.getServletName());
- UrlPatternType url = JavaeeFactory.eINSTANCE.createUrlPatternType();
- url.setValue(servletDescriptor._mappings[i]);
- servletMapping.getUrlPatterns().add(url);
- webapp.getServletMappings().add(servletMapping);
- }
- }
-}
-
- public void setServerProject(IProject serverProject)
- {
- this.serverProject = serverProject;
- }
-
- public class ServletDescriptor {
- String _name;
- String _className;
- String _displayName;
- Map _params;
- String[] _mappings;
- Integer _loadOnStartup;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ValidateWSIComplianceCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ValidateWSIComplianceCommand.java
deleted file mode 100644
index ce5635f6f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ValidateWSIComplianceCommand.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060607 144978 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
-import org.eclipse.wst.ws.internal.preferences.WSIComplianceUtils;
-
-
-public class ValidateWSIComplianceCommand extends AbstractDataModelOperation
-{
- private JavaWSDLParameter javaWSDLParam = null;
- private Vector status = null;
- private IProject serviceProject_ = null;
-
- public ValidateWSIComplianceCommand() {
- }
-
- public IStatus execute (IProgressMonitor monitor, IAdaptable adaptable)
- {
-
- IEnvironment environment = getEnvironment();
-
- if (javaWSDLParam == null) {
- IStatus simpleStatus = StatusUtils.errorStatus( AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(simpleStatus);
- return simpleStatus;
- }
-
- status = new Vector();
-
- PersistentWSIContext wsiContext = new PersistentWSIContext();
- int severity = WSIComplianceUtils.getWSISeverity(serviceProject_, wsiContext);
- checkRPCEncoded(severity);
- Status[] statuses = (Status[]) status.toArray(new Status[status.size()]);
-
- if (statuses.length == 0 ||
- WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statuses, serviceProject_, wsiContext))
- return Status.OK_STATUS;
- else {
- return StatusUtils.errorStatus("");
- }
- }
-
- private void checkRPCEncoded(int severity)
- {
- if (JavaWSDLParameter.STYLE_RPC.equals(javaWSDLParam.getStyle()) &&
- JavaWSDLParameter.USE_ENCODED.equals(javaWSDLParam.getUse()))
- status.add (new Status(severity, "ValidateWSIComplianceCommand", 0,
- AxisCreationUIMessages.WSI_INCOMPLIANCE_RPC_ENCODED, null));
-
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
-
-/**
- * @param javaWSDLParam The javaWSDLParam to set.
- * @todo Generated comment
- */
-public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
-}
-
-/**
- * @param serviceProject_ The serviceProject_ to set.
- * @todo Generated comment
- */
-public void setServiceProject(IProject serviceProject_) {
- this.serviceProject_ = serviceProject_;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
deleted file mode 100644
index 4addd2ced..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.plugin;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.osgi.framework.BundleContext;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisCreationUIPlugin extends AbstractUIPlugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.axis.creation.ui"; //$NON-NLS-1$
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceAxisCreationUIPlugin instance_;
- private ILog log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceAxisCreationUIPlugin()
- {
- super();
- if (instance_ == null)
- {
- instance_ = this;
- }
- log_ = EnvironmentService.getEclipseLog();
-
- }
-
- // This method is needed to keep the logging from blowing up.
- public String toString()
- {
- return ID;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceWasCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp.ui");
- * @return The WebServiceConsumptionUIPlugin singleton.
- */
- static public WebServiceAxisCreationUIPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- * @throws CoreException If this plugin fails to start.
- */
- public void start( BundleContext context ) throws CoreException
- {
- log_.log(ILog.INFO, 5068, this, "start", "Starting plugin org.eclipse.jst.ws.axis.creation.ui");
-
- try
- {
- super.start( context );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5068, this, "start", exc );
- }
-
- setPreferences();
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- * @throws CoreException If this plugin fails to shutdown.
- */
- public void stop( BundleContext context ) throws CoreException
- {
- log_.log(ILog.INFO, 5069, this, "stop", "Shutting plugin org.eclipse.jst.ws.axis.creation.ui");
-
- try
- {
- super.stop( context );
- }
- catch( Exception exc )
- {
- log_.log( ILog.ERROR, 5068, this, "start", exc );
- }
- }
-
-
- /**
- * Sets the general preferences to the values in the preferences store.
- **/
- public void setPreferences()
- {
- // setDialogsPreferences();
- }
-
- /**
- * @see AbstractUIPlugin#initializeDefaultPreferences
- */
- protected void initializeDefaultPreferences(IPreferenceStore preferenceStore) {
-
- // Set the defaults Preference
-// ActionDialogsPreferenceHelper.initializeDefaults(preferenceStore);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUConfigCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUConfigCommand.java
deleted file mode 100644
index 108ef4054..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUConfigCommand.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class BUConfigCommand extends AbstractDataModelOperation {
- public BUConfigCommand() {
- }
-
- /*
- * The execute method of this command do nothing. It is merely an anchor point for UI page
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
- return Status.OK_STATUS;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BackupSkelImplCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BackupSkelImplCommand.java
deleted file mode 100644
index e706321c7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BackupSkelImplCommand.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060330 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060403 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060524 127343 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070116 169138 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070815 188999 pmoogk@ca.ibm.com - Peter Moogk
- * 20071113 209075 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-public class BackupSkelImplCommand extends AbstractDataModelOperation
-{
- private final String IMPL = "Impl"; //$NON-NLS-1$
- private final String DOT = "."; //$NON-NLS-1$
- private final String JAVA = "java"; //$NON-NLS-1$
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam;
-
- private WebServiceInfo webServiceInfo;
-
- public BackupSkelImplCommand( ) {
- }
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (javaWSDLParam == null)
- {
- IStatus status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- IStatus status = Status.OK_STATUS;
- // Read WSDL
- Definition definition = null;
- String wsdlURL = javaWSDLParam.getInputWsdlLocation();
- try
- {
- URL url = new URL(wsdlURL);
- definition = webServicesParser.getWSDLDefinition(url.toString());
- }
- catch(MalformedURLException e)
- {
- wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlURL));
- definition = webServicesParser.getWSDLDefinition(wsdlURL);
- }
-
- // Compute the qualified name of the Java bean skeleton
- Service service = null;
- Port port = null;
- ArrayList implURLList = new ArrayList();
- if (definition != null) {
- StringBuffer beanName = new StringBuffer();
-
- //first check if there is a mapping for this namespace to a package name
- //if not then compute package name from namespace
- String beanPackageName = null;
- Map mappings = javaWSDLParam.getMappings();
- if (mappings != null)
- {
- String targetNamespace = definition.getTargetNamespace();
- beanPackageName = (String)mappings.get(targetNamespace);
- }
- if (beanPackageName == null)
- {
- beanPackageName = WSDLUtils.getPackageName(definition);
- }
-
- javaWSDLParam.setBeanPackage(beanPackageName);
- beanName.append(beanPackageName);
- beanName.append(DOT);
-
- service = (Service) definition.getServices().values().iterator().next();
- port = (Port) service.getPorts().values().iterator().next();
- Binding binding = port.getBinding();
-
- String qName = binding.getQName().getLocalPart();
- beanName.append(qName.substring(0,1).toUpperCase());//Fix for bug 169138, need to ensure first char is uppercase
- beanName.append(qName.substring(1));
-
- beanName.append(IMPL);
- String beanNameString = beanName.toString();
- javaWSDLParam.setBeanName(beanNameString);
-
- // Defect 209075 - Do not back up anymore since skeleton merge is defaulted to on.
-
- String beanNamePathString = beanNameString.replace('.',IPath.SEPARATOR);
- IPath skelImplPath = new Path (javaWSDLParam.getJavaOutput()).append(new Path (beanNamePathString)).addFileExtension(JAVA);
-
- // store the name of the implURL
- String implURLString;
- try {
- implURLString = skelImplPath.toFile().toURL().toString();
- } catch (MalformedURLException e1) {
- implURLString = PlatformUtils.getFileURLFromPath(skelImplPath);
- }
- implURLList.add( implURLString );
-
- String[] implURLArray = new String[implURLList.size()];
- webServiceInfo.setImplURLs( (String[]) (implURLList.toArray(implURLArray)));
-
- }
- else {
- status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_DEFINITION, new String[] {wsdlURL}));
- environment.getStatusHandler().reportError(status);
- }
-
- return status;
- }
-
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
-
-public void setWebServiceInfo(WebServiceInfo webServiceInfo) {
- this.webServiceInfo = webServiceInfo;
-}
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
deleted file mode 100644
index eb5636e5f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060524 128601 andyzhai@ca.ibm.com - Andy Zhai
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.ClasspathUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Utils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation {
-
- private JavaWSDLParameter javaWSDLParam_ = null;
- private IProject serviceProject_;
- private String javaBeanName_; // this needs to be set by the extension with initial selection
- private String WSDLServiceURL_;
- private String WSDLServicePathname_;
- private WebServicesParser WSParser_;
- private String serviceServerTypeID_;
-
- private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
- public final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- public final byte MODE_BEAN = (byte) 0;
- public final String SERVICE_NAME_EXT = "Service"; //$NON-NLS-1$
- private final String TEMP_URI = "http://tempuri.org/"; //$NON-NLS-1$
- private IServer serviceExistingServer;
-
- public DefaultsForServerJavaWSDLCommand( )
- {
- }
-
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- IStatus status;
- if (javaWSDLParam_ == null) {
- status = StatusUtils.errorStatus( AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (javaBeanName_ == null) { // either set by extension point or bean class page
- javaBeanName_ = javaWSDLParam_.getBeanName();
- if (javaBeanName_ == null) {
- //rm javaBeanName_ = isdElement.getJavaBeanName();
- javaWSDLParam_.setBeanName(javaBeanName_);
- }
- }
- // rm WSParser_ = (WebServicesParser) wse_.getWSParser();
-
- javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
- javaWSDLParam_.setSkeletonDeploy(false);
-
- javaWSDLParam_.setBeanName(javaBeanName_);
- String classpath = ClasspathUtils.getInstance().getClasspathString(serviceProject_);
- javaWSDLParam_.setClasspath(classpath);
-
- String simpleBeanName = javaBeanName_;
- if (javaBeanName_ != null) {
- int index = javaBeanName_.lastIndexOf('.');
- if (index != -1) {
- simpleBeanName = javaBeanName_.substring(index + 1);
- }
- }
- String namespace = WSDLUtils.makeNamespace(javaWSDLParam_.getBeanName());
- javaWSDLParam_.setNamespace(namespace);
-
- javaWSDLParam_.setPortTypeName(simpleBeanName);
- javaWSDLParam_.setServiceName(simpleBeanName + SERVICE_NAME_EXT);
-
- IPath moduleServerRoot = null;
-
- IPath modulePath = serviceProject_.getFullPath();
- IPath webinfPath = serviceProject_.getFullPath();
- try {
- if (J2EEUtils.isWebComponent(serviceProject_)){
- moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_);
- modulePath = J2EEUtils.getWebContentPath(serviceProject_);
- webinfPath = J2EEUtils.getWebInfPath( serviceProject_ );
- }
- } catch (Exception e) {
- status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_DEFAULT_BEAN, e );
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- IPath wsdlPath =
- modulePath.append(WSDL_FOLDER).append(simpleBeanName).addFileExtension(WSDL_EXT);
-
- try{
- IFolder folder = ResourceUtils.getWorkspaceRoot().getFolder(modulePath.append(WSDL_FOLDER));
- FileUtil.createFolder(folder, true, true);
-
- }
- catch(CoreException e){
- status = StatusUtils.errorStatus( AxisConsumptionUIMessages.MSG_ERROR_WRITE_WSDL, e );
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- String wsdlLocation = ResourceUtils.getWorkspaceRoot().getFile(wsdlPath).getLocation().toString();
-
- javaWSDLParam_.setOutputWsdlLocation(wsdlLocation);
- javaWSDLParam_.setInputWsdlLocation(new File(wsdlLocation).toURI().toString());
- WSDLServicePathname_ = wsdlPath.toString();
-
- if (wsdlPath != null) {
- String wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
- WSDLServiceURL_ = wsdlURL;
- // set parser
- if (wsdlURL == null || wsdlURL.length() <= 0) {
- IResource res =
- ResourceUtils.findResource(WSDLServicePathname_);
- if (res != null)
- wsdlURL = (new Utils()).toFileSystemURI(res);
- }
- if (wsdlURL != null && wsdlURL.length() > 0) {
- if (WSParser_ == null) {
- WSParser_ = new WebServicesParserExt();
- }
- }
- }
-
- javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
- javaWSDLParam_.setUse(JavaWSDLParameter.USE_LITERAL);
-
- String projectURL = null;
- if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
- {
- projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, serviceServerTypeID_, serviceExistingServer);
- }
- if (projectURL == null) // either no server type defined or server not able to get project URL
- {
- projectURL = TEMP_URI + serviceProject_.getName();
- javaWSDLParam_.setGuessProjectURL(true);
- }
- javaWSDLParam_.setProjectURL(projectURL);
- String serviceURL = projectURL + SERVICE_EXT + simpleBeanName;
- javaWSDLParam_.setUrlLocation(serviceURL);
-
- javaWSDLParam_.setMetaInfOnly(true);
-
- String javaOutput = ResourceUtils.findResource(moduleServerRoot).getLocation().toString();
-
- String serviceName = javaWSDLParam_.getServiceName();
- IPath outputPath = ResourceUtils.findResource(webinfPath).getLocation();
- String output = serviceProject_.getFullPath().toString();
- if (outputPath!=null)
- output = outputPath.append(serviceName).toString();
-
- javaWSDLParam_.setJavaOutput(javaOutput);
- javaWSDLParam_.setOutput(output);
-
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject_ = serviceProject;
- }
-
- public void setJavaBeanName(String javaBeanName) {
- this.javaBeanName_ = javaBeanName;
- }
-
- public String getWSDLServiceURL() {
- return WSDLServiceURL_;
- }
-
- public String getWSDLServicePathname() {
- return WSDLServicePathname_;
- }
-
- public void setParser(WebServicesParser wsParser) {
- this.WSParser_ = wsParser;
- }
-
- public WebServicesParser getParser() {
- return WSParser_;
- }
-
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- if (objectSelection != null && !objectSelection.isEmpty())
- {
- Object object = objectSelection.getFirstElement();
- if (object instanceof String)
- setJavaBeanName((String)object);
- }
- }
-
- public void setServiceServerTypeID(String id)
- {
- serviceServerTypeID_ = id;
- }
-
- public void setServiceExistingServer(IServer existingServer) {
- serviceExistingServer = existingServer;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
deleted file mode 100644
index f8f6c412a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- * 20070112 165721 makandre@ca.ibm.com - Andrew Mak, WSDL import cannot use relative import with to parent directories
- * 20070125 171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- * 20070409 181635 makandre@ca.ibm.com - Andrew Mak, WSDLCopier utility should create target folder
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.util.WSDLCopier;
-
-public class Skeleton2WSDLCommand extends AbstractDataModelOperation
-{
-
- private static final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam;
- private IProject serverProject;
- private String serviceServerTypeID_;
- private IServer serviceExistingServer;
- private final String TEMP_URI = "http://tempuri.org/"; //$NON-NLS-1$
-
- public Skeleton2WSDLCommand( ) {
- }
-
- /**
- * Execute Skeleton2WSDLCommand
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (javaWSDLParam == null)
- {
- IStatus status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // Read WSDL
- Definition definition = null;
- String wsdlURL = javaWSDLParam.getInputWsdlLocation();
- try
- {
- URL url = new URL(wsdlURL);
- definition = webServicesParser.getWSDLDefinition(url.toString());
- }
- catch(MalformedURLException e)
- {
- wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlURL));
- definition = webServicesParser.getWSDLDefinition(wsdlURL);
- }
-
- // Compute the qualified name of the Java bean skeleton
- Service service = null;
- Port port = null;
- if (definition != null) {
-
- // beanName and beanPackageName are now set in BackupSkelImplCommand
-
- service = (Service) definition.getServices().values().iterator().next();
- port = (Port) service.getPorts().values().iterator().next();
-
- javaWSDLParam.setPortTypeName(WSDLUtils.getPortTypeName(definition));
- javaWSDLParam.setServiceName(WSDLUtils.getServiceElementName(definition));
-
- }
- else {
- IStatus status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_DEFINITION, new String[] {wsdlURL}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // Modify WSDL endpoint
- if (port == null) {
- IStatus status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WSDL_NO_PORT, new String[] {wsdlURL}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
- Map services = definition.getServices();
- for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
- {
- Service s = (Service)servicesIt.next();
- Map ports = s.getPorts();
- for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
- {
- Port p = (Port)portsIt.next();
- modifyEndpoint(p);
- }
- }
-
- // Set WSDL file name: javaWSDLParam.setOutputWsdlLocation();
- IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-
- String wsdlLocation = javaWSDLParam.getOutputWsdlLocation();
- IPath wsdlPath = null;
- IFile outputFile = null;
- try {
- if(wsdlLocation != null){
- outputFile = workspace.getFileForLocation( new Path(wsdlLocation));
- }
- else{
-// wsdlPath = serverProject.getFullPath();
-//
-// if (serverProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-// J2EEWebNatureRuntime webProject =
-// (J2EEWebNatureRuntime) serverProject.getNature(
-// IWebNatureConstants.J2EE_NATURE_ID);
-// wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
-// //wsdlPath = wsdlPath.append(webProject.getWEBINFPath());
-// }
-// else if (serverProject.hasNature(IEJBNatureConstants.NATURE_ID))
-// {
-// EJBNatureRuntime ejbProject = EJBNatureRuntime.getRuntime(serverProject);
-// wsdlPath = wsdlPath.append(ejbProject.getMetaFolder().getProjectRelativePath().addTrailingSeparator());
-// }
-// TODO: handle EJB case
- wsdlPath = J2EEUtils.getWebContentPath( serverProject );
- IPath wsdlFilePath = wsdlPath.append(WSDL_FOLDER).append(port.getName()).addFileExtension(WSDL_EXT);
- IFolder folder = ResourceUtils
- .getWorkspaceRoot()
- .getFolder(wsdlPath.append(WSDL_FOLDER));
- FileUtil.createFolder(folder, true, true);
- outputFile = workspace.getFile(wsdlFilePath);
- wsdlLocation = outputFile.getLocation().toString();
- javaWSDLParam.setOutputWsdlLocation(wsdlLocation);
-
- }
-
- String folder = outputFile.getParent().getLocation().toFile().toURL().toString();
- String filename = outputFile.getName();
-
- WSDLCopier copier = new WSDLCopier(webServicesParser);
- copier.setSourceURI(wsdlURL, definition);
- copier.setTargetFolderURI(folder);
- copier.setTargetFilename(filename);
-
- ResourceUtils.getWorkspace().run(copier, monitor);
-
- String newPath = outputFile.getParent().getLocation().append(copier.getRelativePath()).toString();
- javaWSDLParam.setOutputWsdlLocation(newPath);
- }
- catch (Exception e) {
- IStatus status = StatusUtils.errorStatus( NLS.bind(AxisConsumptionUIMessages.MSG_ERROR_WRITE_WSDL, new String[] { wsdlLocation }), e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- return Status.OK_STATUS;
- }
-
- private IStatus modifyEndpoint(Port port)
- {
- Iterator it = port.getExtensibilityElements().iterator();
- SOAPAddress soapAddress = null;
- while (it.hasNext())
- {
- Object obj = it.next();
- if (obj instanceof SOAPAddress)
- {
- soapAddress = (SOAPAddress)obj;
- break;
- }
- }
- if (soapAddress != null)
- {
-
- String projectURL = null;
- if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
- {
- projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_, serviceExistingServer);
- }
-
- if (projectURL == null) // either no server type defined or server not able to get project URL
- {
- projectURL = TEMP_URI + serverProject.getName();
- javaWSDLParam.setGuessProjectURL(true);
- }
- javaWSDLParam.setProjectURL(projectURL);
- StringBuffer serviceURL = new StringBuffer(projectURL);
- serviceURL.append(SERVICE_EXT).append(port.getName());
- javaWSDLParam.setUrlLocation(serviceURL.toString());
- soapAddress.setLocationURI(serviceURL.toString());
- }
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- /**
- * @param serverProject The serverProject to set.
- */
- public void setServerProject(IProject serverProject) {
- this.serverProject = serverProject;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
- public String getWsdlURI()
- {
- File file = new File(getJavaWSDLParam().getOutputWsdlLocation());
- String url = "";
- try {
- url = file.toURL().toString();
- }
- catch(MalformedURLException mue){}
- return url;
- }
-
- public void setServiceServerTypeID(String id)
- {
- serviceServerTypeID_ = id;
- }
-
-public void setServiceExistingServer(IServer existingServer) {
- serviceExistingServer = existingServer;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDConfigCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDConfigCommand.java
deleted file mode 100644
index 4c412ef2f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDConfigCommand.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class TDConfigCommand extends AbstractDataModelOperation
-{
- public TDConfigCommand()
- {
- }
-
- /*
- * The execute method of this command do nothing. It is merely an anchor point for UI page
- */
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) {
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
deleted file mode 100644
index f925cb17e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060517 134104 kathy@ca.ibm.com - Kathy Chan
- * 20071030 128419 kelvinhc@ca.ibm.com - Kelvin H. Cheung
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class UpdateAxisWSDDFileTask extends AbstractDataModelOperation {
-
- private final String DEPLOY_XSL = "deploy.xsl"; //$NON-NLS-1$
- private final String DEPLOY_BAK = "deploy.wsdd.bak"; //$NON-NLS-1$
- private final String CLASSNAME_PARAM = "newClassName"; //$NON-NLS-1$
- private JavaWSDLParameter javaWSDLParam_;
- private IProject serviceProject_;
-
- public UpdateAxisWSDDFileTask()
- {
- }
-
- /**
- * Execute UpdateAxisWSDDFileTask
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status = Status.OK_STATUS;
- if (javaWSDLParam_ == null) {
- status = StatusUtils.errorStatus(AxisConsumptionCoreMessages.MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- IProject project = serviceProject_;
-
- String outputLocation = javaWSDLParam_.getJavaOutput();
- if (outputLocation == null) {
- return status;
- }
-
- String webContentPath = J2EEUtils.getWebContentContainer( project ).getLocation().toString();
- try {
-
- if (javaWSDLParam_.getDeploymentFiles() != null
- && javaWSDLParam_.getDeploymentFiles().length > 0) {
-
- String wsdd_deploy = javaWSDLParam_.getDeploymentFiles()[0];
- IPath deployPath = new Path(wsdd_deploy);
- String deployBackup =
- deployPath
- .removeLastSegments(1)
- .append(DEPLOY_BAK)
- .toString();
- FileUtil.createTargetFile(wsdd_deploy, deployBackup, true);
-
- TransformerFactory tFactory = TransformerFactory.newInstance();
-
- // Use the TransformerFactory to instantiate a Transformer that will work with
- // the stylesheet you specify. This method call also processes the stylesheet
- // into a compiled Templates object.
- Transformer transformer =
- tFactory.newTransformer(new StreamSource(getPluginFileAsInputStream(DEPLOY_XSL)));
- transformer.setParameter(CLASSNAME_PARAM, javaWSDLParam_.getBeanName());
-
- // Use the Transformer to apply the associated Templates object to an XML document
- // (foo.xml) and write the output to a file (foo.out).
- FileOutputStream wsddStream = new FileOutputStream( wsdd_deploy );
-
- try
- {
- transformer.transform( new StreamSource(deployBackup), new StreamResult(wsddStream) );
- }
- finally
- {
- wsddStream.close();
- }
-
-
- IResource deployFile = ResourceUtils.findResourceAtLocation(wsdd_deploy, project);
- if( deployFile != null )
- {
- deployFile.refreshLocal( IResource.DEPTH_ZERO, monitor );
- }
-
- }
-
- } catch (Exception e) {
- String[] errorMsgStrings = new String[]{project.toString(), outputLocation.toString(), webContentPath.toString()};
- status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_UPDATE_AXIS_WSDD, errorMsgStrings), e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- private InputStream getPluginFileAsInputStream(String pluginfileName) throws CoreException {
- try {
- InputStream is = WebServiceAxisCreationUIPlugin.getInstance().getBundle().getEntry(pluginfileName).openStream();
-
- return is;
- } catch (IOException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisCreationUIPlugin.ID,
- 0,
- AxisCreationUIMessages.MSG_PLUGIN_FILE_URL,
- e));
- }
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- javaWSDLParam_ = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
deleted file mode 100644
index 8b795a208..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class BUAxisDefaultingCommand extends AbstractDataModelOperation
-{
-
- //Provide
- private IServer serviceExistingServer_;
- private JavaWSDLParameter javaWSDLParam_;
- private String javaBeanName_;
- private WebServicesParser parser_;
- private boolean forceBuild_ = true;
- private Boolean IsWebProjectStartupRequested = Boolean.TRUE; // rsk revisit
- private ValidationManager validationManager_;
- private boolean customizeServiceMappings_ = false;
-
- //This is proxy and client related information
- //which can be nulled for commands dealing
- //with service creation.
- //rsk revisit
- private Boolean isProxyProject_ = Boolean.FALSE;
- private String clientRuntimeID_ = null;
- private IProject proxyProject_ = null;
- private IProject sampleProject_ = null;
- private String sampleServerTypeID_ = null;
- private IServer sampleExistingServer_ = null;
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- //javaWSDLParam
- javaWSDLParam_ = new JavaWSDLParameter();
-
- if (javaBeanName_ == null) {
- IStatus status = StatusUtils.errorStatus(
- AxisCreationUIMessages.MSG_ERROR_CANNOT_NO_JAVA_BEAN);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- //parser
- parser_ = new WebServicesParserExt();
-
- //validationManager
- validationManager_ = new ValidationManager();
-
- return Status.OK_STATUS;
- }
-
-
- /**
- * @return Returns the clientRuntimeID_.
- */
- public String getClientRuntimeID()
- {
- return clientRuntimeID_;
- }
- /**
- * @return Returns the forceBuild_.
- */
- public boolean getForceBuild()
- {
- return forceBuild_;
- }
- /**
- * @return Returns the isProxyProject_.
- */
- public Boolean getIsProxyProject()
- {
- return isProxyProject_;
- }
- /**
- * @return Returns the javaBeanName_.
- */
- public String getJavaBeanName()
- {
- return javaBeanName_;
- }
- /**
- * @return Returns the javaWSDLParam_.
- */
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
- /**
- * @return Returns the parser_.
- */
- public WebServicesParser getParser()
- {
- return parser_;
- }
- /**
- * @return Returns the proxyProject_.
- */
- public IProject getProxyProject()
- {
- return proxyProject_;
- }
- /**
- * @return Returns the sampleExistingServer_.
- */
- public IServer getSampleExistingServer()
- {
- return sampleExistingServer_;
- }
- /**
- * @return Returns the sampleProject_.
- */
- public IProject getSampleProject()
- {
- return sampleProject_;
- }
- /**
- * @return Returns the sampleServerTypeID_.
- */
- public String getSampleServerTypeID()
- {
- return sampleServerTypeID_;
- }
- /**
- * @return Returns the validationManager_.
- */
- public ValidationManager getValidationManager()
- {
- return validationManager_;
- }
-
- /**
- * @return Returns the serviceExistingServer_.
- */
- public IServer getServiceExistingServer()
- {
- return serviceExistingServer_;
- }
-
-
- public boolean getCustomizeServiceMappings()
- {
- return customizeServiceMappings_;
- }
- /**
- * @return Returns the isWebProjectStartupRequested.
- */
- public Boolean getIsWebProjectStartupRequested()
- {
- return IsWebProjectStartupRequested;
- }
-
-public void setJavaBeanName(String javaBeanName) {
- this.javaBeanName_ = javaBeanName;
-}
-
-// public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-// {
-// serviceIds_ = ids;
-// }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
deleted file mode 100644
index 768f72a8d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060321 128827 joan - Joan Haggarty, remove redundant wsdl URI, folder and file controls
- * 20060524 128601 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class BeanConfigWidget extends SimpleWidgetDataContributor
-{
-
- private Button rpcEncodedButton_;
- private Button rpcLiteralButton_;
- private Button docLiteralButton_;
-
- private Listener statusListener_;
-
- private JavaWSDLParameter javaParameter_;
-
- /* CONTEXT_ID PBCF0001 for the Bean Config Page */
- private final String INFOPOP_PBCF_PAGE = "PBCF0001"; //$NON-NLS-1$
-
- private String wsdlFolder_;
-
- private Text wsdlFileText_;
- /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
-
- private Tree methodsTree_;
- /* CONTEXT_ID PBME0002 for the Methods tree of the Bean Methods Page */
- private final String INFOPOP_PBME_TREE_METHODS = "PBME0002"; //$NON-NLS-1$
-
- private Button selectAllMethodsButton_;
- /* CONTEXT_ID PBME0010 for the Select All button of the Bean Methods Page */
- private final String INFOPOP_PBME_BUTTON_SELECT_ALL = "PBME0010"; //$NON-NLS-1$
-
- private Button deselectAllMethodsButton_;
- /* CONTEXT_ID PBME0011 for the Deselect All button of the Bean Methods Page */
- private final String INFOPOP_PBME_BUTTON_DESELECT_ALL = "PBME0011"; //$NON-NLS-1$
-
- private Button showMappingsCheckbox_;
- /* CONTEXT_ID PBCF0016 for the Show Mappings checkbox of the Bean Methods Page */
- private String INFOPOP_P2N_SHOW_MAPPINGS = "PBCF0016"; //$NON-NLS-1$
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
-
- UIUtils uiUtils = new UIUtils( pluginId_ );
- UIUtils baseConUiUtils = new UIUtils( pluginId_ );
-
- statusListener_ = statusListener;
- parent.setToolTipText( AxisCreationUIMessages.TOOLTIP_PBCF_PAGE );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PBCF_PAGE );
-
- Composite configGroup = uiUtils.createComposite( parent, 2 );
-
- wsdlFileText_ = uiUtils.createText( configGroup, AxisCreationUIMessages.LABEL_OUTPUT_FILE_NAME,
- AxisCreationUIMessages.TOOLTIP_PBCF_TEXT_WSDL_FILE,
- INFOPOP_PBCF_TEXT_WSDL_FILE,
- SWT.SINGLE | SWT.BORDER );
- wsdlFileText_.addListener( SWT.Modify, statusListener );
-
- // TODO this group has no TOOLTIP or INFOPOP.
- Group methodsGroup = baseConUiUtils.createGroup( parent, ConsumptionUIMessages.LABEL_METHODS, null, null );
- methodsGroup.setLayoutData( uiUtils.createFillAll() );
-
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- methodsGroup.setLayout( layout );
-
- methodsTree_ = uiUtils.createTree( methodsGroup, AxisCreationUIMessages.TOOLTIP_PBME_TREE_METHODS,
- INFOPOP_PBME_TREE_METHODS,
- SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK );
- methodsTree_.addListener( SWT.Selection, statusListener );
-
- Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-
- selectAllMethodsButton_
- = baseConUiUtils.createPushButton( selectButtons, ConsumptionUIMessages.BUTTON_SELECT_ALL,
- ConsumptionUIMessages.TOOLTIP_PBME_BUTTON_SELECT_ALL,
- INFOPOP_PBME_BUTTON_SELECT_ALL );
- selectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( true );
- }
- });
-
- deselectAllMethodsButton_
- = baseConUiUtils.createPushButton( selectButtons, ConsumptionUIMessages.BUTTON_DESELECT_ALL,
- ConsumptionUIMessages.TOOLTIP_PBME_BUTTON_DESELECT_ALL,
- INFOPOP_PBME_BUTTON_DESELECT_ALL );
- deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( false );
- }
- });
-
- // TODO this group has no TOOLTIP or INFOPOP.
- Group styleGroup = uiUtils.createGroup( parent, AxisCreationUIMessages.LABEL_STYLE_USE, null, null );
-
- // TODO radio buttons have no TOOLTIP or INFOPOP.
- docLiteralButton_ = uiUtils.createRadioButton( styleGroup, AxisCreationUIMessages.STYLE_DOC_LITERAL, null, null );
- rpcLiteralButton_ = uiUtils.createRadioButton( styleGroup, AxisCreationUIMessages.STYLE_RPC_LITERAL, null, null );
- rpcEncodedButton_ = uiUtils.createRadioButton( styleGroup, AxisCreationUIMessages.STYLE_RPC_ENCODED, null, null );
-
- showMappingsCheckbox_ = uiUtils.createCheckbox( parent, AxisCreationUIMessages.LABEL_EXPLORE_MAPPINGS_BEAN2XML,
- AxisCreationUIMessages.TOOLTIP_P2N_SHOW_MAPPINGS,
- INFOPOP_P2N_SHOW_MAPPINGS );
-
- return this;
- }
-
- public void handleSelectAll( boolean value )
- {
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- items[i].setChecked(value);
- }
-
- statusListener_.handleEvent( null );
- }
-
- public void setCustomizeServiceMappings( boolean value )
- {
- showMappingsCheckbox_.setSelection( value );
- }
-
- public boolean getCustomizeServiceMappings()
- {
- return showMappingsCheckbox_ == null ? false : showMappingsCheckbox_.getSelection();
- }
-
- public void setJavaParameter( JavaWSDLParameter javaParameter )
- {
- javaParameter_ = javaParameter;
-
- String wsdlLocation = javaParameter.getOutputWsdlLocation();
- IPath wsdlPath = new Path( wsdlLocation );
-
- wsdlFolder_ = wsdlPath.removeLastSegments(1).toString();
- wsdlFileText_.setText(wsdlPath.lastSegment());
-
- methodsTree_.removeAll();
- Hashtable methods = javaParameter.getMethods();
- Enumeration e = methods.keys();
-
- while( e.hasMoreElements() )
- {
- String name = (String) e.nextElement();
- TreeItem item = new TreeItem(methodsTree_, SWT.NULL);
-
- item.setData(name);
- item.setText(name);
- item.setChecked((((Boolean) methods.get(name)).booleanValue()));
- }
-
- TreeItem[] items = methodsTree_.getItems();
-
- if( items.length > 0 )
- {
- methodsTree_.setSelection( new TreeItem[]{ items[0] } );
- }
-
- String style = javaParameter.getStyle();
-
- if( style.equals( JavaWSDLParameter.STYLE_RPC ) )
- {
- rpcEncodedButton_.setSelection(true);
- }
- else if( style.equals( JavaWSDLParameter.STYLE_DOCUMENT ) )
- {
- rpcLiteralButton_.setSelection(true);
- }
- else
- {
- docLiteralButton_.setSelection(true);
- }
- }
-
- public JavaWSDLParameter getJavaParameter()
- {
-
- IPath wsdlPath
- = new Path( wsdlFolder_.trim() ).append( wsdlFileText_.getText().trim() );
-
- // TODO Do we need to go to the eclipse file system??
- //String wsdlLocation = workspace.getFile(wsdlPath).getLocation().toString();
- String wsdlLocation = wsdlPath.toString();
-
- javaParameter_.setOutputWsdlLocation(wsdlLocation);
- javaParameter_.setInputWsdlLocation(new File(wsdlLocation).toURI().toString());
-
- Hashtable methods = new Hashtable();
-
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- TreeItem item = items[i];
- methods.put((String)item.getData(), new Boolean(item.getChecked()));
- }
-
- javaParameter_.setMethods(methods);
-
- if( rpcEncodedButton_.getSelection())
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_RPC);
- javaParameter_.setUse(JavaWSDLParameter.USE_ENCODED);
- }
- else if( rpcLiteralButton_.getSelection())
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_DOCUMENT);
- javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
- }
- else
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
- javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
- }
-
- return javaParameter_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public IStatus getStatus()
- {
- IStatus result = null;
-
- if( wsdlFileText_.getText().equals( "" ) )
- {
- result = StatusUtils.errorStatus( AxisCreationUIMessages.PAGE_MSG_NO_FILE_SPECIFIED );
- }
- else
- {
- TreeItem[] items = methodsTree_.getItems();
- boolean itemSelected = false;
-
- for( int index = 0; index < items.length; index++ )
- {
- if( items[index].getChecked() )
- {
- itemSelected = true;
- break;
- }
- }
-
- if( !itemSelected )
- {
- result = StatusUtils.errorStatus( AxisCreationUIMessages.PAGE_MSG_NO_METHOD_SELECTED );
- }
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
deleted file mode 100644
index dac0747df..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class ValidateObjectSelectionCommand extends AbstractDataModelOperation
-{
- private String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
- private String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
- private IStructuredSelection objectSelection;
- private String serviceProjectName;
-
-
- /**
- * Validates that the selected Java bean can be loaded from the service project. If it can't, an error is displayed.
- */
- public ValidateObjectSelectionCommand()
- {
- super();
- }
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- //Make sure a bean is selected
- String javaBeanName = null;
- if (objectSelection != null && !objectSelection.isEmpty())
- {
- Object object = objectSelection.getFirstElement();
- if (object instanceof String)
- {
- javaBeanName = ((String)object);
- }
- else
- {
- //The ObjectSelectionWidget never appeared and so the IStucturedSelection from
- //ObjectSelectionWidgetOutputCommand is the initial selection.
- //Get the Java bean name from the selection.
- try
- {
- System.out.println(object.getClass().toString());
- javaBeanName = getJavaBeanFromObjectSelection(objectSelection);
- } catch (CoreException ce)
- {
- IStatus errorStatus = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_CANNOT_NO_JAVA_BEAN);
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- }
- }
-
- if (javaBeanName==null || javaBeanName.length()==0)
- {
- IStatus errorStatus = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_CANNOT_NO_JAVA_BEAN);
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- //Make sure a project is selected
- IProject serviceProject = ProjectUtilities.getProject(serviceProjectName);
- if (serviceProject==null)
- {
- IStatus errorStatus = StatusUtils.errorStatus(AxisCreationUIMessages.MSG_ERROR_NO_PROJECT);
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- //Make sure the selected bean can be loaded from the selected project
- if (javaBeanName.toLowerCase().endsWith(JAVA_EXTENSION)
- || javaBeanName.toLowerCase().endsWith(CLASS_EXTENSION)) {
- javaBeanName = javaBeanName.substring(0, javaBeanName.lastIndexOf('.'));
- }
-
- try
- {
- JavaClass javaClass = JavaMOFUtils.getJavaClass(javaBeanName, serviceProject);
- if (!javaClass.isExistingType())
- {
- IStatus errorStatus = StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_CANNOT_LOAD_JAVA_BEAN, new String[] { javaBeanName, serviceProjectName }));
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- } catch (CoreException ce)
- {
- IStatus errorStatus = StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_CANNOT_LOAD_JAVA_BEAN, new String[] { javaBeanName, serviceProjectName }));
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * @param serviceProjectName The serviceProjectName to set.
- */
- public void setServiceProjectName(String serviceProjectName)
- {
- this.serviceProjectName = serviceProjectName;
- }
-
- /**
- * @param objectSelection The objectSelection to set.
- */
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- this.objectSelection = objectSelection;
- }
-
- private String getJavaBeanFromObjectSelection(IStructuredSelection objectSelection) throws CoreException
- {
- String beanClass = "";
- JavaResourceFilter filter = new JavaResourceFilter();
- //IStructuredSelection selection = initialSelection_;
- //
- if (objectSelection != null)
- {
- Object obj = objectSelection.getFirstElement();
- if (obj != null)
- {
- // get the IResource represented by the selection
- IResource res = null;
-
- res = ResourceUtils.getResourceFromSelection(obj);
-
- if (filter.accepts(res))
- {
- // get the package-qualified class name without file extensions
- String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
- if (beanPackage==null)
- beanPackage = "";
- else
- beanPackage = beanPackage + ".";
-
- beanClass = beanPackage + res.getName();
-
- if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
- beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
- }
- }
- }
- }
-
- //
- return beanClass;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
deleted file mode 100644
index 47cb1e1e5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class AxisSkeletonDefaultingCommand extends AbstractDataModelOperation
-{
- private IStructuredSelection initialSelection;
- private WebServicesParser webServicesParser;
- private String wsdlURI_;
- private JavaWSDLParameter javaWSDLParam;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- javaWSDLParam = new JavaWSDLParameter();
- javaWSDLParam.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
- javaWSDLParam.setSkeletonDeploy(true);
- javaWSDLParam.setMetaInfOnly(false);
- javaWSDLParam.setInputWsdlLocation(wsdlURI_);
- return Status.OK_STATUS;
-
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- this.initialSelection = initialSelection;
- }
-
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser == null)
- webServicesParser = WSDLParserFactory.getWSDLParser();
- return webServicesParser;
- }
-
- public String getWebServiceURI()
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object firstElement = initialSelection.getFirstElement();
- if (firstElement instanceof IFile)
- {
- IFile ifile = (IFile)firstElement;
- String fileExtension = ifile.getFileExtension();
- if (fileExtension.equals("wsdl") ||
- fileExtension.equals("wsil") ||
- fileExtension.equals("html"))
- {
- return ifile.getFullPath().toString();
- }
- }
- }
- return "";
- }
-
- public String getWsdlURI()
- {
- return wsdlURI_;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
-
- }
-
- public boolean getGenWSIL()
- {
- return false;
- }
-
- public String getWsilURI()
- {
- String wsURI = getWsdlURI();
- int index = wsURI.lastIndexOf('.');
- if (index != -1)
- {
- StringBuffer sb = new StringBuffer(wsURI.substring(0, index));
- sb.append(".wsil");
- return sb.toString();
- }
- return "";
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam;
- }
-
- public String getHttpBasicAuthPassword()
- {
- return getWebServicesParser().getHTTPBasicAuthPassword();
- }
-
- public String getHttpBasicAuthUsername()
- {
- return getWebServicesParser().getHTTPBasicAuthUsername();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
deleted file mode 100644
index 2960305e8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060106 121199 jesper@selskabet.org - Jesper Møller
- * 20060321 128827 joan - Joan Haggarty, remove redundant wsdl URI, folder and file controls
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class SkeletonConfigWidget extends SimpleWidgetDataContributor
-{
- private JavaWSDLParameter javaWSDLParam;
-
- /* CONTEXT_ID PBSC0001 for the Skeleton Config Page */
- private static final String INFOPOP_PBSC_PAGE = "PBSC0001"; //$NON-NLS-1$
-
- // private Text uriText_;
- /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
- //private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
-
- private Combo skeletonFolderText_;
- /* CONTEXT_ID PBSC0004 for the Skeleton Folder field of the Skeleton Config Page */
- private static final String INFOPOP_PBSC_TEXT_SKELETON_FOLDER = "PBSC0004"; //$NON-NLS-1$
-
-
- /* CONTEXT_ID PBSC0005 for the Skeleton Folder Browse button of the Skeleton Config Page */
- // private static final String INFOPOP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "PBSC0005"; //$NON-NLS-1$
- // private static final String TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE";
-
- private Button showMappingsCheckbox_;
- /* CONTEXT_ID PBSC0016 for the Show Mappings checkbox of the Bean Methods Page */
- private String INFOPOP_N2P_SHOW_MAPPINGS = "PBSC0016"; //$NON-NLS-1$
-
- private IProject serverProject_;
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-
- UIUtils uiUtils = new UIUtils( pluginId );
- UIUtils conUiUtils = new UIUtils( pluginId );
- UIUtils baseConUiUtils = new UIUtils( pluginId );
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PBSC_PAGE );
- parent.setToolTipText( AxisCreationUIMessages.TOOLTIP_PBSC_PAGE );
-
- Composite textGroup = uiUtils.createComposite( parent, 2, 0, 0 );
-
- /*
- uriText_ = uiUtils.createText( textGroup, "LABEL_URI",
- TOOLTIP_PBCF_TEXT_URI,
- INFOPOP_PBCF_TEXT_URI,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- */
-
- skeletonFolderText_ = baseConUiUtils.createCombo( textGroup, ConsumptionUIMessages.LABEL_SKELETON_ROOT_NAME,
- ConsumptionUIMessages.TOOLTIP_PBSC_TEXT_SKELETON_FOLDER,
- INFOPOP_PBSC_TEXT_SKELETON_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- showMappingsCheckbox_ = conUiUtils.createCheckbox( parent, AxisConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
- AxisConsumptionUIMessages.TOOLTIP_N2P_SHOW_MAPPINGS,
- INFOPOP_N2P_SHOW_MAPPINGS );
-
- return this;
- }
-
- public void setEndpointURI(String endpointURI)
- {
- /*
- if (endpointURI != null)
- uriText_.setText(endpointURI);
- */
- }
-
- public void setOutputJavaFolder(String outputJavaFolder)
- {
- if (outputJavaFolder != null)
- {
- int index = skeletonFolderText_.indexOf(outputJavaFolder);
- if (index != -1)
- skeletonFolderText_.select(index);
- else if (skeletonFolderText_.getItemCount() <= 0)
- {
- String root = getWorkspaceRootLocation();
- if (outputJavaFolder.startsWith(root))
- skeletonFolderText_.setText(outputJavaFolder.substring(root.length()));
- else
- skeletonFolderText_.setText(outputJavaFolder);
- }
- }
- }
-
- public void setShowMapping(boolean showMapping)
- {
- showMappingsCheckbox_.setSelection(showMapping);
- }
-
- public boolean getShowMapping()
- {
- return showMappingsCheckbox_.getSelection();
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
-
-// Do not base Java output directory on workspace root since the project could be not
-// physically located in the workspace root, get the project specific root instead
-
- String projectSpecificRoot = serverProject_.getLocation().toString();
- String skeletonFolder = skeletonFolderText_.getText();
- String projectPathString = serverProject_.getFullPath().toString();
- if (skeletonFolder.startsWith(projectPathString)) {
- skeletonFolder = skeletonFolder.substring(projectPathString.length());
- }
- javaWSDLParam.setJavaOutput(projectSpecificRoot + skeletonFolder);
- return javaWSDLParam;
- }
-
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setServerProject(IProject serviceProject)
- {
- serverProject_ = serviceProject;
- String originalSkeletonFolder = skeletonFolderText_.getText();
- skeletonFolderText_.removeAll();
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(serviceProject);
- for (int i = 0; i < paths.length ; i++)
- skeletonFolderText_.add(paths[i].toString());
- int index = skeletonFolderText_.indexOf(originalSkeletonFolder);
- if (index != -1)
- skeletonFolderText_.select(index);
- else
- skeletonFolderText_.select(0);
- }
-
- private String getWorkspaceRootLocation()
- {
- return ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().toString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
deleted file mode 100644
index 03be88a93..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class SkeletonConfigWidgetDefaultingCommand extends AbstractDataModelOperation
-{
- private String wsdlURI;
- private IProject serverProject;
- private JavaWSDLParameter javaWSDLParam;
- private String serviceServerTypeID_;
-
- public SkeletonConfigWidgetDefaultingCommand( )
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
-
- String outputDir = ResourceUtils.findResource(J2EEUtils.getWebInfPath( serverProject )).getLocation().toString();
- javaWSDLParam.setOutput( outputDir );
-// Do not base Java output directory on workspace root since the project could be not physically located in the workspace root
-// javaWSDLParam.setJavaOutput(getRootURL() + getOutputJavaFolder());
- String javaOutput = ResourceUtils.findResource(getOutputJavaFolder()).getLocation().toString();
- javaWSDLParam.setJavaOutput(javaOutput);
-
- return Status.OK_STATUS;
-
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setServerProject(String serverProject)
- {
- this.serverProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serverProject);
- }
-
- public String getEndpointURI()
- {
- return null;
- }
-
- public String getOutputWSDLFolder()
- {
- IPath wsdlPath = J2EEUtils.getWebContentPath(serverProject ).append("wsdl");
- return wsdlPath.toString();
- }
-
- public String getOutputWSDLFile()
- {
- int index = wsdlURI.lastIndexOf('/');
- if (index == -1)
- index = wsdlURI.lastIndexOf('\\');
- return wsdlURI.substring(index+1, wsdlURI.length());
- }
-
- public String getOutputJavaFolder()
- {
- if (serverProject!=null){
- return ResourceUtils.getJavaSourceLocation(serverProject).toString();
- }
- return null;
- }
-
- public boolean getShowMapping()
- {
- return false;
- }
-
- public boolean isShowMapping()
- {
- return getShowMapping();
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam;
- }
-
-public String getServiceServerTypeID() {
- return serviceServerTypeID_;
-}
-
-public void setServiceServerTypeID(String serviceServerTypeID) {
- this.serviceServerTypeID_ = serviceServerTypeID;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
deleted file mode 100644
index 044bce113..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- * 20060523 143284 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060605 145407 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060607 144978 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.AxisCreationUIMessages;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ValidateWSIComplianceCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-/**
-* This is the class for the
-* Axis bottom up Java Bean scenario
-*
-*/
-public class WSBeanAxisType implements CommandWidgetBinding
-{
- private String serverName_;
- private String runtimeName_;
- private boolean isWebModuleRequired_;
-
-
- /**
- * Returns a locale specific label for the Server supported by this Web Service type
- * @return A locale specific server label from server plugins
- */
- public String getServerLabel()
- {
- return serverName_;
- }
-
- /**
- * Sets the server label to the appropriate name found in the server plugins.
- * @param server name
- */
- public void setServerLabel(String serverLabel)
- {
- serverName_ = serverLabel;
- }
-
- /**
- * Returns a locale specific label for the deployment runtime of this Web Service type
- * @return A locale specific label for the deployment runtime
- */
- public String getRuntimeLabel()
- {
- return runtimeName_;
- }
-
- /**
- * Sets the runtime label for the appropriate runtime
- * @param server name
- */
- public void setRuntimeLabel(String runtimeLabel)
- {
- runtimeName_ = runtimeLabel;
- }
-
-
- /**
- * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
- * @return true if requireWebModule
- */
- public boolean isWebModuleRequired()
- {
- return isWebModuleRequired_;
- }
-
- /**
- * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
- * @param requireWebModule
- */
- public void setWebModuleRequired(boolean requireWebModule)
- {
- isWebModuleRequired_ = requireWebModule;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
- */
- public boolean isEJBModuleRequired() {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
- */
- public void setEJBModuleRequired(boolean arg0) {
- return;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- /*
- dataRegistry.addMapping( CurrentPageCommand.class, "CurrentPage", BeanClassWidget.class );
- //BeanClassWidget - as target
- dataRegistry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", BeanClassWidget.class, "BeanClassName", null);
- //BeanClassWidget - as source
- dataRegistry.addMapping(BeanClassWidget.class, "BeanClassName", DefaultsForServerJavaWSDLCommand.class, "JavaBeanName", null); //BeanConfigWidget
- */
- // ObjectSelectionWidget
- dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", DefaultsForServerJavaWSDLCommand.class);
-
- //BeanConfigWidget - as target
- dataRegistry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", BeanConfigWidget.class, "JavaParameter", null );
- //BeanConfigWidget - as source
-
- // ValidateWSIComplianceCommand
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter",ValidateWSIComplianceCommand.class, "JavaWSDLParam", null);
-
- //dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);
- //dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter",BUCodeGenOperation.class, "JavaWSDLParam", null);
- //AxisMappingsWidget - as target
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AxisMappingsWidget.class);
-
- //AxisMappingsWidget - as source
-
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", BUCodeGenOperation.class, "JavaWSDLParam", null);
-
-
- //dataRegistry.addMapping( DefaultsForConfig.class, "JavaParameter", BeanConfigWidget.class );
- //dataRegistry.addMapping( DefaultsForConfig.class, "CustomizeServiceMappings", BeanConfigWidget.class );
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
-
- /*
- widgetRegistry.add( "BeanSelection",
- AxisCreationUIMessages.PAGE_TITLE_WSBEAN_CLASS,
- AxisCreationUIMessages.PAGE_DESC_WSBEAN_CLASS,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new BeanClassWidget();
- }
- } );
- */
-
- widgetRegistry.add( "BeanConfig",
- AxisCreationUIMessages.PAGE_TITLE_WSBEAN_CONFIG,
- AxisCreationUIMessages.PAGE_DESC_WSBEAN_CONFIG,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new BeanConfigWidget();
- }
- } );
-
-
- widgetRegistry.add( "AxisServiceBeanMapping",
- AxisConsumptionUIMessages.PAGE_TITLE_WS_BEAN2XML,
- AxisConsumptionUIMessages.PAGE_DESC_P2N_MAPPINGS,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_BEAN2XML );
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- //dead code - doesn't matter what gets returned here.
- return new SimpleFragment();
- }
- };
- }
-
-}
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
deleted file mode 100644
index 413db8637..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060321 128827 joan - Joan Haggarty, remove redundant wsdl URI, folder and file controls
- * 20060523 143284 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060605 145407 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-/**
-* This is the class for the Axis Web service type.
-*/
-public class WSWSDLAxisType implements CommandWidgetBinding
-{
- private String serverName_;
- private String runtimeName_;
- private boolean isWebModuleRequired_;
-
- /**
- * Returns a locale specific label for the Server supported by this Web Service type
- * @return A locale specific server label from server plugins
- */
- public String getServerLabel() {
- return serverName_;
- }
-
- /**
- * Sets the server label to the appropriate name found in the server plugins.
- * @param server name
- */
- public void setServerLabel(String serverLabel) {
- serverName_ = serverLabel;
- }
-
- /**
- * Returns a locale specific label for the deployment runtime of this Web Service type
- * @return A locale specific label for the deployment runtime
- */
- public String getRuntimeLabel() {
- return runtimeName_;
- }
-
- /**
- * Sets the runtime label for the appropriate runtime
- * @param server name
- */
- public void setRuntimeLabel(String runtimeLabel) {
- runtimeName_ = runtimeLabel;
- }
-
- /**
- * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
- * @return true if requireWebModule
- */
- public boolean isWebModuleRequired() {
- return isWebModuleRequired_;
- }
-
- /**
- * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
- * @param requireWebModule
- */
- public void setWebModuleRequired(boolean requireWebModule) {
- isWebModuleRequired_ = requireWebModule;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
- */
- public boolean isEJBModuleRequired() {
-
- return false;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
- */
- public void setEJBModuleRequired(boolean arg0) {
- return;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // SkeletonConfigWidget
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", SkeletonConfigWidget.class, "ServerProject", new ProjectName2IProjectTransformer());
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "EndpointURI", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputJavaFolder", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", SkeletonConfigWidget.class);
-
- // BackupSkelImplCommand
- dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", TDCodeGenOperation.class, "JavaWSDLParam", null);
-
- // AxisMappingsFragment
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", AxisMappingsFragment.class);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "ShowMapping", AxisMappingsFragment.class);
-
- // AxisMappingsWidget
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
- // WSDL2JavaCommand
- //dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
- //dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", WSDL2JavaCommand.class);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", TDCodeGenOperation.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", TDCodeGenOperation.class, "JavaWSDLParam", null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
-
- /*
- widgetRegistry.add( "WSDLSelection",
- ConsumptionUIMessages.PAGE_TITLE_WS_SELECTION,
- ConsumptionUIMessages.PAGE_DESC_WS_SELECTION,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionWidget();
- }
- } );
-
- widgetRegistry.add( "WSDLSelectionTreeWidget",
- ConsumptionUIMessages.PAGE_TITLE_WSDL_SELECTION,
- ConsumptionUIMessages.PAGE_DESC_WSDL_SELECTION,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionTreeWidget();
- }
- });
- */
-
- widgetRegistry.add( "SkeletonConfig",
- ConsumptionUIMessages.PAGE_TITLE_WSSKEL_CONFIG,
- ConsumptionUIMessages.PAGE_DESC_WSSKEL_CONFIG,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new SkeletonConfigWidget();
- }
- } );
-
- widgetRegistry.add( "AxisMappingsWidget",
- ConsumptionUIMessages.PAGE_TITLE_WS_XML2BEAN,
- ConsumptionUIMessages.PAGE_DESC_N2P_MAPPINGS,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2BEAN);
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- //dead code - doesn't matter what gets returned here.
- return new SimpleFragment();
- }
- };
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
deleted file mode 100644
index 77e6b55e6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-
-public class AxisBeanConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor beanConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private BeanConfigWidget beanWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisBeanConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSBeanAxisType() );
-
- beanConfigWidget_ = adapter_.getWidget( "BeanConfig" );
- beanWidget_ = (BeanConfigWidget)beanConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisServiceBeanMapping" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return beanConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == beanConfigWidget_ && beanWidget_.getCustomizeServiceMappings() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
deleted file mode 100644
index 0d8b8fecc..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-
-public class AxisSkeletonConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor skelConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private SkeletonConfigWidget skelWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisSkeletonConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSWSDLAxisType() );
-
- skelConfigWidget_ = adapter_.getWidget( "SkeletonConfig" );
- skelWidget_ = (SkeletonConfigWidget)skelConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisMappingsWidget" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return skelConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == skelConfigWidget_ && skelWidget_.getShowMapping() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
deleted file mode 100644
index 8356366d2..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060330 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060424 120137 kathy@ca.ibm.com - Kathy Chan
- * 20060509 125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515 115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517 142327 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060524 130755 kathy@ca.ibm.com - Kathy Chan
- * 20060607 144978 kathy@ca.ibm.com - Kathy Chan
- * 20060810 135395 makandre@ca.ibm.com - Andrew Mak, Enable WTP Web service framework opening Java editor
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- * 20080227 119964 trungha@ca.ibm.com - Trung Ha
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.GeronimoAxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisCheckCompilerLevelCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisOutputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisRunInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.BUAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.CopyDeploymentFileCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ModifyWSDLEndpointAddressCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.TDAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ValidateWSIComplianceCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.BUConfigCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.TDConfigCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BUAxisDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class AxisWebService extends AbstractWebService
-{
- private AxisWebServiceInfo axisWebServiceInfo_;
-
- public AxisWebService(WebServiceInfo info)
- {
- super(info);
- }
-
- public ICommandFactory assemble(IEnvironment env, IContext ctx,
- ISelection sel, String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
-
- Vector commands = new Vector();
- EclipseEnvironment environment = (EclipseEnvironment)env;
-
- if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
-
- registerBUDataMappings( environment.getCommandManager().getMappingRegistry());
-
- commands.add(new BUAxisInputCommand(this, project));
- commands.add(new AxisCheckCompilerLevelCommand());
-// commands.add(new ValidateObjectSelectionCommand());
- commands.add(new BUAxisDefaultingCommand());
- commands.add(new DefaultsForServerJavaWSDLCommand());
- commands.add(new JavaToWSDLMethodCommand());
- // commands.add(new SimpleFragment( "BeanConfig" ));
- // commands.add(new SimpleFragment( "AxisServiceBeanMapping" ));
- commands.add(new BUConfigCommand());
- commands.add(new ValidateWSIComplianceCommand());
- commands.add(new WaitForAutoBuildCommand());
- commands.add(new BUCodeGenOperation());
-// commands.add(new RefreshProjectCommand());
- commands.add(new BuildProjectCommand());
- commands.add(new AxisOutputCommand(this));
-
- } else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-
- registerTDDataMappings( environment.getCommandManager().getMappingRegistry());
-
- commands.add(new TDAxisInputCommand(this, project));
- commands.add(new AxisSkeletonDefaultingCommand());
- commands.add(new ValidateWSDLCommand());
- commands.add(new SkeletonConfigWidgetDefaultingCommand());
-// commands.add(new SimpleFragment( "SkeletonConfig" ));
-// commands.add(new SimpleFragment( "AxisMappingsWidget" ));
- commands.add(new TDConfigCommand());
- commands.add(new TDCodeGenOperation());
-// commands.add(new RefreshProjectCommand());
- commands.add(new BuildProjectCommand());
- commands.add(new AxisOutputCommand(this));
-
- } else {
- //TODO: Remove println and reassess this "error".
- System.out.println("Error - WebServiceScenario should not be Client for AxisWebService");
- return null;
- }
-
-
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- return null;
- }
-
- public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel,
- String project, String earProject)
- {
- Vector commands = new Vector();
-
- if (ctx.getScenario().getValue() == WebServiceScenario.CLIENT) {
- //TODO: Remove println and reassess this "error".
- System.out.println("Error - WebServiceScenario should not be Client for AxisWebService");
- return null;
- } else {// For BOTTOM_UP and TOP_DOWN
- commands.add(new AxisRunInputCommand(this, project));
- commands.add(new ModifyWSDLEndpointAddressCommand());
- commands.add(new AxisDeployCommand(project));
-
- commands.add(new RefreshProjectCommand());
-
- return new SimpleCommandFactory(commands);
- }
- }
-
- public void registerBUDataMappings(DataMappingRegistry registry)
- {
- //BUAxisInputCommand
-// registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "JavaBeanName", BUAxisDefaultingCommand.class );
-
- //ValidateObjectSelectionCommand
-// registry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ValidateObjectSelectionCommand.class);
-// registry.addMapping(BUAxisInputCommand.class, "ServerProject", ValidateObjectSelectionCommand.class,"ServiceProjectName", null );
-
- //BUAxisDefaultingCommand
-// registry.addMapping(SelectionCommand.class, "InitialSelection", BUAxisDefaultingCommand.class );
-//KSC registry.addMapping(BUAxisInputCommand.class, "ServiceTypeRuntimeServer", BUAxisDefaultingCommand.class );
-
- // AxisCheckCompilerLevelCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", AxisCheckCompilerLevelCommand.class);
-
- //BUAxisCommands2 - these run after BeanClassWidget
- //DefaultsForServerJavaWSDLCommand
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaWSDLParam", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", DefaultsForServerJavaWSDLCommand.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServiceExistingServer", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
-
- //JavaWSDLMethodCommand
- registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- // BUAxisCommands3 - these run after BeanConfigWidget
-
- //CopyAxisJarCommand
- //registry.addMapping(BUAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-
- // ValidateWSIComplianceCommand
- registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", ValidateWSIComplianceCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", ValidateWSIComplianceCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- //Java2WSDLCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", BUCodeGenOperation.class);
-
- //RefreshProjectCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
- //UpdateWEBXMLCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BUCodeGenOperation.class, "ServiceProject", new StringToIProjectTransformer());
-
- //BuildProjectCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-
- //StartProjectCommand
-// registry.addMapping(BUAxisInputCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", new StringToIProjectTransformer());
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleProject", StartProjectCommand.class);
-//KSC registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleServerTypeID", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleExistingServer", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "IsWebProjectStartupRequested",StartProjectCommand.class);
-
- // AxisOutputCommand
- registry.addMapping(BUCodeGenOperation.class, "WsdlURI", AxisOutputCommand.class);
- registry.addMapping(BUCodeGenOperation.class, "JavaWSDLParam", AxisOutputCommand.class);
-
-
- // Run extension
-
-// ModifyWSDLEndpointAddressCommand
- registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", ModifyWSDLEndpointAddressCommand.class);
- registry.addMapping(AxisRunInputCommand.class, "ServerInstanceId", ModifyWSDLEndpointAddressCommand.class);
- registry.addMapping(AxisRunInputCommand.class, "ServerFactoryId", ModifyWSDLEndpointAddressCommand.class);
- registry.addMapping(AxisRunInputCommand.class, "ServerProject", ModifyWSDLEndpointAddressCommand.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(AxisRunInputCommand.class, "WsdlURI", ModifyWSDLEndpointAddressCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "Parser", ModifyWSDLEndpointAddressCommand.class, "WebServicesParser", null);
-
- // GeronimoAxisDeployCommand
- registry.addMapping(ModifyWSDLEndpointAddressCommand.class, "JavaWSDLParam", GeronimoAxisDeployCommand.class);
-
- //AxisDeployCommand
- registry.addMapping(ModifyWSDLEndpointAddressCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- // CopyDeploymentFileCommand
- registry.addMapping(AxisRunInputCommand.class, "ServerInstanceId", CopyDeploymentFileCommand.class);
-
- //RefreshProjectCommand
- registry.addMapping(AxisRunInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
- }
-
- public void registerTDDataMappings(DataMappingRegistry dataRegistry)
- {
- // Transformers
- ProjectName2IProjectTransformer projectTransformer = new ProjectName2IProjectTransformer();
-
- // TODO: map "InitialSelection" and "ObjectSelection" from TDAxisInputCommand
-
-// dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", AxisSkeletonDefaultingCommand.class);
-// dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", AxisSkeletonDefaultingCommand.class);
-// dataRegistry.addMapping(TDAxisInputCommand.class, "WebServicesParser", AxisSkeletonDefaultingCommand.class);
-
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "WsdlURI", AxisSkeletonDefaultingCommand.class);
- // ValidateWSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", ValidateWSDLCommand.class);
-
- // SkeletonConfigWidgetDefaultingCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServiceServerTypeID", SkeletonConfigWidgetDefaultingCommand.class);
-
- // AxisSkeletonDefaultingCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", TDCodeGenOperation.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", TDCodeGenOperation.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", TDCodeGenOperation.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", TDCodeGenOperation.class);
-
- // CopyAxisJarCommand
- //dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
- // BackupSkelImplCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", TDCodeGenOperation.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "WebServiceInfo", TDCodeGenOperation.class);
-
- // Skeleton2WSDLCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", TDCodeGenOperation.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServiceServerTypeID", TDCodeGenOperation.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServiceExistingServer", TDCodeGenOperation.class);
-
- // RefreshProjectCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-
- // BuildProjectCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
- // ModifyWSDLEndpointAddressCommand
- dataRegistry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", ModifyWSDLEndpointAddressCommand.class);
- dataRegistry.addMapping(AxisRunInputCommand.class, "ServerInstanceId", ModifyWSDLEndpointAddressCommand.class);
- dataRegistry.addMapping(AxisRunInputCommand.class, "ServerFactoryId", ModifyWSDLEndpointAddressCommand.class);
- dataRegistry.addMapping(AxisRunInputCommand.class, "ServerProject", ModifyWSDLEndpointAddressCommand.class, "ServiceProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(AxisRunInputCommand.class, "WsdlURI", ModifyWSDLEndpointAddressCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ModifyWSDLEndpointAddressCommand.class);
-
- // GeronimoAxisDeployCommand
- dataRegistry.addMapping(ModifyWSDLEndpointAddressCommand.class, "JavaWSDLParam", GeronimoAxisDeployCommand.class);
-
- // AxisDeployCommand
- dataRegistry.addMapping(ModifyWSDLEndpointAddressCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- // CopyDeploymentFileCommand
- dataRegistry.addMapping(AxisRunInputCommand.class, "ServerInstanceId", CopyDeploymentFileCommand.class);
-
- // AxisOutputCommand
- dataRegistry.addMapping(TDCodeGenOperation.class, "WsdlURI", AxisOutputCommand.class);
- dataRegistry.addMapping(TDCodeGenOperation.class, "JavaWSDLParam", AxisOutputCommand.class);
- }
- public AxisWebServiceInfo getAxisWebServiceInfo() {
- return axisWebServiceInfo_;
- }
-
- public void setAxisWebServiceInfo(AxisWebServiceInfo axisWebServiceInfo) {
- axisWebServiceInfo_ = axisWebServiceInfo;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
deleted file mode 100644
index 1e7f78be2..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-
-public class AxisWebServiceInfo {
-
- private JavaWSDLParameter javaWSDLParameter;
-
- public JavaWSDLParameter getJavaWSDLParameter() {
- return javaWSDLParameter;
- }
-
- public void setJavaWSDLParameter(JavaWSDLParameter javaWSDLParameter) {
- this.javaWSDLParameter = javaWSDLParameter;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
deleted file mode 100644
index bbbd10dd1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-public class AxisWebServiceRuntime extends AbstractWebServiceRuntime
-{
-
- public IWebService getWebService(WebServiceInfo info)
- {
- return new AxisWebService(info);
- }
-
- public IWebServiceClient getWebServiceClient(WebServiceClientInfo info)
- {
- return new AxisWebServiceClient(info);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntimeChecker.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntimeChecker.java
deleted file mode 100644
index 041a41f19..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntimeChecker.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080326 198439 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceRuntimeChecker;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-
-public class AxisWebServiceRuntimeChecker extends
- AbstractWebServiceRuntimeChecker implements IWebServiceRuntimeChecker {
-
- public IStatus checkServiceClientCompatibility(boolean serviceNeedEAR,
- String serviceEARName, String serviceProjectName,
- boolean clientNeedEAR, String clientEARName,
- String clientProjectName) {
-
- if (serviceProjectName != null && serviceProjectName.equalsIgnoreCase(clientProjectName)) {
- return StatusUtils
- .errorStatus(ConsumptionUIMessages.MSG_SAME_CLIENT_AND_SERVICE_PROJECTS);
- }
- if (serviceNeedEAR && clientNeedEAR) {
- if (serviceEARName != null && serviceEARName.equals(clientEARName)) {
- return StatusUtils.warningStatus(NLS.bind(
- ConsumptionUIMessages.MSG_SAME_CLIENT_AND_SERVICE_EARS,
- new String[] { "EAR" }));
- }
- }
- return Status.OK_STATUS;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/.classpath b/bundles/org.eclipse.jst.ws.consumption/.classpath
deleted file mode 100644
index 185c89817..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="webserviceutils"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption/.cvsignore b/bundles/org.eclipse.jst.ws.consumption/.cvsignore
deleted file mode 100644
index ad09d9c9c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-bin
-build.xml
-temp.folder
-webserviceutils.jar
-wsc.jar
-webserviceutilssrc.zip
-wscsrc.zip
-javaCompiler.webserviceutils.jar.args
-javaCompiler.wsc.jar.args
diff --git a/bundles/org.eclipse.jst.ws.consumption/.project b/bundles/org.eclipse.jst.ws.consumption/.project
deleted file mode 100644
index 0758941dc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.consumption</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1426bed8a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:35:51 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 813550758..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:25 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
deleted file mode 100644
index 6ed73ac76..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,62 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption; singleton:=true
-Bundle-Version: 1.0.304.qualifier
-Bundle-ClassPath: wsc.jar,
- webserviceutils.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.consumption;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen.bean;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.command.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.datamodel.validate;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.fragments;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.sampleapp.command;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.sampleapp.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.wsfinder;x-internal:=true,
- org.eclipse.jst.ws.util
-Require-Bundle: org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.internet.monitor.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.jst.ws.consumption/about.html b/bundles/org.eclipse.jst.ws.consumption/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.consumption/build.properties b/bundles/org.eclipse.jst.ws.consumption/build.properties
deleted file mode 100644
index fc60e9870..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070501 184505 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-source.wsc.jar = src/
-source.webserviceutils.jar = webserviceutils/
-jars.compile.order = wsc.jar,\
- webserviceutils.jar
-bin.includes = plugin.properties,\
- plugin.xml,\
- wsc.jar,\
- webserviceutils.jar,\
- META-INF/,\
- about.html
-jars.extra.classpath = ../javax.xml.soap/lib/saaj.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.properties b/bundles/org.eclipse.jst.ws.consumption/plugin.properties
deleted file mode 100644
index f2c1baca5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption
-PLUGIN_PROVIDER=Eclipse.org
-XP_WSFINDER=org.eclipse.jst.ws.internal.consumption.wsfinder
-XP_WEB_SERVICE_START_SERVER_TYPE=WebServiceStartServerType
-XP_SERVER_DEFAULTER=Server Defaulter
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.xml b/bundles/org.eclipse.jst.ws.consumption/plugin.xml
deleted file mode 100644
index f6640aacf..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point
- id="wsfinder"
- name="%XP_WSFINDER"/>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point
- id="webServiceStartServerType"
- name="%XP_WEB_SERVICE_START_SERVER_TYPE"/>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point
- id="serverDefaulter"
- name="%XP_SERVER_DEFAULTER"/>
-
-
- <extension
- point="org.eclipse.jst.ws.consumption.webServiceStartServerType">
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.32"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT32_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.40"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT40_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.41"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT41_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.50"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT50_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.geronimo.10"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_GERONIMO10_LOCAL">
- </webServiceStartServerType>
- </extension>
-
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties
deleted file mode 100644
index f59614f22..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties
+++ /dev/null
@@ -1,199 +0,0 @@
-###############################################################################
-# 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060217 126757 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060401 128827 kathy@ca.ibm.com - Kathy Chan
-# 20070509 182274 kathy@ca.ibm.com - Kathy Chan
-# 20080331 225032 makandre@ca.ibm.com - Andrew Mak, Error msg references renamed category
-# 20080402 222409 kathy@ca.ibm.com - Kathy Chan
-# 20080402 224433 kathy@ca.ibm.com - Kathy Chan, Properties file change
-###############################################################################
-
-#
-# Sample messages
-#
-MSG_ERROR_JTS_PROXY_HAS_NO_METHODS=IWAB0179E Unable to create a sample to the proxy because the proxy does not contain methods.
-MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT=IWAB0180E Unable to create a sample to the proxy because the proxy is not a bean (i.e.. the sample does not have public default constructor).
-MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED=IWAB0181E Unable to create a sample to the proxy because none of the methods in the proxy were processed.
-MSG_WARN_JTS_UNSUPPORTED_TYPE=IWAB0182W The Sample JSP client does not support the following type: {0}
-MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES=IWAB0187W The Sample JSP client does not support Indexed properties: {0}
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS=IWAB0237W The Sample JSP client does not support arrays: {0}
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS=IWAB0124W The Sample JSP client does not support input parameters that are not beans: {0}
-MSG_ERROR_JTS_CYCLIC_BEAN=IWAB0188E The Sample JSP client does not support beans containing attributes that reference the beans: {0}
-MSG_WARN_JTS_PROXY_METHODS_OMITTED=IWAB0189W The Sample JSP client omitted some methods because they contained unsupported types.
-MSG_ERROR_SAMPLE_CREATION_CANCELED=IWAB0021E Sample creation was canceled
-MSG_WARN_UNABLE_TO_FIND_PROXY=IWAB0022W The Proxy Resource cound not not be found.
-MSG_ERROR_PROXY_NOT_FOUND_IN_PROJECT=The Java proxy {0} could not be found in project {1}.
-MSG_ERROR_JTS_JSP_GEN=Error in generating sample JSP
-
-# Not used
-#MSG_ERROR_CANNOT_CREATE_COMPONENT=The Web service wizard cannot automatically create component "{0}". Cancel the wizard and create the component manually.
-
-
-#
-# Filters
-#
-FILTER_MSG_ERROR_NULL_OBJECT=IWAB0097E No object has been provided.
-FILTER_MSG_ERROR_NOT_FILE=IWAB0098E The object "{0}" is not a file.
-FILTER_MSG_ERROR_NOT_FOLDER=IWAB0137E The object "{0}" is not a folder.
-
-JAVA_FILTER_NAME=Java files
-JAVA_FILTER_DESC=Files with names ending in ".java" or ".class".
-JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0102E The file "{0}" does not end in ".java" or ".class".
-
-WSDL_FILTER_NAME=WSDL files
-WSDL_FILTER_DESC=Files with names ending in ".wsdl".
-WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0103E The file "{0}" does not end in ".wsdl".
-
-ISD_FILTER_NAME=ISD files
-ISD_FILTER_DESC=Files with names ending in ".isd".
-ISD_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0095E The file "{0}" does not end in ".isd".
-
-PROPERTIES_FILTER_NAME=Properties files
-PROPERTIES_FILTER_DESC=Files with names ending in ".properties"
-PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION= The file "{0}" does not end in ".properties".
-
-FOLDER_FILTER_NAME=Folders
-FOLDER_FILTER_DESC=Folders.
-
-#
-# Deployment status
-#
-PROGRESS_INFO_COPY_WEBSERVICE_UTILS=IWAB0023I Copying the webservice utilities.
-PROGRESS_INFO_COPYING_FILE=IWAB0197I Copying SOAP run-time file.
-PROGRESS_INFO_START_WEB_PROJECT=IWAB0198I Starting Web project.
-PROGRESS_INFO_PUBLISHING_SERVER=IWAB0199I Publishing server.
-PROGRESS_INFO_STARTING_SERVER=IWAB0200I Starting server.
-PROGRESS_INFO_PUBLISH_WEB_PROJECT=IWAB0205I Publishing Web project.
-
-
-#
-# Deployment messages
-#
-MSG_ERROR_PROJECT_NOT_FOUND=IWAB0207E Web project was not found.
-MSG_ERROR_FILECOPY_WEBSERVICE_UTILS=IWAB0024E Error in copying Webservice Utility file.
-MSG_ERROR_INSTANCE_NOT_FOUND=IWAB0212E Server was not found.
-MSG_ERROR_SERVER=IWAB0213E Error in starting server.
-MSG_ERROR_PUBLISH=IWAB0217E Error in publishing Web project.
-MSG_ERROR_ADD_MODULE=Error occured when adding the module, {0}, to the server
-
-MSG_ERROR_CREATE_SERVER=IWAB0025E Unable to create server.
-MSG_ERROR_STUB_ONLY=Unable to create server because only stub runtimes are available for the {0} server type. Go to Window > Preferences. Select Server > Runtime Environments to install a non-stub runtime.
-
-#
-# EJB messages
-# 4 unused messages in jst.ws and wst.ws
-TASK_LABEL_CREATE_EJB_PROJECT=CreateEJBProjectTask
-TASK_DESC_CREATE_EJB_PROJECT=Create an EJB Project.
-MSG_ERROR_CANNOT_CREATE_EJB_PROJECT=IWAB0432E Unable to create EJB project.
-MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT=IWAB0026E Unable to create application client project {0}.
-
-MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT=IWAB0027E Unable to create Java project {0}.
-MSG_ERROR_CANNOT_CREATE_EAR_PROJECT=IWAB0062E Unable to create EAR project {0}.
-
-#
-# Validator task descriptions
-#
-TASK_LABEL_WEBSERVICE_DISABLE_VALIDATION=Disable validators.
-TASK_DESC_WEBSERVICE_DISABLE_VALIDATION=Temporarily disabling validators.
-TASK_LABEL_WEBSERVICE_RESTORE_VALIDATION=Restore validators.
-TASK_DESC_WEBSERVICE_RESTORE_VALIDATION=Restoring states of validators.
-TASK_LABEL_WEBSERVICE_DISABLE_BUILD=Disable auto build.
-TASK_DESC_WEBSERVICE_DISABLE_BUILD=Temporarily disabling auto build.
-TASK_LABEL_WEBSERVICE_RESTORE_BUILD=Restore auto build.
-TASK_DESC_WEBSERVICE_RESTORE_BUILD=Restoring state of auto build.
-
-#
-# MISC
-#
-MSG_ERROR_WEB_PROJECT_CREATE=IWAB0310E An error occurred during creation of the Web Project.
-
-#
-# CheckProjectOKCommand
-#
-MSG_ERROR_SERVER_VIEW_OPEN=IWAB0126E The server configuration editor is open for {0}. Close it and restart the wizard.
-
-
-#
-# DetectNonJavaCharsCommand
-#
-MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE=IWAB0129W Java method {0} in class {1} starts with an upper case letter. Method names should begin with lower case letters.
-MSG_WARN_METHOD_NAME_INVALID=IWAB0131W Java method {0} name contains underscore or numeric digits followed by a lower case letter.\
-Method names should not contain lower case letters after a numeric or underscore.
-MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS=IWAB0132W Boolean property accessor {0} in bean {1} begins with "get". Boolean getter methods should begin wth "is".
-MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE=IWAB0133W The package name {0} of class {1} includes upper case letters. Package names should consist of lower case letters only.
-
-WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE
-
-#
-# JavaToModelCommand
-#
-LABEL_OK=OK
-DESCRIPTION_OK=Select OK to continue
-
-LABEL_CANCEL=Cancel
-DESCRIPTION_CANCEL=Select Cancel to cancel
-
-#
-# CreateMonitorCommand
-#
-MSG_ERROR_UNABLE_TO_START_MONITOR=IWAB0001E Unable to monitor port {0} of {1}.
-MSG_INFO_MONITORING_NOT_SUPPORTED=IWAB0002I {0} does not support port monitoring.
-
-#
-# CopyWSDLCommand
-#
-COMMAND_LABEL_COPY_WSDL=Copying WSDL
-COMMAND_DESC_COPY_WSDL=Copying WSDL into the workspace for Web service deployment
-MSG_ERROR_COPY_WSDL=IWAB0028E Failed to copy WSDL {0} to {1}
-
-#
-# AssociateModuleWithEARCommand
-#
-MSG_ERROR_UNABLE_TO_ASSOCIATE=Unable to associate component {0} to ear component {1}.
-
-#
-# CreateModuleCommand
-#
-MSG_ERROR_CREATE_FLEX_PROJET=An error occured during creation of flexible project {0}.
-MSG_ERROR_CREATE_EJB_COMPONENT=An error occured during creation of EJB component {0}.
-MSG_ERROR_CREATE_APPCLIENT_COMPONENT=An error occured during creation of Application Client component {0}.
-MSG_ERROR_COMPONENT_CREATION=Unable to create project {0} and/or component {1}.
-
-
-#
-# CreateFacetedProjectCommand
-#
-MSG_ERROR_PROJECT_CREATION=Unable to create project {0}.
-
-
-#
-# PreServiceDevelopCommand
-#
-MSG_ERROR_PROJECT_DOES_NOT_EXIST=The project {0} does not exist.
-MSG_ERROR_PROJECT_IS_NOT_OPEN=The project {0} is not open.
-
-#
-# SPECIAL NOTE TO TRANSLATORS: Substitution {1} in MSG_ERROR_ADDING_FACETS_TO_PROJECT and
-# MSG_ERROR_FIXED_FACETS will be a delimited list of translated labels. The list is formed
-# through repeated use of MSG_FACETS.
-#
-MSG_ERROR_ADDING_FACETS_TO_PROJECT=Unable to add the follwing facets to project {0}: {1}.
-MSG_ERROR_FIXED_FACETS=Unable to set the following facets as fixed on project {0}: {1}.
-MSG_FACETS={0}, {1}
-
-MSG_ERROR_SETTING_RUNTIME=Unable to bind project {0} to the {1} runtime.
-
-#
-# Skeleton Merge Messages
-#
-MSG_ERROR_FILE_MERGE=Error in merging file {0}.
-MSG_ERROR_FILE_MERGE_LOAD=Error in loading file {0} for merge.
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java
deleted file mode 100644
index c8dc2b47d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060217 126757 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060401 128827 kathy@ca.ibm.com - Kathy Chan
- * 20080402 224433 kathy@ca.ibm.com - Kathy Chan, Properties file change
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ConsumptionMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.consumption.Consumption";//$NON-NLS-1$
-
- private ConsumptionMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_JTS_PROXY_HAS_NO_METHODS;
- public static String MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT;
- public static String MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED;
- public static String MSG_WARN_JTS_UNSUPPORTED_TYPE;
- public static String MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES;
- public static String MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS;
- public static String MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS;
- public static String MSG_ERROR_JTS_CYCLIC_BEAN;
- public static String MSG_WARN_JTS_PROXY_METHODS_OMITTED;
- public static String MSG_ERROR_SAMPLE_CREATION_CANCELED;
- public static String MSG_WARN_UNABLE_TO_FIND_PROXY;
- public static String MSG_ERROR_PROXY_NOT_FOUND_IN_PROJECT;
- public static String MSG_ERROR_JTS_JSP_GEN;
- public static String FILTER_MSG_ERROR_NULL_OBJECT;
- public static String FILTER_MSG_ERROR_NOT_FILE;
- public static String FILTER_MSG_ERROR_NOT_FOLDER;
- public static String JAVA_FILTER_NAME;
- public static String JAVA_FILTER_DESC;
- public static String JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION;
- public static String WSDL_FILTER_NAME;
- public static String WSDL_FILTER_DESC;
- public static String WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION;
- public static String ISD_FILTER_NAME;
- public static String ISD_FILTER_DESC;
- public static String ISD_FILTER_MSG_ERROR_WRONG_EXTENSION;
- public static String PROPERTIES_FILTER_NAME;
- public static String PROPERTIES_FILTER_DESC;
- public static String PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION;
- public static String FOLDER_FILTER_NAME;
- public static String FOLDER_FILTER_DESC;
- public static String PROGRESS_INFO_COPY_WEBSERVICE_UTILS;
- public static String PROGRESS_INFO_COPYING_FILE;
- public static String PROGRESS_INFO_START_WEB_PROJECT;
- public static String PROGRESS_INFO_PUBLISHING_SERVER;
- public static String PROGRESS_INFO_STARTING_SERVER;
- public static String PROGRESS_INFO_PUBLISH_WEB_PROJECT;
- public static String MSG_ERROR_PROJECT_NOT_FOUND;
- public static String MSG_ERROR_FILECOPY_WEBSERVICE_UTILS;
- public static String MSG_ERROR_INSTANCE_NOT_FOUND;
- public static String MSG_ERROR_SERVER;
- public static String MSG_ERROR_PUBLISH;
- public static String MSG_ERROR_ADD_MODULE;
- public static String MSG_ERROR_CREATE_SERVER;
- public static String MSG_ERROR_STUB_ONLY;
- public static String TASK_LABEL_CREATE_EJB_PROJECT;
- public static String TASK_DESC_CREATE_EJB_PROJECT;
- public static String MSG_ERROR_CANNOT_CREATE_EJB_PROJECT;
- public static String MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT;
- public static String MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT;
- public static String MSG_ERROR_CANNOT_CREATE_EAR_PROJECT;
- public static String TASK_LABEL_WEBSERVICE_DISABLE_VALIDATION;
- public static String TASK_DESC_WEBSERVICE_DISABLE_VALIDATION;
- public static String TASK_LABEL_WEBSERVICE_RESTORE_VALIDATION;
- public static String TASK_DESC_WEBSERVICE_RESTORE_VALIDATION;
- public static String TASK_LABEL_WEBSERVICE_DISABLE_BUILD;
- public static String TASK_DESC_WEBSERVICE_DISABLE_BUILD;
- public static String TASK_LABEL_WEBSERVICE_RESTORE_BUILD;
- public static String TASK_DESC_WEBSERVICE_RESTORE_BUILD;
- public static String MSG_ERROR_WEB_PROJECT_CREATE;
- public static String MSG_ERROR_SERVER_VIEW_OPEN;
- public static String MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE;
- public static String MSG_WARN_METHOD_NAME_INVALID;
- public static String MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS;
- public static String MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE;
- public static String WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE;
- public static String LABEL_OK;
- public static String DESCRIPTION_OK;
- public static String LABEL_CANCEL;
- public static String DESCRIPTION_CANCEL;
- public static String MSG_ERROR_UNABLE_TO_START_MONITOR;
- public static String MSG_INFO_MONITORING_NOT_SUPPORTED;
- public static String COMMAND_LABEL_COPY_WSDL;
- public static String COMMAND_DESC_COPY_WSDL;
- public static String MSG_ERROR_COPY_WSDL;
- public static String MSG_ERROR_UNABLE_TO_ASSOCIATE;
- public static String MSG_ERROR_CREATE_FLEX_PROJET;
- public static String MSG_ERROR_CREATE_EJB_COMPONENT;
- public static String MSG_ERROR_CREATE_APPCLIENT_COMPONENT;
- public static String MSG_ERROR_COMPONENT_CREATION;
- public static String MSG_ERROR_PROJECT_CREATION;
- public static String MSG_ERROR_PROJECT_DOES_NOT_EXIST;
- public static String MSG_ERROR_PROJECT_IS_NOT_OPEN;
- public static String MSG_ERROR_ADDING_FACETS_TO_PROJECT;
- public static String MSG_ERROR_FIXED_FACETS;
- public static String MSG_FACETS;
- public static String MSG_ERROR_SETTING_RUNTIME;
- public static String MSG_ERROR_FILE_MERGE_LOAD;
- public static String MSG_ERROR_FILE_MERGE;
-
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ConsumptionMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
deleted file mode 100644
index 8a2774bf1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060811 153482 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-
-
-/**
-* Objects of this class represent a generator.
-* */
-public class Generator implements VisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * The StringBuffer that holds the codegen
- * */
- protected StringBuffer fbuffer;
-
- /**
- * The Visitor that calls the visit method
- * */
- protected Visitor fVisitor;
-
- /**
- * Vector that holds state data for this generator
- * */
- protected Vector fResidentVector;
-
- /*
- * This int holds the current number
- */
- protected int fUniqueNumber =0;
-
-
- protected String fClientFolderPath;
-
- public static final String FACTORY = "Factory";
-
- public static final String TAB = " ";
- public static final String DOUBLE_TAB = " ";
- public static final String SPACE = " ";
-
- /**
- * Constructor.
- *
- */
- public Generator ()
- {
- fbuffer = new StringBuffer();
- fResidentVector = new Vector();
-
- }
-
- /**
- * Constructor.
- * @param StringBuffer Takes the buffer it will write code to
- */
- public Generator (StringBuffer buffer)
- {
- fbuffer = buffer;
- fResidentVector = new Vector();
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
- public String getClientFolderPath()
- {
- return fClientFolderPath;
- }
-
- public void setClientFolderPath(String fClientFolderPath_)
- {
- fClientFolderPath = fClientFolderPath_;
- }
-
- protected String serviceName = "";
- protected String portName = "";
- protected String packageName = "";
- protected String proxyBaseName = "";
-
- public void setInfo(String service, String port, String packageName, String proxyBase)
- {
- serviceName = service;
- portName = port;
- this.packageName = packageName;
- proxyBaseName = proxyBase;
- }
-
- private static final char UNDERSCORE = '_';
- public String getSessionBeanId()
- {
- String name = getClientFolderPath();
- int index = name.lastIndexOf("/");
- index++;
- StringBuffer newName = new StringBuffer(name.substring(index));
-
- //We need to make this a valid java identifier
- //To do this we will replace any character that is not valid with an underscore
- for (int i = 0; i < newName.length(); i++)
- {
- char c = newName.charAt(i);
- if (i == 0 && !Character.isJavaIdentifierStart(c) || !Character.isJavaIdentifierPart(c))
- {
- newName.setCharAt(i,UNDERSCORE);
- }
- }
- return newName + "id";
- }
-
- /*
- * The Number Factory is here for naming purposes. In
- * this way we insure no names we create in a piece of
- * code gen are the same. We keep track of the numbers
- * used and we hand back the next one. Like take a number
- * buddy
- * @param int number we are at as the state data has to be settable
- */
- public void setNumberFactory(int number)
- {
- fUniqueNumber = number;
- }
-
-
- /*
- * This is a unique number for state purposes
- * @return int
- */
- public int getNumberFactory()
- {
- return fUniqueNumber;
- }
- /*
- * This is a unique number for naming purposes
- * @return int
- */
- public int getUniqueNumber()
- {
- return fUniqueNumber++;
- }
-
-
- /**
- * returns the current StringBuffer
- * @return StringBuffer Takes the buffer it will write code too
- */
- public StringBuffer getStringBuffer ()
- {
- return fbuffer;
- }
-
-
- /**
- * returns the Visitor that called this generator
- * @return Visitor
- */
- public Visitor getVisitor ()
- {
- return fVisitor;
- }
-
-
-
-
- /**
- * vector used to hold state data
- * @parameter Visitor
- */
- public void putResidentVector (Object object)
- {
- fResidentVector.addElement(object);
- }
-
-
- /**
- * vector used to hold state data
- * @parameter Visitor
- */
- public void setResidentVector (Vector vector)
- {
- fResidentVector = vector;
- }
-
-
- /**
- * returns the resident vector
- * @return Visitor
- */
- public Vector getResidentVector ()
- {
- return fResidentVector;
- }
-
-
- /**
- * This function is used to initialize any state a generator may have
- *
- **/
-
- public void initialize()
- {
- //to be implemented in sublasses
- }
-
-
- /**
- * sets the visitor that calls the visit
- * @parameter Visitor
- */
-
- public void setVisitor(Visitor visitor)
- {
- fVisitor = visitor;
- }
-
-
- public IStatus visit (Object object)
- {
- //implemented by subclasses
- return Status.OK_STATUS;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
deleted file mode 100644
index eec9fdb29..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen;
-
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-
-
-/**
-* Objects of this class represent a visitor.
-* This vistor will visit elements in a model given a
-* particular rel
-* */
-public class RelVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private int fElementCounter;
- private int fTotalElements;
- private String frelName;
-
- /**
- * Constructor.
- *
- */
-
- public RelVisitor (String relName)
- {
- frelName = relName;
- }
-
- public int getTotalElementsToVisit()
- {
- return fTotalElements;
- }
-
- public boolean isLastElement()
- {
- if(getTotalElementsToVisit() - presentElement() == 0) return true;
- return false;
- }
-
- public int presentElement()
- {
- return fElementCounter;
- }
-
- public void initialize(VisitorAction va)
- {
- //implemented by subclasses
- }
- public IStatus run (Object sourceElement,VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- initialize(vAction);
-
- vAction.setVisitor(this);
- Rel rel = ((BasicElement)sourceElement).getRel(frelName);
- //set some state data
- fTotalElements = rel.getNumberOfTargetElements();
- fElementCounter = 0;
-
- Enumeration e = rel.getTargetElements();
- while (e.hasMoreElements()){
- BasicElement targetElement = (BasicElement)e.nextElement();
- fElementCounter++;
- initialize(vAction);
- status = vAction.visit(targetElement);
- }
- return status;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
deleted file mode 100644
index a0a7040a0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public interface Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public IStatus run (Object object, VisitorAction vAction);
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
deleted file mode 100644
index b94126b19..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* The visitor walks the model and the VisitorAction
-* does the action
-* */
-public interface VisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public IStatus visit (Object object);
- public void setVisitor(Visitor visitor);
- public void initialize(String residentString);
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
deleted file mode 100644
index 8cfc623ba..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileAttributeGenerator;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class AttributeVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Vector fResidentVector1;
- private Vector fResidentVector2;
-
- /**
- * Constructor.
- *
- */
-
- public AttributeVisitor ()
- {
- super(TypeElement.REL_ATTRIBUTES);
- }
-
- public AttributeVisitor (String rel)
- {
- super(rel);
- }
-
- public void setResidentString(String resident)
- {
- }
-
- public void setResidentVector1(Vector resident)
- {
- fResidentVector1 = resident;
- }
-
- public void setResidentVector2(Vector resident)
- {
- fResidentVector2 = resident;
- }
-
-
- public void initialize(VisitorAction vAction)
- {
- //hack for 197726
-
- if(vAction instanceof InputFileAttributeGenerator){
- if(fResidentVector1 == null) fResidentVector1=new Vector();
- if(fResidentVector2 == null) fResidentVector2=new Vector();
- ((InputFileAttributeGenerator)vAction).setParentGetters(fResidentVector1,fResidentVector2);
- }
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java
deleted file mode 100644
index 775be5f7f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileAttributeGenerator;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class FieldVisitor extends AttributeVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Vector fResidentVector1;
- private Vector fResidentVector2;
-
- /**
- * Constructor.
- *
- */
-
- public FieldVisitor ()
- {
- super(TypeElement.REL_FIELDS);
- }
-
- public void setResidentString(String resident)
- {
- }
-
- public void setResidentVector1(Vector resident)
- {
- fResidentVector1 = resident;
- }
-
- public void setResidentVector2(Vector resident)
- {
- fResidentVector2 = resident;
- }
-
-
- public void initialize(VisitorAction vAction)
- {
- //hack for 197726
-
- if(vAction instanceof InputFileAttributeGenerator){
- if(fResidentVector1 == null) fResidentVector1=new Vector();
- if(fResidentVector2 == null) fResidentVector2=new Vector();
- ((InputFileAttributeGenerator)vAction).setParentGetters(fResidentVector1,fResidentVector2);
- }
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
deleted file mode 100644
index 34664622f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class MethodVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public MethodVisitor ()
- {
- super(BeanElement.REL_METHODS);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
deleted file mode 100644
index 0749312d4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ParameterVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public ParameterVisitor ()
- {
- super(MethodElement.REL_PARAMETERS);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
deleted file mode 100644
index 1f6207072..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ReturnParameterVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public ReturnParameterVisitor ()
- {
- super(MethodElement.REL_RETURN_PARAMETERS);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
deleted file mode 100644
index d254615d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class TypeVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public TypeVisitor ()
- {
- super(TypeElement.REL_TYPE);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
deleted file mode 100644
index 6396e9f71..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsBeanVisitorAction extends VisitorActionImpl
-{
- private static char UNDERSCORE = '_';
-
- public DetectNonJavaCharsBeanVisitorAction ( Vector messages, Vector beans)
- {
- super (messages, beans);
- }
-
- /**
- * The visit will create the bean
- * Walk the methods
- * @param JavaClass the class to be used to create the bean model
- **/
- public IStatus visit (Object javaclass)
- {
- JavaClass javaClass = (JavaClass)javaclass;
- String packageName = javaClass.getJavaPackage().getPackageName();
- String beanName = javaClass.getName();
-
- if (!isBeanVisited(javaClass)) {
- addVisitedBean(javaClass);
- // check the bean name
- checkBeanName(beanName);
- checkPackageName(packageName, beanName);
- DetectNonJavaCharsMethodVisitorAction methodVisitorAction = new DetectNonJavaCharsMethodVisitorAction(getMessages(), getBeansVisited());
- JavaMofMethodVisitor methodVisitor = new JavaMofMethodVisitor();
- methodVisitor.run(javaClass,methodVisitorAction);
- }
-
- return Status.OK_STATUS;
- }
-
- private void checkBeanName(String beanName)
- {
-
- // check if the bean starts with a lower case
- if ( Character.isLowerCase(beanName.charAt(0)))
- addMessage(ConsumptionMessages.WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE, new String[]{beanName});
-
-
- //check if the name has an underscore, then next letter should be upper case
- int underScoreIndex = beanName.indexOf(UNDERSCORE);
- String tempName = beanName;
- while(underScoreIndex !=-1) {
- tempName = tempName.substring(underScoreIndex+1);
- if ( Character.isLowerCase(tempName.charAt(0))) {
- addMessage(ConsumptionMessages.MSG_WARN_METHOD_NAME_INVALID, new String[] { beanName });
- break;
- }
- else
- underScoreIndex = tempName.indexOf(UNDERSCORE);
- }
- }
-
- private void checkPackageName(String packageName, String beanName)
- {
- if (!packageName.equals(packageName.toLowerCase()))
- addMessage(ConsumptionMessages.MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE, new String[] { packageName, beanName });
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
deleted file mode 100644
index 6460bff50..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsMethodVisitorAction extends VisitorActionImpl
-{
- private static char UNDERSCORE = '_';
- private boolean serviceBean = false;
-
- public DetectNonJavaCharsMethodVisitorAction ( Vector messages, Vector beans)
- {
- super (messages, beans);
- if ( beans.size() == 1)
- serviceBean = true;
- }
-
- /**
- * Create a method element from the method
- * @param Method the class to be used to create the method
- **/
- public IStatus visit (Object imethod)
- {
-
- Method method = (Method)imethod;
- String className = method.getContainingJavaClass().getName();
- String name = method.getName();
-
- if ( serviceBean && !method.isConstructor() )
- checkUpperCase(name, className);
-
- // for service bean or any referenced bean property accessors
- if ( serviceBean || name.startsWith("get") || name.startsWith("set") || name.startsWith("is"))
- {
- checkUnderScore(name, className);
- checkNumericDigits(name, className);
- checkBooleanProperties(method, className);
-
- DetectNonJavaCharsParameterVisitorAction parameterVisitorAction = new DetectNonJavaCharsParameterVisitorAction(getMessages(), getBeansVisited());
- // rsk Passing in null for the environment. DetectNonJavaCharsParameterVisitorAction always returns an OK status.
- JavaMofParameterVisitor parameterVisitor = new JavaMofParameterVisitor(null);
- parameterVisitor.run(method, parameterVisitorAction);
- }
-
- return Status.OK_STATUS;
- }
-
- private void checkUpperCase(String name, String className)
- {
- // in a service bean check if any method starts with upper case letter
- if ( Character.isUpperCase(name.charAt(0)))
- addMessage(ConsumptionMessages.MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE, new String[]{name, className});
-
- }
-
- private void checkUnderScore(String name, String className)
- {
- //check if the name has an underscore, then next letter should be upper case
- int underScoreIndex = name.indexOf(UNDERSCORE);
- String tempName = name;
- while(underScoreIndex !=-1) {
- tempName = tempName.substring(underScoreIndex+1);
- if ( Character.isLowerCase(tempName.charAt(0))) {
- addMessage(ConsumptionMessages.MSG_WARN_METHOD_NAME_INVALID, new String[]{name, className});
- break;
- }
- else
- underScoreIndex = tempName.indexOf(UNDERSCORE);
- }
- }
-
- private void checkNumericDigits(String name, String className)
- {
- //check if the name has a numeric, then next letter should be upper case
- for ( int i = 0; i < name.length(); i++)
- {
- if ( Character.isDigit(name.charAt(i)))
- {
- if (Character.isLowerCase(name.charAt(i+1))) {
- addMessage(ConsumptionMessages.MSG_WARN_METHOD_NAME_INVALID, new String[]{name, className});
- break;
- }
- }
- }
- }
- private void checkBooleanProperties(Method method, String className)
- {
- if (!serviceBean && method.getName().startsWith("get") &&
- (method.getReturnType().getName().equals("boolean") ||
- method.getReturnType().getName().equals("java.lang.Boolean")))
- addMessage(ConsumptionMessages.MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS, new String[]{method.getName(), className});
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java
deleted file mode 100644
index 1ae28a154..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsParameterVisitorAction extends VisitorActionImpl
-{
-
- public DetectNonJavaCharsParameterVisitorAction ( Vector messages, Vector beans)
- {
- super (messages, beans);
- }
-
- /**
- * Create a method element from the method
- * @param Method the class to be used to create the method
- **/
- public IStatus visit (Object ijavaParameter)
- {
-
- JavaParameter javaParameter = (JavaParameter) ijavaParameter;
- JavaClass javaClass = null;
- if ( javaParameter.getJavaType() instanceof JavaClass)
- {
- javaClass = (JavaClass) javaParameter.getJavaType();
- if (javaClass.isArray())
- {
- JavaHelpers componentType = ((ArrayType)javaClass).getComponentTypeAsHelper();
- if (componentType instanceof JavaClass)
- {
- javaClass = (JavaClass)componentType;
- }
- else
- {
- javaClass = null; //The array contains primitive types, there is no need for further checking.
- }
- }
- }
- if (toBeVisited(javaClass)) {
- DetectNonJavaCharsBeanVisitorAction beanVisitorAction = new DetectNonJavaCharsBeanVisitorAction(getMessages(), getBeansVisited());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- beanVisitor.run(javaClass,beanVisitorAction);
- }
-
- return Status.OK_STATUS;
- }
-
-
- private boolean toBeVisited (JavaClass javaClass)
- {
- //check for recognized types
- if( javaClass == null ||
- javaClass.isPrimitive() ||
- javaClass.getJavaName().startsWith("javax") ||
- TypeFactory.recognizedBean(javaClass.getJavaName()))
- return false;
- else
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java
deleted file mode 100644
index 1f3ca2919..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a AttributeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofAttributeVisitorAction extends JavaMofBeanVisitorAction
-{
-
- /*
- *Constructor
- **/
- public JavaMofAttributeVisitorAction(Element parentElement, String project, IEnvironment env)
- {
- super(parentElement,project, env);
- }
-
- public IStatus visit (Object propertyDecorator)
- {
- IStatus status = Status.OK_STATUS;
-
- //PropertyDecorator pd = (PropertyDecorator)propertyDecorator;
- SamplePropertyDescriptor pd = (SamplePropertyDescriptor)propertyDecorator;
-
-
- try{
- //if the type of this attribute is unsupported dont make an Attribute
- if(!(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)pd.getPropertyType()))
- && (TypeFactory.isUnSupportedType((JavaHelpers)pd.getPropertyType()))){
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)pd.getPropertyType()).getJavaName() );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)pd.getPropertyType()).getJavaName(),null));
- return status;
- }
-
- Method setMethod = pd.getWriteMethod();
- Method getMethod = pd.getReadMethod();
- if(setMethod != null){
- if(setMethod.isStatic()){
- setMethod=null;
- }
- }
- if(getMethod != null){
- if(getMethod.isStatic()){
- getMethod=null;
- }
- }
- if(pd.isfStatic()){
- return status;
- }
-
- AttributeElement attributeElement = (AttributeElement)BeanModelElementsFactory.getBeanModelElement(propertyDecorator,fParentElement);
-
- if(attributeElement != null){
-
- //lets check and see if the getter takes input params
- //if so throw an error
- //now the inputs
- if(getMethod != null){
- JavaParameter javaParameter[] = getMethod.listParametersWithoutReturn();
- if(javaParameter.length > 0){
- if(getReturnParam()) return status;
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES + getMethod.getName() );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES + getMethod.getName(),null));
- return status;
- }
- }
- if(setMethod != null) attributeElement.setSetterMethod(setMethod.getMethodElementSignature());
- if(getMethod != null) attributeElement.setGetterMethod(getMethod.getMethodElementSignature());
-
- JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(attributeElement,clientProject, env_);
- typeVisitorAction.setStatusMonitor(getStatusMonitor());
- typeVisitorAction.setBeansCreated(getBeansCreated());
- typeVisitorAction.setReturnParam(getReturnParam());
- JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
- typeVisitor.setClientProject(getProject());
- status = typeVisitor.run(pd,typeVisitorAction);
-
- }
-
- return status;
- }catch(Exception e)
- {
- env_.getLog().log(ILog.WARNING, 5054, this, "visit", e);
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN, e);
- try {
- env_.getStatusHandler().report(status);
- } catch (StatusException e1) {
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN);
- }
- return status;
- }
- //env.Log.write(this,"visit",ILog.OK,e);}
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
deleted file mode 100644
index 7fec64d71..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070313 176580 makandre@ca.ibm.com - Andrew Mak, Generate a Client WS Proxy accepting URL
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.command.NullStatusMonitor;
-import org.eclipse.jst.ws.internal.command.StatusMonitor;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofAttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofFieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class JavaMofBeanVisitorAction implements VisitorAction
-{
-
- protected IEnvironment env_;
- protected Visitor fVisitor;
-
- /*
- * The project that defines the context
- **/
- protected String clientProject;
-
- /*
- * The Status monitor
- **/
- protected StatusMonitor monitor_;
-
- /*
- * The model that will be created
- **/
- protected Model fModel;
-
- /*
- * This is the parent element used when creating a
- * new element
- */
- protected Element fParentElement;
-
- /*
- * Methods processed from proxy
- */
- protected Vector fBeansCreated;
-
- private BooleanSelection[] fMethodsSelected;
-
- /*
- * this boolean tells wether the bean is a return parameter or an input parameter
- * usually this should be set around the parametervisitoraction, and passed on from there
- */
- protected boolean fReturnParam=false;
-
- public JavaMofBeanVisitorAction(String clientProject,BooleanSelection[] methods, IEnvironment env)
- {
- this.clientProject = clientProject;
- fMethodsSelected = methods;
- env_ = env;
- }
-
-
-
- /*
- *Constructor
- * @param Model model is the Model that this bean will be placed in
- * @param IProject used in nature
- **/
- public JavaMofBeanVisitorAction(Model model, String clientProject, IEnvironment env)
- {
- this.clientProject = clientProject;
- fModel = model;
- env_ = env;
- }
-
- /*
- *Constructor
- * @param Element the parent element that this element will be added too
- * @param IProject used in nature
- **/
- public JavaMofBeanVisitorAction(Element parentElement, String clientProject, IEnvironment env )
- {
- fParentElement = parentElement;
- this.clientProject = clientProject;
- env_ = env;
- }
-
- /**
- * The visit will create the bean
- * Walk the methods
- * @param JavaClass the class to be used to create the bean model
- **/
- public IStatus visit (Object javaclass)
- {
- Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
- Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
- IStatus status = Status.OK_STATUS;
- JavaClass javaClass = (JavaClass)javaclass;
-
-
- BeanElement beanElement = (BeanElement)BeanModelElementsFactory.getBeanModelElement(javaClass,fParentElement,fModel);
- if(beanElement.isOwnerParameter()) {
- resetBeansCreated();
- }
- fModel = beanElement.getModel();
-
- //this for the subsequent beans that represent types
- //first do the attributes
- //if we are not on the root
- if (!(beanElement == fModel.getRootElement())){
- Enumeration e = getBeansCreated().elements();
- while(e.hasMoreElements()){
- String name = (String)e.nextElement();
- if(name.equals(javaClass.getName())){
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_ERROR_JTS_CYCLIC_BEAN );
- //getStatusMonitor().reportStatus(new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_CYCLIC_BEAN" ),null));
- return status;
- }
- }
-
- JavaMofAttributeVisitorAction attributeVisitorAction = new JavaMofAttributeVisitorAction(beanElement,clientProject, env_);
- //attributeVisitorAction.setStatusMonitor(getStatusMonitor());
- Vector childVector = ((Vector)getBeansCreated().clone());
- childVector.addElement(javaClass.getName());
- attributeVisitorAction.setBeansCreated(childVector);
- attributeVisitorAction.setReturnParam(getReturnParam());
- JavaMofAttributeVisitor attributeVisitor = new JavaMofAttributeVisitor();
- attributeVisitor.setReturnParameter(getReturnParam());
- attributeVisitor.setProject(getProject());
- attributeVisitor.setEnvironment(env_);
- status = attributeVisitor.run(javaClass,attributeVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
-
- JavaMofFieldVisitorAction fieldVisitorAction = new JavaMofFieldVisitorAction(beanElement,clientProject, env_);
- //fieldVisitorAction.setStatusMonitor(getStatusMonitor());
- Vector childVector2 = ((Vector)getBeansCreated().clone());
- childVector2.addElement(javaClass.getName());
- fieldVisitorAction.setBeansCreated(childVector2);
- fieldVisitorAction.setReturnParam(getReturnParam());
- JavaMofFieldVisitor fieldVisitor = new JavaMofFieldVisitor();
- fieldVisitor.setProject(getProject());
- status = fieldVisitor.run(javaClass,fieldVisitorAction);
- //
- severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
-
- }
-
- //this is to insure we are on the proxy
- //now do the methods
- if (beanElement == fModel.getRootElement()){
- //first lets make sure the proxy is in good form
- //-it has a default constructor
- //-it has at least one method
- //otherwise return the problem in the form of a status
-
- if (!proxyCheck(javaClass, status)) return status;
- JavaMofMethodVisitorAction methodVisitorAction = new JavaMofMethodVisitorAction(beanElement,clientProject, env_);
-
- //methodVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofMethodVisitor methodVisitor = new JavaMofMethodVisitor();
- methodVisitor.setMethodSelection(fMethodsSelected);
- status = methodVisitor.run(javaClass,methodVisitorAction);
-
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- //This is where we check for several things:
- //-if no methods were processed because of unsupported types then we send back that result
- //-if there were any methods omitted we should warn them
-
- //first no methods
- if (!methodVisitorAction.wereMethodsProcessed()){
- //this has to be done to insure the dialog is an error
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED );
- return status;
- //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED" ),null));
- }
- //now methods omitted
- else if(methodVisitorAction.wereMethodsOmitted()){
- //The dialog is already a warning so we just need to set the overall message
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_PROXY_METHODS_OMITTED );
- return status;
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // ConsumptionMessages.MSG_WARN_JTS_PROXY_METHODS_OMITTED,null));
- }
- }
- return status;
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
-
- /*
- * Return the model that was created
- * @return Model the bean model that was created
- */
- public Model getModel()
- {
- return fModel;
- }
-
- /*
- * The proxy check insures there is a default constructor and
- * at Least one method
- * @param JavaClass javaClass is used to traverse the methods on the proxy
- */
- public boolean proxyCheck(JavaClass javaClass, IStatus status)
- {
- // first check for a method
- Iterator m=javaClass.getPublicMethods().iterator();
- if (!m.hasNext()){
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_JTS_PROXY_HAS_NO_METHODS );
- //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
- // ConsumptionMessages.MSG_ERROR_JTS_PROXY_HAS_NO_METHODS,null));
- return false;
- }
- //now check for a default constructor
- while (m.hasNext()) {
- Method method=(Method)m.next();
- if (javaClass.getName().equals(method.getName())){
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- if (javaParameter.length == 0)
- return true;
- }
- }
- return false;
-
- }
-
- /**
- * Sets the status monitor that this action will use to report status that occres while executing the Action.
- */
- public void setStatusMonitor ( StatusMonitor monitor )
- {
- monitor_ = monitor;
- }
-
- /**
- * Returns the status monitor that this task is using to report status.
- */
- public StatusMonitor getStatusMonitor ()
- {
- if (monitor_ == null)
- {
- monitor_ = new NullStatusMonitor();
- }
- return monitor_;
- }
-
-
- /**
- * check if the action has finished sucsessfully
- */
- /*
- public boolean isSuccessful ()
- {
- return getStatusMonitor().canContinue();
- }
- */
- public void resetBeansCreated()
- {
- fBeansCreated = new Vector();
- }
-
- public void setEnvironment(IEnvironment env)
- {
- env_ = env;
- }
-
- /*
- * The command that called this will get the results of the operation in the form
- * of a status.
- */
- public Vector getBeansCreated ()
- {
- if(fBeansCreated == null) fBeansCreated = new Vector();
- return fBeansCreated;
- }
-
- /*
- * The command that called this will get the results of the operation in the form
- * of a status.
- */
- public void setBeansCreated (Vector beansCreated)
- {
- fBeansCreated = beansCreated;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public boolean getReturnParam ()
- {
- return fReturnParam;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public void setReturnParam (boolean returnparam)
- {
- fReturnParam = returnparam;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public String getProject ()
- {
- return clientProject;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public void setProject (String clientProject)
- {
- this.clientProject = clientProject;
- }
-
-
- /**
- * sets the visitor that calls the visit
- * @parameter Visitor
- */
-
- public void setVisitor(Visitor visitor)
- {
- fVisitor = visitor;
- }
-
- /*
- * Sets the parent element the child then knows where to
- * add itself to the model
- * @param Element parent element
- */
- public void setParentElement(Element element)
- {
- fParentElement = element;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
deleted file mode 100644
index 964257a6e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.FieldElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a AttributeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofFieldVisitorAction extends JavaMofBeanVisitorAction
-{
-
- /*
- *Constructor
- **/
- public JavaMofFieldVisitorAction(Element parentElement, String project, IEnvironment env)
- {
- super(parentElement,project, env);
- }
-
-
- public IStatus visit (Object field_)
- {
- IStatus status = Status.OK_STATUS;
- Field field = (Field)field_;
-
- try{
- //if the type of this attribute is unsupported dont make an Attribute
- if(!(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)field.getJavaClass()))
- && (TypeFactory.isUnSupportedType((JavaHelpers)field.getJavaClass()))){
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)field.getJavaClass()).getJavaName() );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)field.getJavaClass()).getJavaName(),null));
- return status;
- }
-
-
- FieldElement fieldElement = (FieldElement)BeanModelElementsFactory.getBeanModelElement(field,fParentElement);
-
- if(fieldElement != null){
- //lets check and see if the getter takes input params
- //if so throw an error
- //now the inputs
-
- JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(fieldElement,clientProject, env_);
- typeVisitorAction.setStatusMonitor(getStatusMonitor());
- typeVisitorAction.setBeansCreated(getBeansCreated());
- typeVisitorAction.setReturnParam(getReturnParam());
- JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
- typeVisitor.setClientProject(getProject());
- status = typeVisitor.run(field,typeVisitorAction);
-
- }
- return status;
-
- }catch(Exception e)
- {
- env_.getLog().log(ILog.WARNING, 5055, this, "visit", e);
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN, e);
- try {
- env_.getStatusHandler().report(status);
- }
- catch (StatusException e1)
- {
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_JTS_JSP_GEN, e1 );
- }
- return status;
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
deleted file mode 100644
index 11516644e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class JavaMofMethodVisitorAction extends JavaMofBeanVisitorAction
-{
-
- public String fUnsupportedParameterName;
-
- /*
- * Methods omitted from the proxy
- */
- protected Vector fMethodsOmitted;
-
- /*
- * Methods processed from proxy
- */
- protected Vector fMethodsProcessed;
-
-
- /*
- *Constructor
- **/
- public JavaMofMethodVisitorAction(Element parentElement,String project, IEnvironment env)
- {
- super(parentElement,project, env);
- fMethodsOmitted = new Vector();
- fMethodsProcessed = new Vector();
-
- }
-
- /**
- * Create a method element from the method
- * @param Method the class to be used to create the method
- **/
- public IStatus visit (Object imethod)
- {
- IStatus status = Status.OK_STATUS;
- Method method = (Method)imethod;
-
- if (methodCheck(method)){
- //this is to check immediate input and return parameters
- //if there is an unsupported type in these we can react immediately
- //we add it to the omitted methods an go to the next one
- if(!parameterCheck(method)){
- status = StatusUtils.warningStatus(ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS + fUnsupportedParameterName );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS + fUnsupportedParameterName,null));
- fMethodsOmitted.addElement(method.getMethodElementSignature());
- return status;
- }
- if(!nullConstructor(method)){
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS + fUnsupportedParameterName );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS + fUnsupportedParameterName,null));
- fMethodsOmitted.addElement(method.getMethodElementSignature());
- return status;
-
- }
-
- //carry on all parameters supported
- MethodElement methodElement = (MethodElement)BeanModelElementsFactory.getBeanModelElement(method,fParentElement);
- JavaMofParameterVisitorAction parameterVisitorAction = new JavaMofParameterVisitorAction(methodElement,clientProject,env_);
- parameterVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofParameterVisitor parameterVisitor = new JavaMofParameterVisitor(env_);
- status = parameterVisitor.run(method,parameterVisitorAction);
- //something may have gone wrong with an internal type
- if (status.getSeverity()!=Status.OK){
- //This method has to be omitted
- fMethodsOmitted.addElement(method.getMethodElementSignature());
- methodElement.setMethodOmmission(true);
- }
- else {
- fMethodsProcessed.addElement(method.getMethodElementSignature());
- }
- }
-
- return status;
- }
-
- /*
- * Tells wether any methods were processed
- * @return boolean true if any methods were processed
- */
- public boolean wereMethodsProcessed()
- {
- if(fMethodsProcessed.isEmpty()) return false;
- return true;
- }
-
- /*
- * Tells wether there were methods omitted because of unsupported types
- * @return boolean true if methods were omitted
- */
- public boolean wereMethodsOmitted()
- {
- if(fMethodsOmitted.isEmpty()) return false;
- return true;
- }
-
- /**
- * There may be methods that we dont support
- * and dont want in the model
- * @param boolean true if all parameters are fine
- **/
- public boolean methodCheck(Method method)
- {
- boolean ok = true;
- // if we have a constructor we return false
- if (method.isConstructor()) return false;
-
-
- return ok;
- }
-
- /**
- * There may be parameters of this method that have types
- * not yet supported return false if we find any
- * @param boolean true if all parameters are fine
- **/
- public boolean parameterCheck(Method method)
- {
-
- boolean ok = true;
-
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- for (int i = 0;i<javaParameter.length;i++) {
- JavaParameter param=javaParameter[i];
- JavaHelpers javaHelper1 = param.getJavaType();
- if(TypeFactory.isUnSupportedType(javaHelper1)) {
- fUnsupportedParameterName = param.getName();
- return false;
- }
- }
- return ok;
- }
-
-
- /**
- * There may be parameters of this method that have types
- * not yet supported return false if we find any
- * @param boolean true if all parameters are fine
- **/
- public boolean nullConstructor(Method method)
- {
-
- boolean ok = true;
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- for (int i = 0;i<javaParameter.length;i++) {
- JavaParameter param=javaParameter[i];
- JavaHelpers javaHelper1 = param.getJavaType();
- if(javaHelper1 instanceof JavaClass){
- JavaClass javaClass = (JavaClass)javaHelper1;
- if(TypeFactory.recognizedBean(javaClass.getJavaName()))return true;
- Iterator m=javaClass.getMethods().iterator();
- while (m.hasNext()) {
- Method method2=(Method)m.next();
- if (javaClass.getName().equals(method2.getName())){
- //now the inputs
- JavaParameter javaParam[] = method2.listParametersWithoutReturn();
- if (javaParam.length > 0){
- //then we have no default constructor
- fUnsupportedParameterName = param.getName();
- ok = false;
- }
- else return true;
- }
- }
- }
- }
- return ok;
- }
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
deleted file mode 100644
index 42f541e0b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a parameterElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk to its type
-* */
-public class JavaMofParameterVisitorAction extends JavaMofBeanVisitorAction
-{
-
-
- /*
- *Constructor
- **/
- public JavaMofParameterVisitorAction(Element parentElement,String project, IEnvironment env)
- {
- super(parentElement,project, env);
- }
-
- /**
- * Create a parameter element from the method
- * @param JavaParameter the mof element to be used to create the Parameter
- **/
- public IStatus visit (Object ijavaParameter)
- {
- IStatus status = Status.OK_STATUS;
- Choice OKChoice = new Choice('O',ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
- Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
-
- ParameterElement parameterElement = (ParameterElement)BeanModelElementsFactory.getBeanModelElement(ijavaParameter,fParentElement);
- JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(parameterElement,clientProject, env_);
- //typeVisitorAction.setStatusMonitor(getStatusMonitor());
- typeVisitorAction.setReturnParam(parameterElement.isReturn());
- JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
- typeVisitor.setClientProject(getProject());
- status = typeVisitor.run(ijavaParameter,typeVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
deleted file mode 100644
index ff98fbe00..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070410 180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a TypeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofTypeVisitorAction extends JavaMofBeanVisitorAction
-{
-
- /*
- *Constructor
- **/
- public JavaMofTypeVisitorAction(Element parentElement,String project, IEnvironment env)
- {
- super(parentElement,project, env);
- }
-
- /**
- * Create a type element from the JavaHelper
- * @param JavaHelper the mof element to be used to create the Type
- **/
- public IStatus visit (Object typeNavigator)
- {
- IStatus status = Status.OK_STATUS;
- Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
- Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
-
- //if bean
- JavaClass javaClass = null;
- if(typeNavigator instanceof JavaClass){
- javaClass = (JavaClass)typeNavigator;
- }
-
-
- /* If we are dealing with a return parameter then we need to treat this differently then if it is an input
- * parameter.
- * We need to first see if it is a special case for return types if not we treat it the same as everything
- * else.
- */
- if(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)typeNavigator))
- {
- BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
- }
- else{
- if(TypeFactory.isUnSupportedType((JavaHelpers)typeNavigator)){
- status = StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)typeNavigator).getJavaName() );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //ConsumptionMessages.MSG_WARN_JTS_UNSUPPORTED_TYPE + ((JavaHelpers)typeNavigator).getJavaName(),null));
- return status;
- }
-
- //if javaclass is null then we have a simple type
- if((javaClass == null) || TypeFactory.recognizedBean(javaClass.getJavaName()))
- {
- BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
- }
- else if (javaClass != null && !getReturnParam() &&
- // the following cases cannot be instantiated for input
- (javaClass.isInterface() || javaClass.isAbstract() || !hasDefaultConstructor(javaClass))) {
-
- Element element = BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
- element.setPropertyAsObject(TypeElement.NON_INSTANTIABLE, Boolean.TRUE);
- }
- else{
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(fParentElement,clientProject, env_);
- beanVisitorAction.setStatusMonitor(getStatusMonitor());
- beanVisitorAction.setBeansCreated(getBeansCreated());
- beanVisitorAction.setReturnParam(getReturnParam());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- }
- }
-
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- return status;
- }
-
- /**
- * Determine if the given javaClass has a default constructor.
- * @param javaClass The java class
- * @return true if javaClass has a default constructor, false otherwise
- */
- private boolean hasDefaultConstructor(JavaClass javaClass) {
-
- List methods = javaClass.getMethods();
- Iterator iter = methods.iterator();
-
- boolean foundConstructor = false;
-
- while (iter.hasNext()) {
- Method method = (Method) iter.next();
-
- if (method.getName().equals(javaClass.getName())) {
- if (method.listParametersWithoutReturn().length == 0)
- return method.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC;
- foundConstructor = true;
- }
- }
-
- // if no constructor is found at this point, a default one is implicitly provided
- return !foundConstructor;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
deleted file mode 100644
index fe4a2e38e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.osgi.util.NLS;
-
-
-
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* It will automatically walk the methods in the JavaClass
-* */
-public abstract class VisitorActionImpl implements VisitorAction
-{
-
- private Vector beansVisited = null;
- private Vector messages = null;
-
- public VisitorActionImpl( Vector messages, Vector beansVisited)
- {
- this.messages = messages;
- this.beansVisited = beansVisited;
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
- /**
- * Returns the vector of all messages found
- */
- public Vector getMessages ()
- {
- if (messages == null)
- messages = new Vector();
- return messages;
- }
-
- public Vector getBeansVisited()
- {
- if ( beansVisited == null)
- beansVisited = new Vector();
- return beansVisited;
- }
-
- public void addVisitedBean( JavaClass bean)
- {
- if ( beansVisited == null)
- beansVisited = new Vector();
- beansVisited.add(bean);
- }
-
- public boolean isBeanVisited (JavaClass bean)
- {
- return (beansVisited != null && beansVisited.contains(bean));
- }
-
- /**
- * sets the visitor that calls the visit
- * @parameter Visitor
- */
-
- public void setVisitor(Visitor visitor)
- {
- }
-
- protected void addMessage ( String key )
- {
- getMessages().add(key);
- }
-
- protected void addMessage ( String key, Object[] args )
- {
- getMessages().add(NLS.bind(key,args));
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
deleted file mode 100644
index 41468be26..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofAttributeVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String clientProject;
- private boolean returnParameter;
- private IEnvironment env;
-
-
- public void setEnvironment(IEnvironment env)
- {
- this.env = env;
- }
-
- /*
- * Use this to reflect
- */
- public void setProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- /*
- * Use this to reflect
- */
- public String getProject()
- {
- return clientProject;
- }
-
- public void setReturnParameter(boolean returnParameter)
- {
- this.returnParameter = returnParameter;
- }
-
-
- /*
- * Get the attribute belonging to this complex type
- * @param JavaParameter javaParameter that owns the type
- * @param VisitorAction Action to be performed on each method
- **/
- public IStatus run ( Object javaclass, VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- JavaClass javaClass = (JavaClass)javaclass;
-
- Hashtable spdMap = new Hashtable();
- for (Iterator m=javaClass.getPublicMethods().iterator(); m.hasNext(); ) {
- Method method=(Method)m.next();
- if (((method.getMethodElementSignature().startsWith("get")
- || method.getMethodElementSignature().startsWith("is"))
- && method.listParametersWithoutReturn().length == 0 )
- || (method.getMethodElementSignature().startsWith("set")
- && method.listParametersWithoutReturn().length > 0)) {
- int sub = 3;
- if(method.getMethodElementSignature().startsWith("is"))
- sub = 2;
- String propertyName = method.getMethodElementSignature().substring(sub);
- String lower = propertyName.substring(0,1).toLowerCase();
- String remainder = propertyName.substring(1);
- propertyName = lower + remainder;
- int index = propertyName.lastIndexOf("(");
- String temp = propertyName;
- propertyName = temp.substring(0,index);
-
- //find the propertydescriptor
- SamplePropertyDescriptor spd = (SamplePropertyDescriptor)spdMap.get(propertyName);
- if(spd == null){
- spd = new SamplePropertyDescriptor(propertyName);
- spdMap.put(propertyName,spd);
- }
- if(method.getMethodElementSignature().startsWith("set"))
- spd.setWriteMethod(method);
- else
- spd.setReadMethod(method);
-
- Field field = javaClass.getFieldNamed(propertyName);
- JavaHelpers propertyType = null;
- if(field != null){
- propertyType = (JavaHelpers)field.getEType();
- spd.setfStatic(field.isStatic());
- }
- else{
- if(method.getMethodElementSignature().startsWith("get") || method.getMethodElementSignature().startsWith("is"))
- propertyType = method.getReturnType();
- else{
- JavaParameter params[] = method.listParametersWithoutReturn();
- propertyType = params[0].getJavaType();
- }
- }
-
- spd.setPropertyType(propertyType);
-
- }
- }
- Enumeration spdEnum = spdMap.elements();
- while(spdEnum.hasMoreElements()){
- SamplePropertyDescriptor spd = (SamplePropertyDescriptor)spdEnum.nextElement();
- if(spdCheck(spd))
- status = vAction.visit(spd);
- }
-
- return status;
-
- }
-
- private boolean spdCheck(SamplePropertyDescriptor spd)
- {
- //check for indexed properties
- Method writeMethod = spd.getWriteMethod();
- if(writeMethod != null)
- if(writeMethod.listParametersWithoutReturn().length > 1) return false;
-
- if(spd.getPropertyType() == null) return false;
- if(spd.getPropertyType().isPrimitive()) return true;
- if(returnParameter && TypeFactory.isRecognizedReturnType(spd.getPropertyType())) return true;
- if(!returnParameter && TypeFactory.isUnSupportedType(spd.getPropertyType())) return true;
- if(!checkPolarity(spd)) return false;
-
- // so its a bean make sure it has a default constructor
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setClientProject(getProject());
- javaMofRef.setProxyBean(((JavaHelpers)spd.getPropertyType()).getQualifiedName());
- javaMofRef.setEnvironment( env );
- javaMofRef.execute(null, null);
- if(javaMofRef.getJavaClass() instanceof JavaClass){
- if(TypeFactory.recognizedBean(javaMofRef.getJavaClass().getJavaName())) return true;
- return defaultCheck((JavaClass)javaMofRef.getJavaClass());
-
- }
- return true;
-
- }
-
- private boolean checkPolarity(SamplePropertyDescriptor spd){
-
- Method readMethod = spd.getReadMethod();
- Method writeMethod = spd.getWriteMethod();
- if((readMethod == null && writeMethod != null) || (readMethod != null && writeMethod == null))
- return true;
- if(readMethod == null && writeMethod == null)
- return false;
-
- JavaParameter javaParameter[] = writeMethod.listParametersWithoutReturn();
- for(int i = 0;i< javaParameter.length;i++){
- JavaParameter jp = javaParameter[i];
- jp.getJavaType().getJavaName();
- readMethod.getReturnType().getJavaName();
- if(jp.getJavaType().getJavaName().equals(readMethod.getReturnType().getJavaName()))
- return true;
- }
- return false;
- }
-
- private boolean defaultCheck(JavaClass javaClass){
-
- Iterator m=javaClass.getMethods().iterator();
- //now check for a default constructor
- boolean defaultConst = true;
- while (m.hasNext()) {
- Method method=(Method)m.next();
- if (javaClass.getName().equals(method.getName())){
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- if (javaParameter.length > 0){
- //then we have no default constructor
- defaultConst = false;
- }
- else if(javaParameter.length == 0){
- if (method.getJavaVisibility().getValue() == 0)
- return true;
- }
- }
- }
-
- return defaultConst;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
deleted file mode 100644
index 773abb24e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-
-
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofBeanVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /*
- *Constructor
- **/
- public JavaMofBeanVisitor()
- {
- }
-
- public IStatus run ( Object javaClass, VisitorAction vAction)
- {
- return vAction.visit((JavaClass)javaClass);
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
deleted file mode 100644
index 7f0f0eba7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofFieldVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String clientProject;
-
- /*
- * Constructor
- **/
- public JavaMofFieldVisitor()
- {
- }
-
- /*
- * Use this to reflect
- */
- public void setProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- /*
- * Use this to reflect
- */
- public String getProject()
- {
- return clientProject;
- }
-
- /*
- * Get the attribute belonging to this complex type
- * @param JavaParameter javaParameter that owns the type
- * @param VisitorAction Action to be performed on each method
- **/
- public IStatus run ( Object javaclass, VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- JavaClass javaClass = (JavaClass)javaclass;
-
- boolean holderClass = false;
- EList implemented = javaClass.getImplementsInterfaces();
- for (int i = 0; i < implemented.size(); i++) {
- JavaClass anInterface = (JavaClass) implemented.get(i);
- if (anInterface.getQualifiedName().equals("javax.xml.rpc.holders.Holder"))
- holderClass = true;
- }
-
- //beaninfo code
- if(holderClass){
- EList e = javaClass.getFields();
- ListIterator list = e.listIterator();
- while(list.hasNext()){
- Field field = (Field)list.next();
- if(field.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC && !field.isFinal() && !field.isStatic()){
- if(fieldCheck(field))
- status = vAction.visit(field);
- }
- }
- }
-
- return status;
- }
- private boolean fieldCheck(Field field)
- {
- // so its a bean make sure it has a default constructor
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setProxyBean(((JavaHelpers)field.getEType()).getQualifiedName());
- javaMofRef.setClientProject(getProject());
- javaMofRef.execute(null, null);
- if(javaMofRef.getJavaClass() instanceof JavaClass){
- if(TypeFactory.recognizedBean(javaMofRef.getJavaClass().getJavaName())) return true;
- return defaultCheck((JavaClass)javaMofRef.getJavaClass());
- }
- return true;
- }
-
- private boolean defaultCheck(JavaClass javaClass){
-
- Iterator m=javaClass.getMethods().iterator();
- //now check for a default constructor
- boolean defaultConst = true;
- while (m.hasNext()) {
- Method method=(Method)m.next();
- if (javaClass.getName().equals(method.getName())){
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- if (javaParameter.length > 0){
- //then we have no default constructor
- defaultConst = false;
- }
- else if(javaParameter.length == 0){
- if (method.getJavaVisibility().getValue() == 0)
- return true;
- else if(method.getJavaVisibility().getValue() == 1)
- defaultConst = false;
- }
- }
- }
-
- return defaultConst;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java
deleted file mode 100644
index 2f1e0362a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import java.util.Iterator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofMethodVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public String SET_ENDPOINT = "setEndPoint";
- public String GET_ENDPOINT = "getEndPoint";
- private BooleanSelection[] fMethodsSelected;
-
-
- /*
- * Constructor
- **/
- public JavaMofMethodVisitor()
- {
- }
-
- public String UNDER_SCORE = "_";
-
- /*
- * Run through all the methods in this bean
- * @param JavaClass javaclass that holds the methods
- * @param VisitorAction Action to be performed on each method
- **/
- public IStatus run ( Object javaclass, VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- JavaClass javaClass = (JavaClass)javaclass;
- for (Iterator m=javaClass.getPublicMethods().iterator(); m.hasNext(); ) {
- Method method=(Method)m.next();
- if(fMethodsSelected != null) {
- boolean methodSelected = false;
- for(int i =0;i < fMethodsSelected.length;i++){
- if(fMethodsSelected[i] == null) continue;
- if ( fMethodsSelected[i].getValue().equals(method.getMethodElementSignature()))
- methodSelected = (boolean) fMethodsSelected[i].isSelected();
- }
-
- method.getName();
-
- if(methodSelected)
- status = vAction.visit(method);
-
- }
- else {
- status = vAction.visit(method);
- }
-
- }
- return status;
- }
-
- public void setMethodSelection(BooleanSelection[] methodSelected)
- {
- fMethodsSelected = methodSelected;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java
deleted file mode 100644
index 74904b62d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofParameterVisitor implements Visitor
-{
- private IEnvironment env_;
-
- /*
- * Constructor
- **/
- public JavaMofParameterVisitor(IEnvironment env)
- {
- env_ = env;
- }
-
- /*
- * Run through all the parameters in this method
- * @param JavaClass javaclass that holds the parameters
- * @param VisitorAction Action to be performed on each method
- **/
- public IStatus run ( Object imethod, VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
- Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
- Method method = (Method)imethod;
-
- JavaHelpers javaReturnParameter = method.getReturnType();
- //pgm This visitor used to take a JavaParameter type and now it is being called
- // with a JavaHelpers type. Gil, please ensure that this is Ok.
- status = vAction.visit(javaReturnParameter);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
-
- //now the inputs
- List parameters = method.getParameters();
-
- for (int index = 0; index < parameters.size(); index++)
- {
- JavaParameter param=(JavaParameter)parameters.get(index);
- status = vAction.visit(param);
- //
- severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- }
-
- return status;
-
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java
deleted file mode 100644
index 118fc8680..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofTypeVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private IEnvironment env_;
-
- private String clientProject;
-
- /*
- * Constructor
- **/
- public JavaMofTypeVisitor(IEnvironment env)
- {
- env_ = env;
- }
-
- /*
- * Use this to reflect
- */
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- /*
- * Use this to reflect
- */
- public String getClientProject()
- {
- return clientProject;
- }
-
- /*
- * Get the type belonging to the parameter
- * @param JavaParameter javaParameter that owns the type
- * @param VisitorAction Action to be performed on each method
- **/
- public IStatus run ( Object typeNavigator, VisitorAction vAction)
- {
- IStatus status = Status.OK_STATUS;
- if (typeNavigator instanceof JavaParameter){
-
- JavaParameter javaParameter = (JavaParameter)typeNavigator;
- JavaHelpers javaHelpers = javaParameter.getJavaType();
- status = vAction.visit(javaHelpers);
- }
- else if (typeNavigator instanceof JavaHelpers){
- status = vAction.visit(typeNavigator);
- }
- else if (typeNavigator instanceof SamplePropertyDescriptor){
- SamplePropertyDescriptor pd = (SamplePropertyDescriptor)typeNavigator;
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setClientProject(clientProject);
- javaMofRef.setProxyBean(((JavaHelpers)pd.getPropertyType()).getQualifiedName());
- javaMofRef.setEnvironment( env_ );
- status = javaMofRef.execute( null, null );
- if (status.getSeverity()==Status.ERROR)
- return status;
-
- status = vAction.visit(javaMofRef.getJavaClass());
- }
- else if (typeNavigator instanceof Field){
- Field field = (Field)typeNavigator;
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setClientProject(clientProject);
- javaMofRef.setProxyBean(((JavaHelpers)field.getEType()).getQualifiedName());
- javaMofRef.setEnvironment( env_ );
-
- status = javaMofRef.execute( null, null );
- if (status.getSeverity()==Status.ERROR)
- return status;
-
- status = vAction.visit(javaMofRef.getJavaClass());
- }
-
- return status;
- }
-
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
deleted file mode 100644
index 07311fb9e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.server.core.IServer;
-
-public abstract class AbstractStartServer {
-
-protected IProgressMonitor monitor;
-private ILog log_;
-
-public AbstractStartServer()
-{
- log_ = EnvironmentService.getEclipseLog();
-}
-
-/**
- * Execute the command
- */
-public void StartServer (IProject project, IServer server, IProgressMonitor monitor, boolean restart) throws CoreException
-{
- this.monitor = monitor;
-
- try
- {
-
-// IJavaServer javaServer = (IJavaServer) server.getDelegate();
-// addJarsToClassPath(javaServer);
- validateRemoteServerPath(server);
-
- if (server.getServerState() != IServer.STATE_STOPPED) // The Server is running
- {
- if (server.getServerRestartState())
- {
-
- server.synchronousStop(false);
- log_.log(ILog.INFO, 5050, this, "StartServer", "project="+project+", Stop command completed, restart needed");
- publishProject(server);
- startProject(server);
- }
- else
- {
-
- if (restart) // WEB-INF\lib need to be reloaded
- {
- publishProject(server);
- restartProject(project, server);
- }
- }
- }
- else {
-
- publishProject(server);
- startProject(server);
- }
-}
-
- catch (CoreException ce) {
- throw ce;
- }
- catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,ConsumptionMessages.MSG_ERROR_SERVER,e));
- }
-}
-
-protected void publishProject(IServer server) throws CoreException
-{
- monitor.subTask( ConsumptionMessages.PROGRESS_INFO_PUBLISHING_SERVER );
- IStatus status = server.publish(IServer.PUBLISH_INCREMENTAL, monitor);
- if (status.getSeverity() != IStatus.OK)
- throw new CoreException(status);
- log_.log(ILog.INFO, 5051, this, "publishProject", "IServer="+server+", Publish command completed");
- }
-
-protected void startProject(IServer server) throws CoreException
-{
- try
- {
- monitor.subTask( ConsumptionMessages.PROGRESS_INFO_STARTING_SERVER );
- server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
- log_.log(ILog.INFO, 5052, this, "startProject", "IServer="+server+", Start command completed");
-
- }
- catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,ConsumptionMessages.MSG_ERROR_SERVER,e));
- }
-}
-
-protected void restartProject(IProject project, IServer server) throws CoreException
-{
- //Do nothing
-}
-
-public void runPreServerConfig(IServer server, IProject EARProject){
-
- return;
-
-}
-
-public void runPostServerConfig(IServer server, IProject EARProject){
-
- return;
-}
-
-
-protected abstract void addJarsToClassPath(IServer server) throws CoreException;
-protected abstract void validateRemoteServerPath(IServer server) throws CoreException;
-
-public void stopServer(IServer server) throws CoreException {
-
- if (server != null) {
-
- if (server.getServerState() != IServer.STATE_STOPPED) {
- server.synchronousStop(false);
- }
- }
-
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
deleted file mode 100644
index 79657e302..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060921 [158210] kathy@ca.ibm.com - Kathy Chan, Calling incremental build on the project before adding to server
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class AddModuleToServerCommand extends AbstractDataModelOperation
-{
-
- private String serverInstanceId;
- private String project;
- private String module;
-
- public AddModuleToServerCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
-
- IServer server = ServerCore.findServer(serverInstanceId);
- if (server == null)
- {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IServerWorkingCopy serverwc = null;
-
- try
- {
- //Ensure the module is not a Java utility
- IProject iproject = ProjectUtilities.getProject(project);
- if (!J2EEUtils.isJavaComponent(iproject))
- {
- IModule imodule = ServerUtils.getModule(iproject);
- // TODO: This workaround for 156768 should be removed once the defect is fixed
- if (imodule == null) {
- // calling incremental build on the project before trying again
- iproject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,null);
- // wait for the incremental build to complete before trying again
- try
- {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
- }
- catch( InterruptedException exc )
- {
- // Assuming that the autobuilder has actually completed.
- }
- imodule = ServerUtils.getModule(iproject);
- if (imodule == null) {
- // return error if module is still null after 1 retry
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[]{module}) );
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- // end of workaround for 156768
-
- if (!ServerUtil.containsModule(server, imodule, null))
- {
- IModule[] imodules = new IModule[]{imodule};
- serverwc = server.createWorkingCopy();
- ServerUtil.modifyModules(serverwc, imodules, null, null);
- }
-
- }
- } catch (CoreException e)
- {
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[]{module}), e);
- env.getStatusHandler().reportError(status);
- return status;
- } finally
- {
- try
- {
- if (serverwc != null)
- {
- serverwc.save(true, null);
- }
- } catch (CoreException ce)
- {
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[] { module }), ce);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- return status;
-
-
- }
-
- public void setModule(String module)
- {
- this.module = module;
- }
-
- public void setProject(String project)
- {
- this.project = project;
- }
-
- public void setServerInstanceId(String serverInstanceId)
- {
- this.serverInstanceId = serverInstanceId;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
deleted file mode 100644
index 82ab8a312..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class AssociateModuleWithEARCommand extends AbstractDataModelOperation
-{
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
-
-
- public AssociateModuleWithEARCommand(){
-
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
- IProject moduleProject = null;
- IProject earProject = null;
-
- // get projects
- if (project_!=null)
- moduleProject = ProjectUtilities.getProject(project_);
- if (earProject_!=null)
- earProject = ProjectUtilities.getProject(earProject_);
-
- // associate modules if not already associated
- if (moduleProject!=null && earProject!=null) {
- if (!J2EEUtils.isComponentAssociated(earProject, moduleProject))
- J2EEUtils.associateComponentToEAR(moduleProject, earProject);
- }
-
- // ensure modules are associated otherwise report error
- if (!J2EEUtils.isComponentAssociated(earProject, moduleProject)){
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_ASSOCIATE, new String[]{module_, ear_}) );
- if (env!=null)
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEARProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
deleted file mode 100644
index a7bf7ba80..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class BuildProjectCommand extends AbstractDataModelOperation
-{
- private ValidationManager validationManager;
- private IProject project_;
- private boolean forceBuild_;
- // rm private Model model;
-
- /**
- * Default CTOR;
- */
- public BuildProjectCommand()
- {
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- try
- {
- if (forceBuild_)
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- else if (validationManager == null)
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- else if (validationManager.getWorkspaceAutoBuildPreference())
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- }
- catch (Exception e)
- {
- }
-
- try
- {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());
- }
- catch (InterruptedException ie)
- {
- // continue execution
- }
- catch (OperationCanceledException oce)
- {
- // continue execution
- }
-
- return Status.OK_STATUS;
- }
- /**
- * @param forceBuild The forceBuild to set.
- */
- public void setForceBuild(boolean forceBuild) {
- this.forceBuild_ = forceBuild;
- }
-
- /**
- * @param project The project to set.
- */
- public void setProject(IProject project) {
- this.project_ = project;
- }
-
- /**
- * @param validationManager The validationManager to set.
- */
- public void setValidationManager(ValidationManager validationManager) {
- this.validationManager = validationManager;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
deleted file mode 100644
index 681f3b9f8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CheckProjectOKCommand extends AbstractDataModelOperation
-{
-
- private String serviceServerTypeId_;
-
-
- /**
- * Default CTOR
- */
- public CheckProjectOKCommand() {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- String typeid = serviceServerTypeId_;
- IServer[] servers = ServerCore.getServers();
-// Iterator iterator = servers.iterator();
- boolean viewOpen = false;
- String serverName = null;
-
- for (int i=0;i<servers.length;i++) {
- IServer server = (IServer) servers[i];
-
- // If the configuration editor is open for the server that we are
- // deploying
- // to we will prompt the user to close it.
- if (server != null && server.getServerType().getId().equals(typeid)) {
- viewOpen = true;
- serverName = server.getName();
- break;
- }
- }
-
- if (viewOpen) {
- String errorMessage = NLS.bind(ConsumptionMessages.MSG_ERROR_SERVER_VIEW_OPEN, new String[] { serverName});
- return StatusUtils.errorStatus( errorMessage );
-
- }
-
- return status;
- }
-
- /**
- * @param serviceServerId
- * The serviceServer factory Id to set.
- */
- public void setServiceServerTypeID(String serviceServerId) {
- this.serviceServerTypeId_ = serviceServerId;
- }
-}
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
deleted file mode 100644
index 816372707..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class ComputeEndpointCommand extends AbstractDataModelOperation
-{
- private WebServicesParser webServicesParser;
- private String wsdlURI;
- private Boolean monitorService;
- private Integer monitoredPort;
-
- public ComputeEndpointCommand()
- {
- }
-
- /**
- * @param monitoredPort The monitoredPort to set.
- */
- public void setMonitoredPort(Integer monitoredPort)
- {
- this.monitoredPort = monitoredPort;
- }
- /**
- * @param monitorService The monitorService to set.
- */
- public void setMonitorService(Boolean monitorService)
- {
- this.monitorService = monitorService;
- }
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
- /**
- * @param wsdlURI The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public String getEndpoint()
- {
- if (monitorService != null && monitorService.booleanValue() && monitoredPort != null)
- {
- Definition def = webServicesParser.getWSDLDefinition(wsdlURI);
- if (def != null)
- {
- for (Iterator it = def.getServices().values().iterator(); it.hasNext();)
- {
- Service service = (Service)it.next();
- for (Iterator it2 = service.getPorts().values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- for (Iterator it3 = port.getExtensibilityElements().iterator(); it3.hasNext();)
- {
- ExtensibilityElement ext = (ExtensibilityElement)it3.next();
- if (ext instanceof SOAPAddress)
- {
- String location = ((SOAPAddress)ext).getLocationURI();
- try
- {
- URL url = new URL(location);
- url = new URL(url.getProtocol(), url.getHost(), monitoredPort.intValue(), url.getFile());
- return url.toString();
- }
- catch (MalformedURLException murle)
- {
- int protocolIndex = location.indexOf("://");
- if (protocolIndex != -1)
- {
- String protocol = location.substring(0, protocolIndex+3);
- int hostPortIndex = location.indexOf('/', protocolIndex+3);
- String file;
- if (hostPortIndex == -1)
- {
- hostPortIndex = location.length();
- file = "";
- }
- else
- file = location.substring(hostPortIndex, location.length());
- String hostPort = location.substring(protocolIndex+3, hostPortIndex);
- int hostIndex = hostPort.indexOf(':');
- String host;
- if (hostIndex != -1)
- host = hostPort.substring(0, hostIndex+1);
- else
- host = hostPort + ':';
- String newPort = String.valueOf(monitoredPort.intValue());
- StringBuffer endpoint = new StringBuffer(protocol);
- endpoint.append(host);
- endpoint.append(newPort);
- endpoint.append(file);
- return endpoint.toString();
- }
- }
- }
- }
- }
- }
- }
- }
- return null;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-}
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
deleted file mode 100644
index fd014e829..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class ComputeProxyEndpointCommand extends AbstractDataModelOperation
-{
- private Boolean monitorService;
- private Integer monitoredPort;
- private String proxyEndpoint;
- private String endpoint;
-
- public ComputeProxyEndpointCommand()
- {
- }
-
- /**
- * @param monitoredPort The monitoredPort to set.
- */
- public void setMonitoredPort(Integer monitoredPort)
- {
- this.monitoredPort = monitoredPort;
- }
- /**
- * @param monitorService The monitorService to set.
- */
- public void setMonitorService(Boolean monitorService)
- {
- this.monitorService = monitorService;
- }
-
- public String getEndpoint()
- {
- if (monitorService != null && monitorService.booleanValue() && monitoredPort != null)
- {
- // Use the endpoint that matches with the proxy the extension passes to us if it is set
- if (proxyEndpoint != null) {
- String location = proxyEndpoint;
- try
- {
- URL url = new URL(location);
- url = new URL(url.getProtocol(), url.getHost(), monitoredPort.intValue(), url.getFile());
- return url.toString();
- }
- catch (MalformedURLException murle)
- {
- int protocolIndex = location.indexOf("://");
- if (protocolIndex != -1)
- {
- String protocol = location.substring(0, protocolIndex+3);
- int hostPortIndex = location.indexOf('/', protocolIndex+3);
- String file;
- if (hostPortIndex == -1)
- {
- hostPortIndex = location.length();
- file = "";
- }
- else
- file = location.substring(hostPortIndex, location.length());
- String hostPort = location.substring(protocolIndex+3, hostPortIndex);
- int hostIndex = hostPort.indexOf(':');
- String host;
- if (hostIndex != -1)
- host = hostPort.substring(0, hostIndex+1);
- else
- host = hostPort + ':';
- String newPort = String.valueOf(monitoredPort.intValue());
- StringBuffer endpoint = new StringBuffer(protocol);
- endpoint.append(host);
- endpoint.append(newPort);
- endpoint.append(file);
- return endpoint.toString();
- }
- }
- } else {
- return endpoint;
- }
- }
- return null;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-
- /**
- * @param proxyEndpoint The proxyEndpoint to set.
- */
- public void setProxyEndpoint(String proxyEndpoint) {
- this.proxyEndpoint = proxyEndpoint;
- }
- /**
- * @param endpoint The endpoint to set.
- */
- public void setEndpoint(String endpoint) {
- this.endpoint = endpoint;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
deleted file mode 100644
index 983494869..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20061213 165723 kathy@ca.ibm.com - Kathy Chan
- * 20061213 165725 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDParser;
-import org.w3c.dom.Element;
-
-public class CopyWSDLCommand extends AbstractDataModelOperation
-{
- private String wsdlURI;
- private WebServicesParser webServicesParser;
- private String destinationURI;
- private Definition def;
- private Vector ignoreList;
-
- public CopyWSDLCommand()
- {
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- CopyWSDLRunnable copyWSDLRunnable = new CopyWSDLRunnable(env);
- try
- {
- ResourceUtils.getWorkspace().run(copyWSDLRunnable, null);
- return Status.OK_STATUS;
- }
- catch (CoreException ce)
- {
- IStatus status = ce.getStatus();
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
-
- private class CopyWSDLRunnable implements IWorkspaceRunnable {
-
- private IEnvironment environment = null;
-
- protected CopyWSDLRunnable(IEnvironment env){
- environment = env;
- }
- public void run(IProgressMonitor pm) throws CoreException {
- ignoreList = new Vector();
- if (def == null)
- def = webServicesParser.getWSDLDefinition(wsdlURI);
- try {
- copyWSDL(environment, wsdlURI, getBaseURI(destinationURI), getLocalname(destinationURI), def);
- } catch (Throwable e) {
- throw new CoreException(StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_COPY_WSDL, new String[]{wsdlURI, destinationURI}), e));
- }
- }
- }
- private void copyWSDL(IEnvironment env, String uri, String destURI, String destLocalname) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
- {
- Definition definition;
-
- try {
- definition = webServicesParser.getWSDLDefinitionVerbose(uri);
- copyWSDL(env, uri, destURI, destLocalname, definition);
- } catch (WSDLException e) {
- copyXMLSchema(env, uri, destURI);
- }
- }
-
- private void copyWSDL(IEnvironment env, String uri, String destURI, String destLocalname, Definition definition) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
- {
- uri = normalize(uri);
- if (!needToCopy(uri)) {
- return;
- }
- destURI = normalize(destURI);
- String baseURI = getBaseURI(uri);
- if (destLocalname == null || destLocalname.length() <= 0)
- destLocalname = getLocalname(uri);
-
- // copy WSDL
- StringBuffer destinationFileURI = new StringBuffer(addTrailingSeparator(destURI));
- destinationFileURI.append(destLocalname);
- WSDLFactory wsdlFactory = new WSDLFactoryImpl();
- WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- OutputStream os = env.getURIFactory().newURI(destinationFileURI.toString()).getOutputStream();
- wsdlWriter.writeWSDL(definition, os);
- os.close();
- // copy <wsdl:import>s
- Map imports = definition.getImports();
- for (Iterator it = imports.values().iterator(); it.hasNext();)
- {
- List list = (List)it.next();
- for (Iterator listIt = list.iterator(); listIt.hasNext();)
- {
- Import wsdlImport = (Import)listIt.next();
- String wsdlImportURI = wsdlImport.getLocationURI();
- if (isRelative(wsdlImportURI))
- {
- String importBaseURI = (new StringBuffer(baseURI)).append(wsdlImportURI).toString();
- String wsdlImportBaseURI = getBaseURI(wsdlImportURI);
- StringBuffer importDestURI = new StringBuffer(destURI);
- if (wsdlImportBaseURI != null)
- importDestURI.append(wsdlImportBaseURI);
- copyWSDL(env, importBaseURI, importDestURI.toString(), getLocalname(wsdlImportURI));
- }
- }
- }
- Types types = definition.getTypes();
- if (types != null)
- {
- List schemas = types.getExtensibilityElements();
- for (Iterator it = schemas.iterator(); it.hasNext();)
- {
- ExtensibilityElement extElement = (ExtensibilityElement)it.next();
- if (extElement instanceof UnknownExtensibilityElement)
- {
- UnknownExtensibilityElement schemaElement = (UnknownExtensibilityElement)extElement;
- XSDSchema xsdSchema = null;
- try
- {
- xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
- }
- catch (Throwable t)
- {
- // ignore any extensibility elements that cannot be parsed into a
- // XSDSchema instance
- }
- copyXMLSchema(env, xsdSchema, baseURI, destURI);
- }
- else if (extElement instanceof XSDSchemaExtensibilityElementImpl)
- {
- XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)extElement;
- XSDSchema xsdSchema = null;
- try
- {
- xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
- }
- catch (Throwable t)
- {
- // ignore any extensibility elements that cannot be parsed into a
- // XSDSchema instance
- }
- copyXMLSchema(env, xsdSchema, baseURI, destURI);
- }
- }
- }
- }
-
- private String getBaseURI(String uri)
- {
- int index = uri.lastIndexOf('/');
- if (index == -1)
- index = uri.lastIndexOf('\\');
- if (index != -1)
- return uri.substring(0, index + 1);
- else
- return null;
- }
-
- private String getLocalname(String uri)
- {
- int index = uri.lastIndexOf('/');
- if (index == -1)
- index = uri.lastIndexOf('\\');
- if (index != -1)
- return uri.substring(index + 1);
- else
- return uri;
- }
-
- private String addTrailingSeparator(String s)
- {
- if (!(s.endsWith("/") || s.endsWith("\\")))
- {
- StringBuffer sb = new StringBuffer(s);
- sb.append('/');
- return sb.toString();
- }
- else
- return s;
- }
-
- private boolean isRelative(String uri)
- {
- return (uri.indexOf(':') == -1);
- }
-
- private void copyXMLSchema(IEnvironment env, String uri, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
- {
- uri = normalize(uri);
- if (!needToCopy(uri)) {
- return;
- }
- destURI = normalize(destURI);
- // load as a cached schema
- XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(uri);
- // if schema is not cached, parse it
- if (xsdSchema == null)
- {
- XSDParser p = new XSDParser();
- InputStream is = NetUtils.getURLInputStream(uri);
- if (is != null)
- {
- p.parse(is);
- xsdSchema = p.getSchema();
- }
- }
- if (xsdSchema != null)
- {
- // copy schema
- Element e = xsdSchema.getElement();
- DOMSource domSource = new DOMSource(e);
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
- OutputStream os = env.getURIFactory().newURI((new StringBuffer(destURI)).append(getLocalname(uri)).toString()).getOutputStream();
- serializer.transform(domSource, new StreamResult(os));
- os.close();
- // copy <xsd:import>s and <xsd:include>s
- copyXMLSchema(env, xsdSchema, getBaseURI(uri), destURI);
- }
- }
-
- private void copyXMLSchema(IEnvironment env, XSDSchema xsdSchema, String baseURI, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
- {
- if (xsdSchema != null)
- {
- // copy <xsd:import>s and <xsd:include>s
- EList xsdSchemaContents = xsdSchema.getContents();
- for (Iterator it = xsdSchemaContents.iterator(); it.hasNext();)
- {
- Object content = it.next();
- if (content instanceof XSDSchemaDirective)
- {
- XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)content;
- String xsdSchemaDirectiveLocation = xsdSchemaDirective.getSchemaLocation();
- if (xsdSchemaDirectiveLocation != null && isRelative(xsdSchemaDirectiveLocation))
- {
- String directiveURI = (new StringBuffer(baseURI)).append(xsdSchemaDirectiveLocation).toString();
- String directiveBaseURI = getBaseURI(xsdSchemaDirectiveLocation);
- StringBuffer directiveDestURI = new StringBuffer(destURI);
- if (directiveBaseURI != null)
- directiveDestURI.append(directiveBaseURI);
- copyXMLSchema(env, directiveURI, directiveDestURI.toString());
- }
- }
- }
- }
- }
-
- private boolean needToCopy (String normalizedURI) {
- if (ignoreList.contains(normalizedURI))
- return false;
- ignoreList.add(normalizedURI);
- return true;
- }
-
-//normalize the uri to remove relative addressing "/.."
- private String normalize(String uri )
- {
- boolean normalized = false;
- while(!normalized){
- int dir = uri.indexOf("/..");
- if(dir == -1)
- normalized = true;
- else{
- String first = uri.substring(0,dir);
- String second = uri.substring(dir + 3);
- int newIndex = first.lastIndexOf("/");
- if(newIndex == -1){
- normalized = true;
- } else {
- first = first.substring(0,newIndex);
- uri = first + second;
- }
- }
- }
- return uri;
-
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public void setDestinationURI(String destinationURI)
- {
- this.destinationURI = destinationURI;
- }
-
- public void setDefinition(Definition def)
- {
- this.def = def;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLTreeCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLTreeCommand.java
deleted file mode 100644
index 0bedb2ea4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLTreeCommand.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070112 165721 makandre@ca.ibm.com - Andrew Mak, WSDL import cannot use relative import with to parent directories
- * 20070125 171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- * 20070409 181635 makandre@ca.ibm.com - Andrew Mak, WSDLCopier utility should create target folder
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.util.WSDLCopier;
-
-/**
- * @deprecated Use {@link WSDLCopier} instead.
- */
-public class CopyWSDLTreeCommand extends AbstractDataModelOperation
-{
- private String wsdlURI;
- private WebServicesParser webServicesParser;
- private String destinationURI;
- private Definition def;
- private String wsdlRelPath;
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- try
- {
- WSDLCopier copier = new WSDLCopier(webServicesParser);
- copier.setSourceURI(wsdlURI, def);
- copier.setTargetFolderURI(getBaseURI(destinationURI));
- copier.setTargetFilename(getLocalname(destinationURI));
-
- ResourceUtils.getWorkspace().run(copier, monitor);
-
- wsdlRelPath = copier.getRelativePath().toString();
-
- return Status.OK_STATUS;
- }
- catch (CoreException ce)
- {
- IStatus status = ce.getStatus();
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- private String getBaseURI(String uri)
- {
- int index = uri.lastIndexOf('/');
- if (index == -1)
- index = uri.lastIndexOf('\\');
- if (index != -1)
- return uri.substring(0, index + 1);
- else
- return null;
- }
-
- private String getLocalname(String uri)
- {
- int index = uri.lastIndexOf('/');
- if (index == -1)
- index = uri.lastIndexOf('\\');
- if (index != -1)
- return uri.substring(index + 1);
- else
- return uri;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public void setDestinationURI(String destinationURI)
- {
- this.destinationURI = destinationURI;
- }
-
- public void setDefinition(Definition def)
- {
- this.def = def;
- }
-
- public String getWSDLRelPath() {
- return wsdlRelPath;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
deleted file mode 100644
index f0ff80287..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060217 126757 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060517 126965 kathy@ca.ibm.com - Kathy Chan
- * 20060905 156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime
- * 20070505 184772 kathy@ca.ibm.com - Kathy Chan
- * 20080305 220371 kathy@ca.ibm.com - Kathy Chan
- * 20080305 220371 kathy@ca.ibm.com - Kathy Chan - reverting previous change to 220371
- * 20080326 220371 kathy@ca.ibm.com - Kathy Chan - re-applying 220371
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.server.core.FacetUtil;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetSetsByTemplateCache;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CreateFacetedProjectCommand extends AbstractDataModelOperation
-{
-
- //name of the project to be created
- private String projectName;
-
- //id of the IFacetedProjectTemplate to be used to create this project.
- private String templateId;
-
- //required facet versions that must be satisfied when creating the project (this comes from
- //the selected serverRuntime or clientRuntime in the calling scenario)
- private RequiredFacetVersion[] requiredFacetVersions;
-
- //server type id - used to determine the facet runtime the created project will be bound to
- //if serverInstanceId is null or empty
- private String serverFactoryId;
-
- //server id - used to determine the facet runtime the created project will be bound to. May
- //be null or empty.
- private String serverInstanceId;
-
- //facet runtime determined from the serverInstanceId or serverFactoryId
- private org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime;
-
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info)
- {
- IStatus status = Status.OK_STATUS;
-
- // check if data ready
- status = checkDataReady();
- if (status.getSeverity()==Status.ERROR)
- {
- return status;
- }
-
- IProject project = ProjectUtilities.getProject(projectName);
- if (!project.exists())
- {
- try
- {
- status = FacetUtils.createNewFacetedProject(projectName);
- if (status.getSeverity() == IStatus.ERROR)
- {
- return status;
- }
-
- IProject createdProject = ProjectUtilities.getProject(projectName);
- IFacetedProject fproject = ProjectFacetsManager.create(createdProject);
-
- //Get the facet versions to install.
- Set facetsToAdd = getFacetsToAdd();
-
- //Install the facet versions
- status = FacetUtils.addFacetsToProject(fproject, facetsToAdd);
- if (status.getSeverity() == IStatus.ERROR)
- {
- return status;
- }
-
- //Set the installed facet versions as fixed.
- Set newFacetVersions = fproject.getProjectFacets();
- Set fixedFacets = new HashSet();
- for (Iterator iter = newFacetVersions.iterator(); iter.hasNext();) {
- IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
- fixedFacets.add(facetVersion.getProjectFacet());
- }
- status = FacetUtils.setFixedFacetsOnProject(fproject, fixedFacets);
- if (status.getSeverity() == IStatus.ERROR)
- {
- return status;
- }
-
-
- //Set the runtime
- if (facetRuntime != null)
- {
- status = FacetUtils.setFacetRuntimeOnProject(fproject, facetRuntime);
- }
-
- // add facets required by Web service runtime
- if (requiredFacetVersions.length != 0) {
- status = FacetUtils.addRequiredFacetsToProject(project, requiredFacetVersions, monitor);
- if (status.getSeverity() == Status.ERROR)
- {
- return status;
- }
- }
-
- if (facetRuntime != null)
- {
- // add the default facets that's not in conflict with the existing facets
- Set projectFacetVersionSet = fproject.getProjectFacets();
- Set projectFacetSet = new HashSet();
- // get the project facet from the project facet version we calculated
- for (Iterator iter = projectFacetVersionSet.iterator(); iter.hasNext();) {
- IProjectFacetVersion pfv = (IProjectFacetVersion) iter.next();
- projectFacetSet.add(pfv.getProjectFacet());
- }
- try {
- Set defaultProjectFacetVersionSet = facetRuntime.getDefaultFacets(projectFacetSet);
- // The returned defaultFacetSet contains the original projectFacetSet passed into getDefaultFacets
- // plus any default facets that are not in conflict with the original projectFacetSet.
- // Add to facetsToAdd if the the default facet is not in the original set.
- Set defaultFacetsToAdd = new HashSet();
- for (Iterator iter = defaultProjectFacetVersionSet.iterator(); iter.hasNext();) {
- IProjectFacetVersion defaultProjFacetVersion = (IProjectFacetVersion) iter.next();
- if( ! projectFacetSet.contains( defaultProjFacetVersion.getProjectFacet() ) )
- {
- defaultFacetsToAdd.add(defaultProjFacetVersion);
- }
- }
- if (!defaultFacetsToAdd.isEmpty()) {
- status = FacetUtils.addFacetsToProject(fproject, defaultFacetsToAdd);
- if (status.getSeverity() == IStatus.ERROR)
- {
- return status;
- }
- }
- } catch (CoreException e) {
- // If there's any exception when trying to get the default facet, just ignore the default facet
- // and return the original facetsToAdd.
- }
- // end of adding default facets
- }
- } catch (CoreException ce)
- {
- return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
- }
- }
- return status;
- }
-
- private IStatus checkDataReady()
- {
-
- if (projectName == null)
- {
- return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] {projectName}));
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the set of facets to install on the new project. The set will consist
- * of the highest version of each of the template's fixed facets that satifies
- * both the required facet versions and the facet runtime.
- * @return Set a Set containing elements of type IProjectFacetVersion.
- */
- private Set getFacetsToAdd()
- {
- Set facets = null;
-
- //Set the facet runtime.
- setFacetRuntime();
- //Get all facet version combinations for the template in order of ascending version numbers.
- Set[] allCombinations = FacetSetsByTemplateCache.getInstance().getFacetVersionCombinationsFromTemplate(templateId);
- int n = allCombinations.length;
- if (facetRuntime != null)
- {
- //Walk the facet version combinations in order of descending version numbers.
- for (int i=n-1; i>=0; i--)
- {
- //Check this template combination to see if it is compatible with both the
- //required facet versions and the server runtime. If it is, choose it.
- Set combination = allCombinations[i];
- FacetMatcher fm = FacetUtils.match(requiredFacetVersions, combination);
- if (fm.isMatch())
- {
- //Check against Runtime
- if (FacetUtils.doesRuntimeSupportFacets(facetRuntime, combination))
- {
- //We have a match. Use this combination of facet versions for project creation.
- facets = combination;
- break;
- }
- }
- }
-
- }
- else
- {
- for (int i=n-1; i>=0; i--)
- {
- //Check this template combination to see if it is compatible with both the
- //service/client runtime and the server runtime. If it is, choose it.
- Set combination = allCombinations[i];
- FacetMatcher fm = FacetUtils.match(requiredFacetVersions, combination);
- if (fm.isMatch())
- {
- //We have a match. Use this combination of facet versions for project creation.
- facets = combination;
- break;
- }
- }
- }
-
- //Unlikely to get to this point in the code, but if we do, choose the highest version
- //of each fixed facet in the template.
- if (facets == null)
- {
- facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
- }
-
- return facets;
- }
-
- /**
- * Sets the facetRuntime attribute based on the serverInstanceId or serverFactoryId
- * Preference is given to non-stub facet runtimes.
- */
- private void setFacetRuntime()
- {
-
- if (serverInstanceId != null && serverInstanceId.length()>0)
- {
- IServer server = ServerCore.findServer(serverInstanceId);
- IRuntime sRuntime = server.getRuntime();
- facetRuntime = FacetUtil.getRuntime(sRuntime);
- }
- else
- {
- if (serverFactoryId != null && serverFactoryId.length() > 0)
- {
- //Find a non Stub runtime that matches this server type
- IRuntime serverRuntime = ServerUtils.getNonStubRuntime(serverFactoryId);
- if (serverRuntime != null)
- {
- facetRuntime = FacetUtil.getRuntime(serverRuntime);
- }
- else
- {
- //Accept stub runtime.
- IServerType st = ServerCore.findServerType(serverFactoryId);
- String runtimeTypeId = st.getRuntimeType().getId();
- //Find the facet runtime
- IRuntime[] runtimes = ServerCore.getRuntimes();
- for (int i=0; i<runtimes.length; i++)
- {
- IRuntime sRuntime = runtimes[i];
- if (sRuntime.getRuntimeType().getId().equals(runtimeTypeId))
- {
- facetRuntime = FacetUtil.getRuntime(sRuntime);
- }
- }
- }
- }
- }
- }
-
- public void setProjectName(String projectName)
- {
- this.projectName = projectName;
- }
-
- public void setTemplateId(String templateId)
- {
- this.templateId = templateId;
- }
-
- public void setRequiredFacetVersions(RequiredFacetVersion[] requiredFacetVersions)
- {
- this.requiredFacetVersions = requiredFacetVersions;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
-
- public void setServerInstanceId(String serverInstanceId)
- {
- this.serverInstanceId = serverInstanceId;
- }
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
deleted file mode 100644
index dc90342ca..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-public class CreateJavaProjectCommand extends AbstractDataModelOperation
-{
- private String projectName_;
-
- /**
- * Default CTOR
- */
- public CreateJavaProjectCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName_);
-
- if (project != null && !project.exists())
- {
- try
- {
- project.create(ResourcesPlugin.getWorkspace().newProjectDescription(project.getName()), monitor);
- project.open(monitor);
- IProjectDescription desc = project.getDescription();
- desc.setNatureIds(new String[] {JavaCore.NATURE_ID});
- ICommand cmd = desc.newCommand();
- cmd.setBuilderName(JavaCore.BUILDER_ID);
- desc.setBuildSpec(new ICommand[] {cmd});
- project.setDescription(desc, monitor);
- IJavaProject javaProject = JavaCore.create(project);
- Path projectRoot = new Path(Path.ROOT.append(new Path(project.getName())).toString());
- javaProject.setRawClasspath(new IClasspathEntry[] {JavaCore.newSourceEntry(projectRoot), JavaCore.newContainerEntry(new Path(JavaRuntime.JRE_CONTAINER))}, monitor);
- javaProject.setOutputLocation(projectRoot, monitor);
- }
- catch (CoreException ce)
- {
- IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT, new String[] {projectName_}), ce);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- return Status.OK_STATUS;
- }
-
- public void setProjectName(String projectName)
- {
- projectName_ = projectName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java
deleted file mode 100644
index 84b886c26..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerPort;
-import org.eclipse.wst.server.core.internal.IMonitoredServerPort;
-import org.eclipse.wst.server.core.internal.IServerMonitorManager;
-import org.eclipse.wst.server.core.internal.ServerMonitorManager;
-
-public class CreateMonitorCommand extends AbstractDataModelOperation
-{
-
- private static final String WEB_SERVICES = "Web services";
-
- private Boolean monitorService;
-
- private String serviceServerInstanceId;
-
- private Integer monitoredPort;
-
- public CreateMonitorCommand() {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- if (monitorService != null && monitorService.booleanValue()) {
- IServer server = ServerCore.findServer(serviceServerInstanceId);
- if (server != null) {
-
- // IMonitorableServer monitorableServer = (IMonitorableServer)
- // serverDelegate;
- ServerPort[] ports = server.getServerPorts(null);
- ServerPort port = null;
- for (int it = 0; it < ports.length; it++) {
- ServerPort p = ports[it];
- String protocol = p.getProtocol();
- if (protocol != null && protocol.trim().toLowerCase().equals("http")) {
- port = p;
- break;
- }
- }
- if (port != null) {
- IServerMonitorManager serverMonitorManager = ServerMonitorManager.getInstance();
- IMonitoredServerPort[] monitoredPorts = serverMonitorManager.getMonitoredPorts(server);
- for (int it2 = 0; it2 < monitoredPorts.length; it2++) {
- IMonitoredServerPort imsPort = monitoredPorts[it2];
- if (port.getPort() == imsPort.getServerPort().getPort() && hasContentWebServices(imsPort)) // port
- // already
- // being
- // monitored
- {
- if (!imsPort.isStarted()) {
- try {
- serverMonitorManager.startMonitor(imsPort);
- }
- catch (CoreException ce) {
- IStatus error = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR,
- new Object[] { String.valueOf(port.getPort()), server.getName()}), ce);
- env.getStatusHandler().reportError(error);
- return error;
- }
- }
- monitoredPort = new Integer(imsPort.getMonitorPort());
- return Status.OK_STATUS;
- }
- }
- try {
- IMonitoredServerPort imsPort = serverMonitorManager.createMonitor(server, port, -1, new String[] { WEB_SERVICES});
- serverMonitorManager.startMonitor(imsPort);
- monitoredPort = new Integer(imsPort.getMonitorPort());
- return Status.OK_STATUS;
- }
- catch (CoreException ce) {
- IStatus error = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[] {
- String.valueOf(port.getPort()), server.getName()}), ce);
- env.getStatusHandler().reportError(error);
- return error;
- }
- }
-
- else {
- IStatus info = StatusUtils.infoStatus( NLS.bind(ConsumptionMessages.MSG_INFO_MONITORING_NOT_SUPPORTED,
- new Object[] { server.getName()}) );
- env.getStatusHandler().reportInfo(info);
- return info;
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- private boolean hasContentWebServices(IMonitoredServerPort imsPort) {
- String[] contents = imsPort.getContentTypes();
- for (int i = 0; i < contents.length; i++)
- if (WEB_SERVICES.equals(contents[i])) return true;
- return false;
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer) {
- this.serviceServerInstanceId = typeRuntimeServer.getServerInstanceId();
- }
-
- public void setServiceServerInstanceId(String serviceServerInstanceId) {
- this.serviceServerInstanceId = serviceServerInstanceId;
- }
-
- public Integer getMonitoredPort() {
- return monitoredPort;
- }
-
- public void setMonitorService(Boolean value) {
- monitorService = value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
deleted file mode 100644
index d05873ca6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20071210 203826 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class CreateServerCommand extends AbstractDataModelOperation
-{
- private String serverFactoryId;
- private String serverRuntimeId;
- private String serverInstanceId;
-
- /**
- * Creates a server of the factory id using the server runtime Id if provided
- * Note1: Checking for server instance == null is done in the PreService/ClientInstallCommands
- * Note2: Reporting of errors is done in PreService/ClientInstallCommands; simply return the status.
- */
- public CreateServerCommand(){
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
-
- if (serverFactoryId==null){
- status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_CREATE_SERVER );
- return status;
- }
-
- IServerWorkingCopy serverWC = null;
- IServer server = null;
- try {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType!=null) {
-
- IRuntime serverRuntime = null;
- if (serverRuntimeId != null) {
- serverRuntime = ServerCore.findRuntime(serverRuntimeId); // may return null if no runtime is found
- }
-
- if (serverRuntime == null) { // either serverRuntimeId is null or did not find a runtime with that Id
- //Choose a Runtime which is not a stub
- IRuntime nonStubRuntime = null;
- IRuntime[] runtimes = ServerUtil.getRuntimes(null, null);
- String serverRuntimeTypeId = serverType.getRuntimeType().getId();
- for (int i = 0; i < runtimes.length; i++) {
- IRuntime runtime = runtimes[i];
- String thisRuntimeTypeId = runtime.getRuntimeType().getId();
- if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
- //Found an appropriate IRuntime that is not a stub
- nonStubRuntime = runtime;
- break;
- }
- }
-
- if (nonStubRuntime==null)
- {
- status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_STUB_ONLY,new String[]{serverFactoryId}) );
- return status;
- }
-
- serverRuntime = nonStubRuntime;
- }
-
- if (env!=null)
- {
- serverWC = serverType.createServer(null, null, serverRuntime, monitor );
- }
- else
- {
- serverWC = serverType.createServer(null, null, serverRuntime, null);
- }
-
- if (serverWC != null) {
- if (env!=null)
- server = serverWC.saveAll(true, monitor );
- else
- server = serverWC.saveAll(true, null);
- }
- }
- } catch (CoreException ce) {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_CREATE_SERVER, ce);
- return status;
- }
-
- // set serverInstanceId
- if (server!=null)
- serverInstanceId = server.getId();
- else {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_CREATE_SERVER );
- }
-
- return status;
- }
-
- public void setServerFactoryid(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
-
- public void setServerRuntimeId(String serverRuntimeId)
- {
- this.serverRuntimeId = serverRuntimeId;
- }
-
- public String getServerInstanceId()
- {
- return serverInstanceId;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
deleted file mode 100644
index 012ccbf57..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DisableBuildCommand extends AbstractDataModelOperation
-{
-
- private ValidationManager manager_;
- /**
- * CTOR;
- */
- public DisableBuildCommand()
- {
-
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_DISABLE_BUILD);
-
- if (manager_!=null) {
- manager_.disableAutoBuild();
- }
- return status;
- }
-
- /**
- * Set the model
- *
- * @param model
- */
- public void setModel(Model model) {
- }
-
-
- /**
- * @param manager_ The manager_ to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
deleted file mode 100644
index 845dfcf99..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class DisableValidationCommand extends AbstractDataModelOperation
-{
-
- private ValidationManager manager_;
- private IProject serviceProject_;
-
- /**
- * CTOR;
- */
- public DisableValidationCommand() {
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- ProgressUtils.report(monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_DISABLE_VALIDATION);
-
- IProject project = serviceProject_;
- if (project != null) manager_.disableValidationForProject(project);
-
- return status;
- }
-
- /**
- * @param manager_
- * The manager_ to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-
- public void setServiceProject(IProject serviceProject){
- this.serviceProject_ = serviceProject;
- }
-}
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
deleted file mode 100644
index 840cd647f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060612 146564 kathy@ca.ibm.com - Kathy Chan
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-// TODO: Get rid of this. A replacement is in org.eclipse.wst.ws.
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitorWorkingCopy;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore;
-import org.eclipse.wst.server.core.util.SocketUtil;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class GetMonitorCommand extends AbstractDataModelOperation
-{
- private boolean monitorService;
- private boolean create;
- private WebServicesParser webServicesParser;
- private String wsdlURI;
- private List endpoints;
- private String proxyEndpoint;
-
- public GetMonitorCommand()
- {
- monitorService = true;
- create = true;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- endpoints = new Vector();
- if (monitorService && wsdlURI != null && wsdlURI.length() > 0)
- {
- webServicesParser = WSDLParserFactory.getWSDLParser();
- Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
- if (definition != null)
- {
- Map services = definition.getServices();
- for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
- {
- Service service = (Service)servicesIt.next();
- Map ports = service.getPorts();
- for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
- {
- Port wsdlPort = (Port)portsIt.next();
- List extElements = wsdlPort.getExtensibilityElements();
- for (Iterator extElementsIt = extElements.iterator(); extElementsIt.hasNext();)
- {
- ExtensibilityElement extElement = (ExtensibilityElement)extElementsIt.next();
- String endpoint = null;
- URL endpointURL = null;
- if (extElement instanceof SOAPAddress)
- endpoint = ((SOAPAddress)extElement).getLocationURI();
- else if (extElement instanceof HTTPAddress)
- endpoint = ((HTTPAddress)extElement).getLocationURI();
- if (endpoint != null)
- {
- try
- {
- endpointURL = new URL(endpoint);
- }
- catch (MalformedURLException murle)
- {
- }
- }
- if (endpointURL != null)
- {
- String protocol = endpointURL.getProtocol();
- String host = endpointURL.getHost();
- int port = endpointURL.getPort();
- if (port == -1)
- {
- if ("http".equalsIgnoreCase(protocol))
- port = 80;
- else if ("https".equalsIgnoreCase(protocol))
- port = 443;
- }
- if (protocol != null && protocol.startsWith("http") && host != null && host.length() > 0 && port != -1)
- {
- IMonitor m = null;
- IMonitor[] monitors = MonitorCore.getMonitors();
- for (int i=0; i<monitors.length; i++)
- {
- if (host.equalsIgnoreCase(monitors[i].getRemoteHost()) && port == monitors[i].getRemotePort())
- {
- m = monitors[i];
- break;
- }
- }
- if (m == null && create)
- {
- int monitoredPort = SocketUtil.findUnusedPort(5000, 15000);
- IMonitorWorkingCopy monitorWorkingCopy = MonitorCore.createMonitor();
- monitorWorkingCopy.setLocalPort(monitoredPort);
- monitorWorkingCopy.setRemoteHost(host);
- monitorWorkingCopy.setRemotePort(port);
- monitorWorkingCopy.setProtocol("HTTP");
- try
- {
- m = monitorWorkingCopy.save();
- }
- catch (Throwable t)
- {
- IStatus warning = StatusUtils.warningStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[]{String.valueOf(port), endpoint}), t);
- try
- {
- if (env != null)
- env.getStatusHandler().report(warning);
- }
- catch (StatusException se)
- {
- }
- }
- }
- if (m != null)
- {
- try
- {
- if (!m.isRunning())
- m.start();
- // Use the endpoint that matches with the proxy the extension passes to us if it is set
- if (proxyEndpoint != null) {
- try {
- endpointURL = new URL(proxyEndpoint);
- } catch (MalformedURLException murle)
- {
- // ignore proxy endpoint
- }
- }
- StringBuffer sb = new StringBuffer(endpointURL.getProtocol());
- sb.append("://localhost:");
- sb.append(String.valueOf(m.getLocalPort()));
- sb.append(endpointURL.getFile());
- endpoints.add(sb.toString());
- }
-
- catch (Throwable t)
- {
- IStatus warning = StatusUtils.warningStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[]{String.valueOf(port), endpoint}), t);
- try
- {
- if (env != null)
- env.getStatusHandler().report(warning);
- }
- catch (StatusException se)
- {
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- public void setMonitorService(boolean monitorService)
- {
- this.monitorService = monitorService;
- }
-
- public void setDefinition(Definition definition)
- {
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setCreate(boolean create)
- {
- this.create = create;
- }
-
- public List getEndpoints()
- {
- return endpoints;
- }
-
- /**
- * @param proxyEndpoint The proxyEndpoint to set.
- */
- public void setProxyEndpoint(String proxyEndpoint) {
- this.proxyEndpoint = proxyEndpoint;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
deleted file mode 100644
index f5e2931f3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-
-//core stuff
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
-* This class is to be used to Build the data model
-* first we get the java class and then build the model
-*/
-public class JavaMofReflectionCommand extends AbstractDataModelOperation
-{
-
- public static String LABEL = "JavaMofReflectionCommand";
- public static String DESCRIPTION = "reflection for a given class";
- public static String OK_MESSAGE = "The model has been built ";
- private static String JAVA_EXTENSION = ".java";
- private static String CLASS_EXTENSION = ".class";
-
- private String clientProject;
- private JavaHelpers javaClass;
- private String qname;
- private String proxyBean;
-
- /**
- * Constructs a new JavaMofReflectionCommand with the given label and description
- *
- */
- public JavaMofReflectionCommand()
- {
- }
-
- // setters for this command
-
-
- /**
- * The end result of this whole process is to get the Java Class
- */
- public JavaHelpers getJavaClass()
- {
- return javaClass;
- }
-
-
- private void processQName()
- {
- qname = proxyBean;
- if (qname.toLowerCase().endsWith(JAVA_EXTENSION)) {
- qname = qname.substring(0,(qname.length() -5));
- }
- if (qname.toLowerCase().endsWith(CLASS_EXTENSION)) {
- qname = qname.substring(0,(qname.length() -6));
- }
- }
-
- /**
- * Get the java model from the resource then
- * build the model from the mof
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- //just make sure the project and qname are there
- //they are essential for this operation
- IStatus status = Status.OK_STATUS;
- IProject clientIProject = (IProject)ResourceUtils.findResource(clientProject);
- processQName();
- if(clientProject == null || qname == null)
- return StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_UNABLE_TO_FIND_PROXY );
-
- try {
- EMFNature nature = JemProjectUtilities.getJEM_EMF_Nature(clientIProject, true);
- javaClass = JavaRefFactory.eINSTANCE.reflectType(qname, nature.getResourceSet());
- } catch (CoreException e) {
- }
-
- return status;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
deleted file mode 100644
index 94ece1e44..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-
-public class ManageServerStartUpCommand extends AbstractDataModelOperation
-{
-
- private Boolean isStartServiceEnabled_;
- private Boolean isTestServiceEnabled_;
-
- private IProject serviceProject_;
- private String serviceServerTypeId_;
- private IServer serviceExistingServer_;
-
- private IProject sampleProject_;
- private String sampleServerTypeId_;
- private IServer sampleExistingServer_;
-
- private boolean isWebProjectStartupRequested_;
-
- /**
- * Default CTOR;
- */
- public ManageServerStartUpCommand( ) {
-
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- ProgressUtils.report(monitor, ConsumptionMessages.PROGRESS_INFO_START_WEB_PROJECT);
-
- if (isStartServiceEnabled_.booleanValue() && serviceExistingServer_!=null){
- //System.out.println("Calling service server start: "+serviceProject_+" "+serviceServerTypeId_);
- StartProjectCommand spc = new StartProjectCommand( );
- spc.setServiceProject(serviceProject_);
- spc.setServiceServerTypeID(serviceServerTypeId_);
- spc.setServiceExistingServer(serviceExistingServer_);
- spc.setIsWebProjectStartupRequested(isWebProjectStartupRequested_);
- spc.setEnvironment( env );
- spc.execute( null, null );
- }
-
- if(isTestServiceEnabled_.booleanValue()&& sampleExistingServer_!=null && serviceExistingServer_!=null && !sampleExistingServer_.equals(serviceExistingServer_)){
- //System.out.println("Calling client server start: "+sampleProject_+" "+sampleExistingServer__);
- StartProjectCommand spc = new StartProjectCommand( );
- spc.setSampleProject(sampleProject_);
- spc.setSampleServerTypeID(sampleServerTypeId_);
- spc.setSampleExistingServer(sampleExistingServer_);
- spc.setCreationScenario(new Boolean("false"));
- spc.setEnvironment( env );
- spc.execute( null, null );
- }
-
- return status;
- }
-
- /**
- * @param isStartServiceEnabled The isStartServiceEnabled to set.
- */
- public void setStartService(Boolean isStartServiceEnabled) {
- this.isStartServiceEnabled_ = isStartServiceEnabled;
- }
- /**
- * @param isTestServiceEnabled The isTestServiceEnabled to set.
- */
- public void setTestService(Boolean isTestServiceEnabled) {
- this.isTestServiceEnabled_ = isTestServiceEnabled;
- }
- /**
- * @param serviceExistingServer The serviceExistingServer to set.
- */
- public void setServiceExistingServer(IServer serviceExistingServer) {
- this.serviceExistingServer_ = serviceExistingServer;
- }
-
- /**
- * @param serviceServerTypeId The serviceServerTypeId to set.
- */
- public void setServiceServerTypeId(String serviceServerTypeId) {
- this.serviceServerTypeId_ = serviceServerTypeId;
- }
- /**
- * @param serviceProject The serviceProject to set.
- */
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject_ = serviceProject;
- }
-
- /**
- * @param sampleExistingServer The sampleExistingServer to set.
- */
- public void setSampleExistingServer(IServer sampleExistingServer) {
- this.sampleExistingServer_ = sampleExistingServer;
- }
- /**
- * @param sampleProject The sampleProject to set.
- */
- public void setSampleProject(IProject sampleProject) {
- this.sampleProject_ = sampleProject;
- }
- /**
- * @param sampleServerTypeId The sampleServerTypeId to set.
- */
- public void setSampleServerTypeId(String sampleServerTypeId) {
- this.sampleServerTypeId_ = sampleServerTypeId;
- }
-
- /**
- * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
- */
- public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
- this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
deleted file mode 100644
index ba152381b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class RestoreBuildStateCommand extends AbstractDataModelOperation
-{
-
- private ValidationManager manager_;
-
- /**
- * Default CTOR;
- */
- public RestoreBuildStateCommand()
- {
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_RESTORE_BUILD);
-
- manager_.restoreAutoBuild();
-
- return Status.OK_STATUS;
- }
-
- /**
- * @param manager_ The manager_ to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java
deleted file mode 100644
index f7e97f59c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class RestoreValidationStateCommand extends AbstractDataModelOperation
-{
- private ValidationManager manager_;
-
- private boolean runValidation_;
-
- /**
- * Default CTOR;
- */
- public RestoreValidationStateCommand( boolean runValidation )
- {
- runValidation_ = runValidation;
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_RESTORE_VALIDATION);
-
- manager_.restoreValidationForProjects( runValidation_ );
-
- return Status.OK_STATUS;
- }
-
- /**
- * @param manager The validation manager to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
deleted file mode 100644
index 774a0f22b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartProjectCommand extends AbstractDataModelOperation
-{
-
-private Boolean creationScenario_ = Boolean.TRUE;
-
-private boolean isWebProjectStartupRequested_;
-private IProject serviceProject_;
-private IProject sampleProject_;
-private String serviceServerTypeID_;
-private String sampleServerTypeID_;
-private IServer serviceExistingServer_;
-private IServer sampleExistingServer_;
-
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand( ) {
-
-}
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand(boolean creationScenario ) {
- creationScenario_ = new Boolean(creationScenario);
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
- ProgressUtils.report( monitor, ConsumptionMessages.PROGRESS_INFO_START_WEB_PROJECT);
-
-
- IProject project = ((creationScenario_.booleanValue()) ? serviceProject_ : sampleProject_);
- String serverTypeID = ((creationScenario_.booleanValue()) ? serviceServerTypeID_ : sampleServerTypeID_);
- IServer server = ((creationScenario_.booleanValue()) ? serviceExistingServer_ : sampleExistingServer_);
- if (serverTypeID == null && server!=null) {
- serverTypeID = server.getServerType().getId();
- }
- if (project == null)
- {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND );
- env.getStatusHandler().reportError(status);
- return status;
- }
- IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(project), serverTypeID, server, true, monitor );
- if (instance == null)
- {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- try
- {
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(instance.getServerType().getId());
- startServerCommand.StartServer(project, instance, monitor, isWebProjectStartupRequested_);
- return status;
- }
- catch (CoreException ce )
- {
- IStatus embeddedStatus = ce.getStatus();
- status = embeddedStatus;
- env.getStatusHandler().reportError(status);
- return status;
- }
- catch (Exception e)
- {
- status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SERVER, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-}
-
-public void setCreationScenario(Boolean creationScenario)
-{
- creationScenario_ = creationScenario;
-}
-
-public void setServiceProject(IProject serviceProject)
-{
- serviceProject_ = serviceProject;
-}
-
-public void setSampleProject(IProject sampleProject)
-{
- sampleProject_ = sampleProject;
-}
-
-public void setServiceServerTypeID(String serviceServerTypeID)
-{
- serviceServerTypeID_ = serviceServerTypeID;
-}
-
-public void setSampleServerTypeID(String sampleServerTypeID)
-{
- sampleServerTypeID_ = sampleServerTypeID;
-}
-
-public void setServiceExistingServer(IServer serviceExistingServer)
-{
- serviceExistingServer_ = serviceExistingServer;
- if (serviceExistingServer_ != null)
- setServiceServerTypeID(serviceExistingServer_.getServerType().getId());
-}
-
-public void setSampleExistingServer(IServer sampleExistingServer)
-{
- sampleExistingServer_ = sampleExistingServer;
- if (sampleExistingServer_ != null)
- setSampleServerTypeID(sampleExistingServer_.getServerType().getId());
-}
-
-public void setIsWebProjectStartupRequested(boolean webProjectStartupRequested)
-{
- isWebProjectStartupRequested_ = webProjectStartupRequested;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java
deleted file mode 100644
index 26fd2e7c4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.util.Set;
-
-public class FacetMatcher
-{
- private boolean match;
- private Set facetsTested;
- private Set facetsThatMatched;
- private Set facetsToAdd;
-
- public Set getFacetsThatMatched()
- {
- return facetsThatMatched;
- }
- public void setFacetsThatMatched(Set facetsThatMatched)
- {
- this.facetsThatMatched = facetsThatMatched;
- }
- public Set getFacetsToAdd()
- {
- return facetsToAdd;
- }
- public void setFacetsToAdd(Set facetsToAdd)
- {
- this.facetsToAdd = facetsToAdd;
- }
- public boolean isMatch()
- {
- return match;
- }
- public void setMatch(boolean match)
- {
- this.match = match;
- }
- public Set getFacetsTested()
- {
- return facetsTested;
- }
- public void setFacetsTested(Set facetsTested)
- {
- this.facetsTested = facetsTested;
- }
-
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java
deleted file mode 100644
index 7d6535a76..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner (creation)
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20070402 151943 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.VersionFormatException;
-
-
-/**
- * FacetSetsByTemplateCache caches the sets of facet version combinations for templates.
- */
-public class FacetSetsByTemplateCache
-{
- // single instance per workbench
- private static FacetSetsByTemplateCache instance_;
-
- //facetSetsByTemplateId_:
- //key: Object of type String. String id of an IFacetedProjectTemplate.
- //value: Object of Set[]. An array of Sets where each set contains elements of type IProjectFacetVersion.
- private Hashtable facetSetsByTemplateId_;
- /**
- * Returns a singleton instance of this class.
- *
- * @return A singleton FacetSetsByTemplateCache object.
- */
- public static synchronized FacetSetsByTemplateCache getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new FacetSetsByTemplateCache();
- instance_.load();
- }
- return instance_;
- }
-
- private void load()
- {
- facetSetsByTemplateId_ = new Hashtable();
- }
-
- /**
- * Returns all the valid facet version combinations that can be derived from the fixed facets
- * of the given template. For example, if the template has two fixed facets, A and B,
- * and A has versions 1.0 and 2.0, B has versions 1.1, 2.1,
- * the following array of Sets will be returned (assuming for the sake of the example
- * that all the combinations are valid):<br/>
- * {Set1, Set2, Set3, Set4}, where<br/>
- * Set1 = [A1.0, B1.1]<br/>
- * Set2 = [A2.0, B1.1]<br/>
- * Set3 = [A1.0, B2.1]<br/>
- * Set4 = [A2.0, B2.1]<br/>
- * <br/>
- * @param templateId id of an {@link IFacetedProjectTemplate}
- * @return Set[] An array of Sets where each set contains elements of type {@link IProjectFacetVersion}.
- */
- public synchronized Set[] getFacetVersionCombinationsFromTemplate(String templateId)
- {
- //Return the cached combinations if present.
- Set[] cachedCombinations = (Set[])facetSetsByTemplateId_.get(templateId);
- if (cachedCombinations != null)
- {
- return cachedCombinations;
- }
- else
- {
-
- //Combinations have not yet been cached for the given template.
- //Determine the combinations and cache them.
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- Set fixedFacets = template.getFixedProjectFacets();
-
- //Create an array of arrays. Each element of the array will contain the array
- //of IProjectFacetVersions for each IProjectFacet in the set of fixed facets.
- Iterator itr = fixedFacets.iterator();
- ArrayList projectFacetVersionArrays = new ArrayList();
-
- while (itr.hasNext())
- {
- IProjectFacet facet = (IProjectFacet) itr.next();
- List versions = null;
- try
- {
- // Get the facet versions in ascending order.
- versions = facet.getSortedVersions(true);
- } catch (VersionFormatException e) {
- Set versionSet = facet.getVersions();
- Iterator versionSetItr = versionSet.iterator();
- versions = new ArrayList();
- while (versionSetItr.hasNext())
- {
- versions.add(itr.next());
- }
- } catch (CoreException e) {
- Set versionSet = facet.getVersions();
- Iterator versionSetItr = versionSet.iterator();
- versions = new ArrayList();
- while (versionSetItr.hasNext())
- {
- versions.add(itr.next());
- }
- }
-
- if (versions.size() > 0)
- {
- //Create an array of IProjectFacetVersions from versions.
- Iterator versionItr = versions.iterator();
- ArrayList arrayOfVersionsList = new ArrayList();
- while (versionItr.hasNext())
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)versionItr.next();
- arrayOfVersionsList.add(pfv);
- }
-
- //Add the array of versions to the list of arrays.
- projectFacetVersionArrays.add((IProjectFacetVersion[])arrayOfVersionsList.toArray(new IProjectFacetVersion[0]));
-
-
- }
- }
- Set[] allValidCombinationsArray = new HashSet[0];
- if (projectFacetVersionArrays.size()>0) {
- IProjectFacetVersion[][] arrayOfProjectFacetVersionArrays = (IProjectFacetVersion[][])projectFacetVersionArrays.toArray(new IProjectFacetVersion[0][0]);
- allValidCombinationsArray = FacetUtils.getFacetCombinations(arrayOfProjectFacetVersionArrays, true);
- facetSetsByTemplateId_.put(templateId, allValidCombinationsArray);
- }
-
- return allValidCombinationsArray;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
deleted file mode 100644
index f6162f306..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
+++ /dev/null
@@ -1,1459 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070523 158230 kathy@ca.ibm.com - Kathy Chan
- * 20071219 213356 kathy@ca.ibm.com - Kathy Chan
- * 20080325 222473 makandre@ca.ibm.com - Andrew Mak, Create EAR version based on the version of modules to be added
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IUtilityFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.VersionFormatException;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action.Type;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * FacetUtils contains utility methods related to facets and templates.
- * <br/><br/>
- * Terminology used in the Javadoc in this class
- * <ul>
- * <li><b>facet</b>: An {@link IProjectFacet}</li>
- * <li><b>facet version</b>: An {@link IProjectFacetVersion} </li>
- * <li><b>facet runtime</b>: An {@link IRuntime}</li>
- * <li><b>faceted project</b>: An {@link IFacetedProject}. A faceted project may be obtained
- * from an IProject (@see ProjectFacetsManager#create)</li>
- * <li><b>template</b>: An {@link IFacetedProjectTemplate}. Conceptually this is similar to a project type.</li>
- * <li><b>required facet version</b>: A {@link RequiredFacetVersion}. Used by serviceRuntimes and clientRuntimes
- * to identify what they require in terms of facet versions.</li>
- * </ul>
- */
-public class FacetUtils
-{
-
- /**
- * Returns an array of valid projects. Valid projects include projects with the facets nature or
- * projects with the Java nature.
- * @return IProject[] an array of valid projects
- */
- public static IProject[] getAllProjects()
- {
- //Return all projects in the workspace that have the project facet nature or that do not have the project
- //facet nature but have the Java nature.
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- ArrayList validProjects = new ArrayList();
- for (int i = 0; i < projects.length; i++)
- {
- try
- {
- IFacetedProject facProject = ProjectFacetsManager.create(projects[i]);
- if (facProject != null)
- {
- //Add it to the list
- validProjects.add(projects[i]);
- }
- else
- {
- if (ResourceUtils.isJavaProject(projects[i]))
- {
- validProjects.add(projects[i]);
- }
- }
- }
- catch (CoreException ce)
- {
- }
- }
- return (IProject[])validProjects.toArray(new IProject[]{});
- }
-
- /**
- * Returns the facet versions on the given project.
- * @param projectName name of an existing project.
- * @returns Set containing elements of type {@link IProjectFacetVersion}.
- * These are the facet versions currently installed on this project. If the project
- * is a Java project, facets are inferred from the Java project. Returns null
- * <ul>
- * <li>if the project is not a faceted project or a Java project or</li>
- * <li>if the project does not exist or</li>
- * <li>if the project is null</li>
- * </ul>
- */
- public static Set getFacetsForProject(String projectName)
- {
- Set facetVersions = null;
- IProject project = ProjectUtilities.getProject(projectName);
- if (project!=null && project.exists())
- {
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(project);
- if (fproject != null)
- {
- facetVersions = fproject.getProjectFacets();
- } else
- {
- //If this is not a faceted project, it may still be okay if it is a Java project
- //and the client runtime supports a Java project.
- IJavaProject javaProject = null;
- if (ResourceUtils.isJavaProject(project))
- {
- javaProject = JavaCore.create(project);
- facetVersions = FacetUtils.getFacetsForJavaProject(javaProject);
- }
- }
- } catch (CoreException ce)
- {
- //Leaving the catch block empty. This method will return null if there
- //were any blow-ups in the facet API being called.
- }
- }
-
- return facetVersions;
-
- }
-
- /**
- * Returns the facet runtime the given project is bound to.
- * @param projectName name of an existing project
- * @return {@link IRuntime} the project is bound to. Returns null
- * <ul>
- * <li>if the project is not bound to a facet runtime</li>
- * <li>if the project does not exist</li>
- * <li>if the project is null</li>
- * </ul>
- */
- public static IRuntime getFacetRuntimeForProject(String projectName)
- {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project!=null && project.exists())
- {
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(project);
- if (fproject != null)
- {
- return fproject.getPrimaryRuntime();
- }
- } catch (CoreException ce)
- {
- //Leaving the catch block empty. This method will return null if there
- //were any blow-ups in the facet API being called.
- }
- }
-
- return null;
- }
-
-
- /**
- * Returns a set of combinations of facet versions derived from the facet versions
- * in the provided arrayOfProjectFacetVersionArrays. For example, if
- * arrayOfProjectFacetVersionArrays is a two dimenstional array of facet versions that has
- * a structure like this:<br/>
- * {{FacetA_version1, FacetA_version2},<br/>
- * {FacetB_version1},<br/>
- * {FacetC_version1, FacetC_version2}}<br/>
- * the following array of Sets will be returned:<br/>
- * {Set1, Set2, Set3, Set4}, where<br/>
- * Set1 = [FacetA_version1, FacetB_version1, FacetC_version1]<br/>
- * Set2 = [FacetA_version2, FacetB_version1, FacetC_version1]<br/>
- * Set3 = [FacetA_version1, FacetB_version1, FacetC_version2]<br/>
- * Set4 = [FacetA_version2, FacetB_version1, FacetC_version2]<br/>
- * <br/>
- * @param arrayOfProjectFacetVersionArrays a two dimensional array containing elements
- * of type {@link IProjectFacetVersion}
- * @param returnValidOnly false if all combinations of facet versions are to be returned.
- * true if only valid combinations of facet versions are to be returned.
- * @return Set[] an array of Sets, where each Set contains elements of type {@link IProjectFacetVersion}.
- */
- public static Set[] getFacetCombinations(IProjectFacetVersion[][] arrayOfProjectFacetVersionArrays, boolean returnValidOnly)
- {
- ArrayList allCombinations = new ArrayList();
- //maxCount contains the number of versions in each array of IProjectFacetVersions.
- //initialize counter, which will be used to navigate arrayOfProjectFacetVersionArrays.
- int n = arrayOfProjectFacetVersionArrays.length;
- int[] maxCount = new int[n];
- int[] counter = new int[n];
- for (int i=0; i<n; i++)
- {
- maxCount[i] = arrayOfProjectFacetVersionArrays[i].length - 1;
- counter[i] = 0;
- }
-
- //Navigate arrayOfProjectFacetVersionArrays to create all possible combinations.
- boolean done = false;
- while (!done)
- {
- //Create a combination of size n using current values in counter.
- //Add it to the list of all combinations, checking first for validity if returnValidOnly is true.
- Set combination = new HashSet();
- for (int j=0; j<n; j++)
- {
- IProjectFacetVersion pfv = arrayOfProjectFacetVersionArrays[j][counter[j]];
- combination.add(pfv);
- }
-
- //Check if valid.
- if (returnValidOnly)
- {
- Set actions = getInstallActions(combination);
- try {
- if( ProjectFacetsManager.check( new HashSet(), actions ).getSeverity() == IStatus.OK )
- {
- allCombinations.add((combination));
- }
- } catch (Throwable e) {
- // Do nothing if ProjectFacetsManager.check() throws exception.
- // TODO This try/catch will be unneccesary once WTP bug 137551 is fixed so that an OK Status
- // would not be returned when an exception is thrown.
- }
- }
- else
- {
- allCombinations.add((combination));
- }
-
- //Update the counters.
- for (int p=0; p<n; p++)
- {
- if ( (counter[p] + 1) <= maxCount[p])
- {
- (counter[p])++;
- break;
- }
- else
- {
- counter[p] = 0;
- if (p == n-1)
- {
- done = true;
- }
- }
- }
- }
-
- Set[] allCombinationsArray = (Set[])allCombinations.toArray(new Set[0]);
- return allCombinationsArray;
- }
-
- /**
- * Returns a set of facet versions given a template. The highest facet version of every fixed
- * facet in the template is returned, with the exception of the jst.java facet, where the 1.4
- * facet version is returned.
- *
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return Set containing elements of type {@link IProjectFacetVersion}
- */
- public static Set getInitialFacetVersionsFromTemplate(String templateId)
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- Set fixedFacets = template.getFixedProjectFacets();
- HashSet initial = new HashSet();
- for (Iterator itr2 = fixedFacets.iterator(); itr2.hasNext(); )
- {
- IProjectFacet facet = (IProjectFacet) itr2.next();
- IProjectFacetVersion highestFacetVersion = null;
- try {
- if (isJavaFacet(facet)) //special case the java facet because 1.4 is a better default than 5.0 for now.
- {
- highestFacetVersion = facet.getVersion("1.4");
- } else {
- highestFacetVersion = facet.getLatestVersion();
- }
- } catch (VersionFormatException e) {
- } catch (CoreException e) {
- }
- initial.add(highestFacetVersion);
- }
-
- return initial;
- }
-
- /**
- * Returns a set of facet versions given a template. The default facet version of every fixed
- * facet in the template is returned. If unable to get default versions, an empty set will be returned.
- *
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return Set containing elements of type {@link IProjectFacetVersion}
- */
- public static Set getDefaultFacetVersionsFromTemplate(String templateId)
- {
- HashSet defaultSet = new HashSet();
- try {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- Set fixedFacets = template.getFixedProjectFacets();
- for (Iterator itr2 = fixedFacets.iterator(); itr2.hasNext(); )
- {
- IProjectFacet facet = (IProjectFacet) itr2.next();
- IProjectFacetVersion defaultFacetVersion = null;
- defaultFacetVersion = facet.getDefaultVersion();
- defaultSet.add(defaultFacetVersion);
- }
- return defaultSet;
- } catch (IllegalArgumentException e) {
- return defaultSet;
- } catch (VersionFormatException e) {
- return defaultSet;
- }
-
- }
-
- /**
- * Returns the template lables corresponding to the provided templateIds.
- * @param templateIds array of valid template ids. Each id must correspond to a {@link IFacetedProjectTemplate}.
- * @return String[] array of template labels.
- */
- public static String[] getTemplateLabels(String[] templateIds)
- {
- String[] labels = new String[templateIds.length];
- for (int i=0; i<templateIds.length; i++)
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateIds[i]);
- labels[i] = template.getLabel();
- }
- return labels;
-
- }
-
- /**
- * Returns the id of a template given its label.
- *
- * @param templateLabel label of a template
- * @return template id or empty String if no {@link IFacetedProjectTemplate} with the
- * given templateLabel could be found.
- */
- public static String getTemplateIdByLabel(String templateLabel)
- {
- for( Iterator itr = ProjectFacetsManager.getTemplates().iterator(); itr.hasNext(); )
- {
- final IFacetedProjectTemplate template = (IFacetedProjectTemplate) itr.next();
- if (template.getLabel().equals(templateLabel))
- {
- return template.getId();
-
- }
- }
-
- return "";
- }
-
- /**
- * Returns the label of a template given its id
- *
- * @param templateId id of a {@link IFacetedProjectTemplate}
- * @return template label
- */
- public static String getTemplateLabelById(String templateId)
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- return template.getLabel();
- }
-
- /**
- * Returns a set of install actions for the provided facet version
- *
- * @param projectFacetVersions Set containing elements of type {@link IProjectFacetVersion}
- * @return Set containing elements of type {@link Action} with the type attribute set to Type.INSTALL
- * The set contains one Action for each {@link IProjectFacetVersion} in projectFacetVersions.
- */
- public static Set getInstallActions(Set projectFacetVersions)
- {
- HashSet actions = new HashSet();
-
- Iterator facets = projectFacetVersions.iterator();
-
- while(facets.hasNext())
- {
- IProjectFacetVersion fv = (IProjectFacetVersion)facets.next();
- if (fv != null) {
- IProjectFacet pf = fv.getProjectFacet();
- Action action = new Action(Type.INSTALL, fv, getConfigObject(pf));
- actions.add(action);
- }
- }
-
- return actions;
- }
-
- /**
- * Returns the data model config object for the given project facet
- * For J2EE facets, set Add_TO_EAR properties of the data model to false,
- * for other facets, just return null
- * @param facetID
- * @return data model config object
- */
- public static Object getConfigObject(IProjectFacet projectFacet)
- {
-
- IDataModel dm = null;
- if (projectFacet != null) {
- String facetId = projectFacet.getId();
- if (facetId != null) {
- // set Add to EAR to false
- if (facetId.equals(IModuleConstants.JST_WEB_MODULE)) {
- dm = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
- dm.setBooleanProperty(IWebFacetInstallDataModelProperties.ADD_TO_EAR, false);
- } else if (facetId.equals(IModuleConstants.JST_EJB_MODULE)) {
- dm = DataModelFactory.createDataModel(new EjbFacetInstallDataModelProvider());
- dm.setBooleanProperty(IEjbFacetInstallDataModelProperties.ADD_TO_EAR, false);
- } else if (facetId.equals(IModuleConstants.JST_APPCLIENT_MODULE)) {
- dm = DataModelFactory.createDataModel(new AppClientFacetInstallDataModelProvider());
- dm.setBooleanProperty(IAppClientFacetInstallDataModelProperties.ADD_TO_EAR, false);
- } else if (facetId.equals(IModuleConstants.JST_UTILITY_MODULE)) {
- dm = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
- dm.setBooleanProperty(IUtilityFacetInstallDataModelProperties.ADD_TO_EAR, false);
- }
- }
- }
- return dm;
- }
- /**
- * Returns the {@link FacetMatcher} calculated when checking the required facet versions
- * against the facet versions.
- *
- * @param requiredFacetVersions array of required facet versions
- * @param projectFacetVersions facet versions to check against. Set containing elements of type
- * {@link IProjectFacetVersion}
- * @return FacetMatcher with the following characteristics:
- * <ul>
- * <li><b>isMatch</b>: returns true if the required facet versions already exist in the facet versions
- * or can be added to the facet versions. isMatch will return false otherwise.</li>
- * <li><b>getFacetsTested</b>: returns the same set of facet versions as the input parameter, projectFacetVersions</li>
- * <li><b>getFacetsThatMatched</b>: if isMatch returns false, getFacetsThatMatched returns null. If isMatch returns true,
- * getFacetsThatMatched returns the subset of facet versions in the input parameter, projectFacetVersions,
- * that matched one of the required facet versions. This may be an empty set.</li>
- * <li><b>getFacetsToAdd</b>: if isMatch returns false, getFacetsToAdd returns null. If isMatch returns true,
- * getFacetsToAdd returns the subset of facet versions that would need to be added to the facet versions in
- * projectFacetVersions in order to satisfy the requirements of the required facet versions. This may be
- * an empty set.</li>
- * </ul>
- */
- public static FacetMatcher match(RequiredFacetVersion[] requiredFacetVersions, Set projectFacetVersions)
- {
- FacetMatcher fm = new FacetMatcher();
- fm.setFacetsTested(projectFacetVersions);
- HashSet facetsToAdd = new HashSet();
- HashSet requiredFacetVersionsToAdd = new HashSet();
- HashSet facetsThatMatched = new HashSet();
- for (int i=0; i<requiredFacetVersions.length; i++)
- {
- RequiredFacetVersion rfv = requiredFacetVersions[i];
- IProjectFacetVersion rpfv = rfv.getProjectFacetVersion();
- String rid = rpfv.getProjectFacet().getId();
- String rv = rpfv.getVersionString();
- boolean facetPresent = false;
-
- //Is the project facet present? or a later version of applicable.
- Iterator itr = projectFacetVersions.iterator();
- while(itr.hasNext())
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)itr.next();
- String id = pfv.getProjectFacet().getId();
- String version = pfv.getVersionString();
- if (rid.equals(id))
- {
- if (rv.equals(version))
- {
- //found an exact match
- facetPresent = true;
- facetsThatMatched.add(pfv);
- }
- else
- {
- if (rfv.getAllowNewer())
- {
- if (greaterThan(version, rv))
- {
- //found a match
- facetPresent = true;
- facetsThatMatched.add(pfv);
- }
- }
- }
- //No need to keep iterating since we hit a facet with the same id;
- break;
- }
- }
-
- //if not present, put it in the list to check if it can be added.
- if (!facetPresent)
- {
- facetsToAdd.add(rpfv);
- requiredFacetVersionsToAdd.add(rfv);
- }
-
- }
-
- //Check if the facetsToAdd can be added
- if (requiredFacetVersionsToAdd.size() > 0)
- {
- //Test all possible combinations of the facets that need to be added
- //Create an array of arrays. Each element of the array will contain the array
- //of the permitted IProjectFacetVersions for each required facet.
- boolean facetsCanBeAdded = false;
- Iterator itr = requiredFacetVersionsToAdd.iterator();
- ArrayList projectFacetVersionArrays = new ArrayList();
-
- while (itr.hasNext())
- {
- RequiredFacetVersion reqFacetVersion = (RequiredFacetVersion) itr.next();
- IProjectFacetVersion[] versions = reqFacetVersion.getAllowedProjectFacetVersions();
- if (versions != null && versions.length > 0)
- {
- //Add the array of versions to the list of arrays.
- projectFacetVersionArrays.add(versions);
- }
- }
-
- IProjectFacetVersion[][] arrayOfProjectFacetVersionArrays = (IProjectFacetVersion[][])projectFacetVersionArrays.toArray(new IProjectFacetVersion[0][0]);
- Set[] combinations = getFacetCombinations(arrayOfProjectFacetVersionArrays, false);
- for (int i=0; i<combinations.length; i++)
- {
- //Check if the set can be added. If so, this is a match. Update the facet matcher and break.
- Set actions = getInstallActions(combinations[i]);
- try {
- if( ProjectFacetsManager.check( projectFacetVersions, actions ).getSeverity() == IStatus.OK )
- {
- //Facets can be added so there is a match
- facetsCanBeAdded=true;
- fm.setMatch(true);
- fm.setFacetsThatMatched(facetsThatMatched);
- fm.setFacetsToAdd(combinations[i]);
- break;
- }
- } catch (Throwable e) {
- // Do nothing if ProjectFacetsManager.check() throws exception.
- // TODO This try/catch will be unneccesary once WTP bug 137551 is fixed so that an OK Status
- // would not be returned when an exception is thrown.
- }
- }
-
-
- if (!facetsCanBeAdded)
- {
- fm.setMatch(false);
- }
- }
- else
- {
- //There are no facets to add.
- fm.setMatch(true);
- fm.setFacetsThatMatched(facetsThatMatched);
- fm.setFacetsToAdd(facetsToAdd);
- }
-
- return fm;
- }
-
- /**
- * Adds facet versions to the provided project if required based on checking provided
- * required facet versions against the facet versions already installed on project.
- *
- * @param project IProject which exists in the workspace
- * @param rfvs array of required facet versions.
- * @param monitor progress monitor
- * @return IStatus with severity IStatus.ERROR
- * <ul>
- * <li>if the project does not exist or</li>
- * <li>if the project is not open or</li>
- * <li>an attempt to add facet versions to the project resulted in an error.</li>
- * </ul>
- * Otherwise, returns an IStatus with severity IStatus.OK
- */
- public static IStatus addRequiredFacetsToProject(IProject project, RequiredFacetVersion[] rfvs, IProgressMonitor monitor)
- {
- IStatus status = Status.OK_STATUS;
-
- Set missingFacets = null;
- Set facetsToAdd = new HashSet();
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- if (fProject != null)
- {
- Set projectFacetVersions = fProject.getProjectFacets();
- FacetMatcher projectFacetMatcher = FacetUtils.match(rfvs, projectFacetVersions);
- if (projectFacetMatcher.isMatch())
- {
- missingFacets = projectFacetMatcher.getFacetsToAdd();
- if (missingFacets.size() > 0)
- {
- IRuntime fRuntime = null;
- fRuntime = FacetUtils.getFacetRuntimeForProject(project.getName());
- if (fRuntime != null)
- {
- //Add the highest version supported by the runtime the project is bound to.
- Iterator missingFacetsItr = missingFacets.iterator();
- while (missingFacetsItr.hasNext())
- {
- IProjectFacet facet = ((IProjectFacetVersion)missingFacetsItr.next()).getProjectFacet();
- //Get the highest level of this facet supported by the runtime.
- List versions = null;
- try {
- versions = facet.getSortedVersions(false);
- } catch (VersionFormatException e) {
- Set versionSet = facet.getVersions();
- Iterator itr = versionSet.iterator();
- versions = new ArrayList();
- while (itr.hasNext())
- {
- versions.add(itr.next());
- }
- } catch (CoreException e) {
- Set versionSet = facet.getVersions();
- Iterator itr = versionSet.iterator();
- versions = new ArrayList();
- while (itr.hasNext())
- {
- versions.add(itr.next());
- }
- }
-
- //Iterate over the versions in descending order and pick the
- //first one that fRuntime supports.
- Iterator versionsItr = versions.iterator();
- while(versionsItr.hasNext())
- {
- boolean match = false;
- IProjectFacetVersion pfv = (IProjectFacetVersion)versionsItr.next();
- Set pfvs = new HashSet();
- pfvs.add(pfv);
-
- //Check the required facets to see if this version of this facet is supported.
- for (int j=0; j<rfvs.length; j++)
- {
- RequiredFacetVersion rfv = rfvs[j];
- IProjectFacetVersion rpfv = rfv.getProjectFacetVersion();
- if (rpfv.getProjectFacet().getId().equals(pfv.getProjectFacet().getId()))
- {
- if (rpfv.getVersionString().equals(pfv.getVersionString()))
- {
- match = true;
- }
- else
- {
- if (rfv.getAllowNewer())
- {
- if (greaterThan(pfv.getVersionString(), rpfv.getVersionString()))
- {
- match = true;
- }
- }
- }
- }
- }
-
- if (match)
- {
- //Check against Runtime
- if (FacetUtils.doesRuntimeSupportFacets(fRuntime, pfvs))
- {
- //We have a match. Add this one to the master set.
- facetsToAdd.add(pfv);
- break;
- }
- }
- }
- }
- }
- else
- {
- facetsToAdd = missingFacets;
- }
-
- status = addFacetsToProject(fProject, facetsToAdd);
- }
- }
- }
- } catch (CoreException ce)
- {
- //Display an appropriate error message to the user.
- //A CoreException could have been thrown for any of the following three reasons
- //1. The project does not exist
- //2. The project is not open
- //3. There was a problem adding the facets to the project.
-
- if (!project.exists())
- {
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_DOES_NOT_EXIST, new String[] { project.getName()}));
- }
- else if (!project.isOpen())
- {
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_IS_NOT_OPEN, new String[] { project.getName()}));
- }
- else
- {
- status = getErrorStatusForAddingFacets(project.getName(), facetsToAdd, ce);
- }
- }
-
- return status;
- }
-
-
- /**
- * Adds the provided set of facet versions to the provided faceted project
- *
- * @param fproject A faceted project which exists in the workspace
- * @param projectFacetVersions A set containing elements of type {@link IProjectFacetVersion}
- * @return An IStatus with a severity of IStatus.OK if the facet
- * versions were added successfully. Otherwise, an IStatus with a severity of
- * IStatus.ERROR.
- */
- public static IStatus addFacetsToProject(final IFacetedProject fproject, final Set projectFacetVersions)
- {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
- final Set actions = getInstallActions(projectFacetVersions);
-
- // Create a runnable that applies the install actions to the faceted project
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
- {
- try
- {
- fproject.modify(actions, shellMonitor);
- } catch (CoreException e)
- {
- status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
- }
- }
- };
-
- // Run the runnable in another thread unless there is no UI thread (Ant scenarios)
- if (Display.getCurrent() != null)
- {
- try
- {
- PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
- } catch (InvocationTargetException ite)
- {
- status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, ite);
- } catch (InterruptedException ie)
- {
- status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, ie);
- }
- }
- else
- {
- try
- {
- fproject.modify(actions, null);
- } catch (CoreException e)
- {
- status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
- }
- }
-
- return status[0];
- }
-
- /**
- * Returns an error status indicating that the facet versions could not be
- * added to the faceted project
- *
- * @param projectName a project name to insert in the error message in the IStatus
- * @param projectFacetVersions a set containing elements of type {@link IProjectFacetVersion}.
- * The facets in this set will be listed in the error message in the IStatus.
- * @param t a Throwable which will be inserted in the IStatus
- * @return an IStatus with severity IStatus.ERROR
- */
- private static IStatus getErrorStatusForAddingFacets(String projectName, Set projectFacetVersions, Throwable t)
- {
- IStatus status = Status.OK_STATUS;
- int size = projectFacetVersions.size();
- if (size > 0)
- {
- Set facets = new HashSet();
- //Iterate over projectFacetVersions to form a set of IProjectFacets
- Iterator itr = projectFacetVersions.iterator();
- while (itr.hasNext())
- {
- IProjectFacetVersion projectFacet = (IProjectFacetVersion)itr.next();
- IProjectFacet facet = projectFacet.getProjectFacet();
- facets.add(facet);
- }
- String facetList = getFacetListMessageString(facets);
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_ADDING_FACETS_TO_PROJECT, new String[] { projectName, facetList}), t);
- }
-
- return status;
- }
-
- /**
- * Creates a new faceted project with the provided name
- *
- * @param projectName A String containing the name of the project to be created
- * @return An IStatus with a severity of IStatus.OK if the faceted project
- * was created successfully or if a project of the provided name already
- * exists in the workspace. Otherwise, an IStatus with severity of
- * IStatus.ERROR.
- */
- public static IStatus createNewFacetedProject(final String projectName)
- {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
- IProject project = ProjectUtilities.getProject(projectName);
- if (!project.exists())
- {
- // Create a runnable that creates a new faceted project.
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
- {
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(projectName, null, shellMonitor);
- if (fProject == null)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
- }
- } catch (CoreException e)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), e);
- }
- }
- };
-
- // Run the runnable in another thread unless there is no UI thread (Ant scenarios)
- try
- {
- if (Display.getCurrent() != null)
- {
- PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
- }
- else
- {
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(projectName, null, null);
- if (fProject == null)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
- }
- } catch (CoreException e)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), e);
- }
- }
- } catch (InvocationTargetException ite)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), ite);
- } catch (InterruptedException ie)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), ie);
- }
- }
-
- return status[0];
- }
-
- /**
- * Sets the provided set of facets as fixed on the faceted project
- *
- * @param fProject A faceted project which exists in the workspace
- * @param fixedFacets A set containing elements of type {@link IProjectFacet}
- * @return An IStatus with a severity of IStatus.OK if the facets
- * were successfully set as fixed facets on the faceted project.
- * Otherwise, an IStatus with a severity of IStatus.ERROR.
- *
- * @see IFacetedProject#setFixedProjectFacets
- */
- public static IStatus setFixedFacetsOnProject(final IFacetedProject fProject, final Set fixedFacets)
- {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
-
- //Create a runnable that sets the fixed facets on the faceted project
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
- {
- try
- {
- fProject.setFixedProjectFacets(fixedFacets);
- } catch (CoreException e)
- {
- status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, e);
- }
- }
- };
-
- // Run the runnable in another thread unless there is no UI thread (Ant scenarios)
- if (Display.getCurrent() != null)
- {
- try
- {
- PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
- } catch (InvocationTargetException ite)
- {
- status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, ite);
- } catch (InterruptedException ie)
- {
- status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, ie);
- }
- }
- else
- {
- try
- {
- fProject.setFixedProjectFacets(fixedFacets);
- } catch (CoreException e)
- {
- status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, e);
- }
- }
-
- return status[0];
- }
-
- /**
- * Returns an error status indicating that the facets could not be
- * set as fixed facets on the faceted project
- *
- * @param projectName a project name to insert in the error message in the IStatus
- * @param facets a set containing elements of type {@link IProjectFacet}.
- * The facets in this set will be listed in the error message in the IStatus.
- * @param t a Throwable which will be inserted in the IStatus
- * @return an IStatus with severity IStatus.ERROR
- */
- private static IStatus getErrorStatusForSettingFixedFacets(String projectName, Set facets, Throwable t)
- {
- IStatus status = Status.OK_STATUS;
- int size = facets.size();
- if (size > 0)
- {
- String facetList = getFacetListMessageString(facets);
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_FIXED_FACETS, new String[] { projectName, facetList}), t);
- }
-
- return status;
- }
-
-
- /**
- * Binds the faceted project to the facet runtime
- *
- * @param fProject A faceted project which exists in the workspace
- * @param fRuntime A facet runtime
- * @return An IStatus with a severity of IStatus.OK if the faceted project
- * was bound to the facet runtime successfully. Otherwise, an IStatus with severity of
- * IStatus.ERROR.
- */
- public static IStatus setFacetRuntimeOnProject(final IFacetedProject fProject, final IRuntime fRuntime)
- {
- final IStatus[] status = new IStatus[1];
- status[0] = Status.OK_STATUS;
-
- //Create a runnable that sets the facet runtime on the faceted project
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
- {
- try
- {
- fProject.setTargetedRuntimes(Collections.singleton(fRuntime), shellMonitor);
- } catch (CoreException e)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), e);
- }
- }
- };
-
- // Run the runnable in another thread unless there is no UI thread (Ant scenarios)
- if (Display.getCurrent() != null)
- {
- try
- {
- PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
- } catch (InvocationTargetException ite)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), ite);
- } catch (InterruptedException ie)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), ie);
- }
- }
- else
- {
- try
- {
- fProject.setTargetedRuntimes(Collections.singleton(fRuntime), null); //jvh - happens here...
- } catch (CoreException e)
- {
- status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), e);
- }
- }
-
-
- return status[0];
- }
-
- /**
- * Returns a translatable delimited list of facet labels derived from the provided
- * set of facets
- *
- * @param facets a set containing elements of type {@link IProjectFacet}
- * @return String a delimited list of facet labels
- */
- private static String getFacetListMessageString(Set facets)
- {
- String facetListMessage = "";
- int size = facets.size();
- if (size > 0)
- {
- Iterator itr = facets.iterator();
- IProjectFacet firstProjectFacet = (IProjectFacet)itr.next();
- facetListMessage = firstProjectFacet.getLabel();
-
- //Continue appending to facetListMessage until all the facet labels
- //are in the list.
- while (itr.hasNext())
- {
- IProjectFacet projectFacet = (IProjectFacet)itr.next();
- String pfLabel = projectFacet.getLabel();
- facetListMessage = NLS.bind(ConsumptionMessages.MSG_FACETS, new String[] {facetListMessage, pfLabel});
- }
- }
-
- return facetListMessage;
- }
-
-
- /**
- * Returns the set of facet versions which can be inferred from the provided Java project
- *
- * @param javaProject a Java project that exists in the workspace. Must not be null.
- * @return Set containing elements of type {@link IProjectFacetVersion}
- */
- public static Set getFacetsForJavaProject(IJavaProject javaProject)
- {
- Set facets = new HashSet();
- String jdkComplianceLevel = null;
- if (javaProject!=null)
- {
- jdkComplianceLevel = javaProject.getOption("org.eclipse.jdt.core.compiler.compliance", false);
- if (jdkComplianceLevel == null)
- {
- jdkComplianceLevel = JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE);
- if (jdkComplianceLevel == null)
- {
- jdkComplianceLevel = "1.4";
- }
- }
- }
-
- IProjectFacet javaFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_JAVA);
- IProjectFacetVersion javaFacetVersion = null;
- if (jdkComplianceLevel.equals("1.3"))
- {
- javaFacetVersion = javaFacet.getVersion("1.3");
- }
- else if (jdkComplianceLevel.equals("1.4"))
- {
- javaFacetVersion = javaFacet.getVersion("1.4");
- }
- else if (jdkComplianceLevel.equals("1.5"))
- {
- javaFacetVersion = javaFacet.getVersion("5.0");
- }
- else if (jdkComplianceLevel.equals("1.6"))
- {
- javaFacetVersion = javaFacet.getVersion("6.0");
- }
- else
- {
- javaFacetVersion = javaFacet.getVersion("1.4");
- }
-
- facets.add(javaFacetVersion);
- IProjectFacet utilityFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_UTILITY_MODULE);
- IProjectFacetVersion utilityFacetVersion = null;
- try
- {
- utilityFacetVersion = utilityFacet.getLatestVersion();
- }
- catch (CoreException ce)
- {
-
- }
- if (utilityFacetVersion != null)
- {
- facets.add(utilityFacetVersion);
- }
- return facets;
- }
-
-
- //Methods related to facet runtimes.
-
- /**
- * Returns a set of facet runtimes that support the given
- * required facet versions.
- * @param requiredFacetVersions an array containing elements of type {@link RequiredFacetVersion}
- * @return Set set of facet runtimes that support the given required facet versions.
- * (element type: {@link IRuntime})
- */
- public static Set getRuntimes(RequiredFacetVersion[] requiredFacetVersions)
- {
- //Form the sets of IProjectFacetVersions these RequiredFacetVersions represent.
- ArrayList listOfFacetSets = new ArrayList();
-
- HashSet facets = new HashSet();
- int javaFacetIndex = -1;
- for (int i=0; i<requiredFacetVersions.length; i++)
- {
- IProjectFacetVersion pfv = requiredFacetVersions[i].getProjectFacetVersion();
- if (FacetUtils.isJavaFacet(pfv.getProjectFacet()))
- {
- //Remember the index
- javaFacetIndex = i;
- }
- facets.add(requiredFacetVersions[i].getProjectFacetVersion());
- }
-
- listOfFacetSets.add(facets);
-
- //If the java facet was one of the facets in the set, and new versions of java are allowed,
- //create sets that contain the newer permitted versions of the java facets.
- if (javaFacetIndex > -1)
- {
- ArrayList permittedJavaVersions = new ArrayList();
- RequiredFacetVersion rfv = requiredFacetVersions[javaFacetIndex];
- if (rfv.getAllowNewer())
- {
- String version = rfv.getProjectFacetVersion().getVersionString();
- Set allVersions = rfv.getProjectFacetVersion().getProjectFacet().getVersions();
- Iterator itr = allVersions.iterator();
- while (itr.hasNext())
- {
- IProjectFacetVersion thisPfv = (IProjectFacetVersion)itr.next();
- String thisVersion = thisPfv.getVersionString();
- if (greaterThan(thisVersion, version))
- {
- permittedJavaVersions.add(thisVersion);
- }
- }
-
- String[] javaVersions = (String[])permittedJavaVersions.toArray(new String[0]);
-
- for (int j=0; j<javaVersions.length; j++)
- {
- HashSet thisFacetSet = new HashSet();
-
- for (int k=0; k<requiredFacetVersions.length; k++)
- {
- if (k==javaFacetIndex)
- {
- IProjectFacetVersion pfv = requiredFacetVersions[k].getProjectFacetVersion().getProjectFacet().getVersion(javaVersions[j]);
- thisFacetSet.add(pfv);
- }
- else
- {
- IProjectFacetVersion pfv = requiredFacetVersions[k].getProjectFacetVersion();
- thisFacetSet.add(pfv);
- }
- }
-
- listOfFacetSets.add(thisFacetSet);
- }
- }
- }
-
- //Return the union of runtimes for all the facetSets.
- return getRuntimes((Set[])listOfFacetSets.toArray(new Set[0]));
-
- }
-
- /**
- * Returns whether or not the provided facet runtime supports the provided
- * required facet versions.
- *
- * @param requiredFacetVersions an array containing elements of type {@link RequiredFacetVersion}
- * @param fRuntimeName name of a {@link IRuntime}
- * @return boolean <code>true</code> if the facet runtime supports the required facet versions.
- * Returns <code>false</code> otherwise.
- */
- public static boolean isFacetRuntimeSupported(RequiredFacetVersion[] requiredFacetVersions, String fRuntimeName)
- {
- Set fRuntimes = getRuntimes(requiredFacetVersions);
- Iterator itr = fRuntimes.iterator();
- while (itr.hasNext())
- {
- IRuntime runtime = (IRuntime)itr.next();
- if (runtime.getName().equals(fRuntimeName))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns the union of facet runtimes that support the provided sets of facet versions.
- *
- * @param facetSets array of Sets, where each Set contains elements of type {@link IProjectFacetVersion}.
- * @return Set containing elements of type {@link IRuntime}
- */
- public static Set getRuntimes(Set[] facetSets)
- {
- HashSet unionSet = new HashSet();
- for (int i=0; i<facetSets.length; i++)
- {
- Set facets = facetSets[i];
- Set runtimes = RuntimeManager.getRuntimes(facets);
- Iterator itr = runtimes.iterator();
- while (itr.hasNext())
- {
- IRuntime runtime = (IRuntime)itr.next();
- if (!unionSet.contains(runtime))
- {
- unionSet.add(runtime);
- }
- }
- }
- return unionSet;
- }
-
- /**
- * Returns whether or not the provided facet runtime supports the provided set of facet versions.
- *
- * @param facetRuntime a facet runtime
- * @param projectFacetVersions set containing elements of type {@link IProjectFacetVersion}
- * @return boolean <code>true</code> if the facet runtime supports the provided set of facet versions.
- * Returns <code>false</code> otherwise.
- */
- public static boolean doesRuntimeSupportFacets(IRuntime facetRuntime, Set projectFacetVersions)
- {
- Set runtimes = RuntimeManager.getRuntimes(projectFacetVersions);
- Iterator itr = runtimes.iterator();
- while (itr.hasNext())
- {
- IRuntime runtime = (IRuntime)itr.next();
- if (runtime.getName().equals(facetRuntime.getName()))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns whether versionA is greater than versionB
- *
- * @param versionA version number of the form 1.2.3
- * @param versionA version number of the form 1.2.3
- * @return boolean <code>true</code> if versionA is greater than versionB, <code>false</code> otherwise.
- */
- public static boolean greaterThan(String versionA, String versionB)
- {
- StringTokenizer stA = new StringTokenizer(versionA, ".");
- StringTokenizer stB = new StringTokenizer(versionB, ".");
-
- int sizeA = stA.countTokens();
- int sizeB = stB.countTokens();
-
- int size;
- if (sizeA < sizeB)
- {
- size = sizeA;
- }
- else
- size = sizeB;
-
- for (int i=0; i<size; i++)
- {
- int a = Integer.parseInt(stA.nextToken());
- int b = Integer.parseInt(stB.nextToken());
- if (a!=b)
- {
- return a > b;
- }
- }
-
- return sizeA > sizeB;
- }
-
- /**
- * Returns whether the provided facet has an id of "jst.java"
- * @param pf facet
- * @return <code>true</code> if facet has an id of "jst.java", <code>false</code> otherwise.
- */
- public static boolean isJavaFacet(IProjectFacet pf)
- {
- if (pf.getId().equals("jst.java"))
- return true;
- else
- return false;
- }
-
- /**
- * Returns whether or not the provided project is a faceted Java utility project or a non-faceted Java project.
- *
- * @param project an IProject
- * @return boolean <code>true</code> if the provided project is a faceted Java utility project
- * or a non-faceted Java project, <code>false</code> otherwise.
- */
- public static boolean isJavaProject(IProject project)
- {
- //Check if it's a faceted project
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- if (fProject != null)
- {
- //Return true if it's a utility project
- if (J2EEUtils.isJavaComponent(project))
- {
- return true;
- }
- else
- {
- //See if the java facet is the only one it has.
- Set facets = fProject.getProjectFacets();
- if (facets.size()==1)
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)facets.iterator().next();
- if (isJavaFacet(pfv.getProjectFacet()))
- {
- return true;
- }
- }
- }
- }
- else
- {
- if (ResourceUtils.isJavaProject(project))
- {
- return true;
- }
- }
- } catch (CoreException ce)
- {
-
- }
-
- return false;
- }
-
- /**
- * Returns whether or not the provided template id is equal to "template.jst.utility"
- *
- * @param templateId template id
- * @return boolean <code>true</code> if the provided template id is equal to "template.jst.utility",
- * <code>false</code> otherwise.
- */
- public static boolean isUtilityTemplate(String templateId)
- {
- if (ProjectFacetsManager.isTemplateDefined(templateId))
- {
- if (templateId.equals("template.jst.utility"))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Returns the required facet version of a EAR that should contain the given project.
- *
- * @param project The project
- * @return An array of required facet versions. If no constraints can be inferred from the
- * project, an empty array is returned.
- */
- public static RequiredFacetVersion[] getRequiredEARFacetVersions(IProject project) {
-
- int version = 0;
-
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
-
- version = J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(
- J2EEProjectUtilities.getJ2EEProjectVersion(project));
- }
- else if (JavaEEProjectUtilities.isEJBProject(project)) {
-
- version = J2EEVersionUtil.convertEJBVersionStringToJ2EEVersionID(
- J2EEProjectUtilities.getJ2EEProjectVersion(project));
- }
- else if (JavaEEProjectUtilities.isApplicationClientProject(project)) {
-
- version = J2EEVersionUtil.convertAppClientVersionStringToJ2EEVersionID(
- J2EEProjectUtilities.getJ2EEProjectVersion(project));
- }
- else
- // return empty array, no constraints
- return new RequiredFacetVersion[0];
-
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion projectFacetVersion = projectFacet.getVersion(J2EEVersionUtil.convertVersionIntToString(version));
-
- RequiredFacetVersion[] rfv = new RequiredFacetVersion[1];
- rfv[0] = new RequiredFacetVersion();
- rfv[0].setAllowNewer(false);
- rfv[0].setProjectFacetVersion(projectFacetVersion);
-
- return rfv;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
deleted file mode 100644
index cbec831f4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of Filter that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class FolderResourceFilter extends AnyFilter
-{
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" and "<code>.class</code>" objects.
- * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
- */
- public FolderResourceFilter () { }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return ConsumptionMessages.FOLDER_FILTER_NAME;
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return ConsumptionMessages.FOLDER_FILTER_DESC;
- }
-
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT,
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FOLDER)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FOLDER,new Object[] {name}),
- null
- );
- }
- }
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
deleted file mode 100644
index fc1f1d910..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-
-
-/**
- * Implement this interface to provide logic that can be plugged into
- * the server defaulting algorithm.
- * (See the org.eclipse.jst.ws.consumption.serverDefaulter extension point)
- */
-public interface IServerDefaulter
-{
-
- /**
- * @param project
- * @return ServerInfo.
- * If no existing server or server type is recommended, return null.
- * If a server type is recommended, return an instance of ServerInfo with a non-null
- * non-empty String for the serverFactoryId and null for the serverInstanceId.
- * If a server instance is recommended, return an instance of ServerInfo with a non-null
- * non-empty String for the serverFactoryId and the serverInstanceId.
- */
- public ServerInfo recommendDefaultServer(IProject project);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaMerger.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaMerger.java
deleted file mode 100644
index 941f2c174..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaMerger.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070509 182274 kathy@ca.ibm.com - Kathy Chan
- * 20080122 215048 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.codegen.merge.java.JControlModel;
-import org.eclipse.emf.codegen.merge.java.JMerger;
-import org.eclipse.emf.codegen.merge.java.facade.FacadeHelper;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentMergeContext;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-import org.eclipse.wst.ws.internal.wsrt.Merger;
-import org.osgi.framework.Bundle;
-
-/*
- * JavaMerger handles the merging of workspace files using JMerger. If the URIs specified is not a file
- * in the workspace, it will be ignored.
- */
-public class JavaMerger extends Merger implements IMerger {
-
- private static final String WST_WS = "org.eclipse.wst.ws";
- private static final String MERGE_XML = "merge.xml";
- private static final String JMERGER = "jmerger";
-
- private int size = 0;
- private IFile[] workspaceFiles;
- private JMerger[] mergeModels;
- private JControlModel jMergeControlModel = null;
- private IStatus loadStatus;
-
-
- /*
- * Convert the URI strings in the uris array to Eclipse IFiles and store in the workspaceFiles array.
- * Load the workspaceFiles into JMerger and store in the mergerModels array.
- * If the merger model cannot be obtained, null is stored in the mergerModels.
- * @see org.eclipse.wst.ws.internal.wsrt.IMerger#load(java.lang.String[])
- */
-
- public IStatus load(IFile[] files) {
-
- loadStatus = Status.OK_STATUS;
- if (files != null) {
- workspaceFiles = files;
- PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
- if (mergeContext.isSkeletonMergeEnabled()) {
- // initialize JMerger
- initialize();
-
- if (jMergeControlModel != null) {
- // JMerger initialized properly
- size = files.length;
- mergeModels = new JMerger[size];
-
- for (int i = 0; i < size; i++) {
- JMerger jMerger = null;
- IFile file = null;
- InputStream inStream = null;
-
- file = files[i];
- if (file != null && file.exists()) {
- try {
- inStream = file.getContents();
- if (inStream != null) {
- jMerger = new JMerger(jMergeControlModel);
- jMerger.setTargetCompilationUnit(jMerger.createCompilationUnitForInputStream(inStream));
- }
- } catch (CoreException e) {
- loadStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_FILE_MERGE_LOAD, file), e);
- } finally {
- if (inStream != null) {
- try {
- inStream.close();
- } catch (IOException e) {
- // ignore exceptions in closing file
- }
- }
- }
- }
- mergeModels[i] = jMerger;
- }
- }
- }
- }
- return loadStatus;
- }
-
- /**
- * Initializes the JMerge model
- * File merge.xml in WebServicePlugin contains the rules for the merge.
- * If the merge.xml file is not found, jMergeControlModel is leave as null.
- */
- private void initialize() {
- if (jMergeControlModel == null) {
- FacadeHelper facadeHelper = CodeGenUtil.instantiateFacadeHelper(JMerger.DEFAULT_FACADE_HELPER_CLASS);
- jMergeControlModel = new JControlModel();
-
- Bundle wsBundle = Platform.getBundle(WST_WS);
- IPath mergePath = new Path( JMERGER ).append( MERGE_XML );
- URL fileURL = FileLocator.find( wsBundle, mergePath, null);
- jMergeControlModel.initialize(facadeHelper, fileURL.toString());
- }
- return;
- }
-
- /**
- * Merge the current contents of the workspaceFiles with the mergeModels that had been stored earlier.
- * Then write the merged contents back to the file.
- * @param monitor
- * @param statusHandler
- * @return IStatus
- */
- public IStatus merge(IProgressMonitor monitor, IStatusHandler statusHandler) {
-
- IStatus status = Status.OK_STATUS;
-
- if (loadStatus != null && loadStatus.getSeverity() == IStatus.ERROR) {
- return loadStatus;
- }
-
- PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
- if (mergeContext.isSkeletonMergeEnabled()) {
- ResourceContext resourceContext = WebServicePlugin.getInstance().getResourceContext();
- for (int i = 0; i < size; i++) {
- String mergedContent = null;
- JMerger jMerger = null;
- IFile file = null;
- InputStream inStream = null;
- byte[] buf = null;
-
- jMerger = mergeModels[i];
- file = workspaceFiles[i];
- if (file != null && jMerger != null && file.exists()) {
- // a JMerger model of the file exists, merge the contents
- try {
- inStream = file.getContents();
- jMerger.setSourceCompilationUnit(jMerger.createCompilationUnitForInputStream(inStream));
- jMerger.merge();
- mergedContent = jMerger.getTargetCompilationUnitContents();
- if (mergedContent != null) {
- try {
- buf = mergedContent.getBytes(file.getCharset());
- } catch (UnsupportedEncodingException e) {
- buf = mergedContent.getBytes();
- }
- inStream = new ByteArrayInputStream(buf);
- IPath targetPath = file.getLocation();
- if (targetPath != null) {
- FileResourceUtils.createFileAtLocation(resourceContext, targetPath.makeAbsolute(), inStream,
- monitor, statusHandler);
- }
- }
- } catch (CoreException e) {
- status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_FILE_MERGE, file), e);
- } finally {
- try {
- if (inStream != null) {
- inStream.close();
- }
- } catch (IOException e) {
- // ignore exceptions in closing file
- }
- }
- }
- }
-
- }
- return status;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
deleted file mode 100644
index a84da237c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of Filter that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class JavaResourceFilter extends AnyFilter
-{
-
- /**
- * A <code>JavaResourceFilter</code> constructed with this value will
- * accept "<code>.java</code>", but not "<code>.class</code>", objects.
- */
- public static final byte JAVA_FILES = (byte)1;
-
- /**
- * A <code>JavaResourceFilter</code> constructed with this value will
- * accept "<code>.class</code>", but not "<code>.java</code>", objects.
- */
- public static final byte CLASS_FILES = (byte)2;
-
- /**
- * A <code>JavaResourceFilter</code> constructed with this value will
- * accept both "<code>.java</code>" and "<code>.class</code>" objects.
- */
- public static final byte ALL_FILES = (byte)255;
-
- private byte extensions_;
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" and "<code>.class</code>" objects.
- * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
- */
- public JavaResourceFilter ()
- {
- this(ALL_FILES);
- }
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" objects, "<code>.class</code>" objects,
- * or both if the value of <code>extensions</code> is
- * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}
- * respectively.
- * @param extensions One of
- * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}.
- */
- public JavaResourceFilter ( byte extensions )
- {
- extensions_ = extensions;
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return ConsumptionMessages.JAVA_FILTER_NAME;
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return ConsumptionMessages.JAVA_FILTER_DESC;
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * indicating whether or not if the given <code>object</code>
- * represents a Java resource.
- */
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT,
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FILE)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FILE,new Object[] {name}),
- null
- );
- }
- }
-
- if (name == null)
- {
- name = object.toString();
- }
-
- if (!acceptsName(name))
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION,new Object[] {name}),
- null
- );
- }
-
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-
- //
- // Checks if the given name is acceptable based upon its extension
- // and the value of the extensions_ bitmask.
- //
- private boolean acceptsName ( String name )
- {
- return (
- (name.endsWith(".java") && ((extensions_ & JAVA_FILES) != 0)) ||
- (name.endsWith(".class") && ((extensions_ & CLASS_FILES) != 0))
- );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
deleted file mode 100644
index 13648de03..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-
-
-/**
-* This class contains useful methods for working with Server plugin functions
-*/
-public final class MappingUtils
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private static final String DEFAULT_SERVICE_EXT = "Service.wsdl";
- private static final String DEFAULT_BINDING_EXT = "Binding.wsdl";
- private static final String DEFAULT_V4_SERVICE_EXT = "-service.wsdl";
- private static final String DEFAULT_V4_BINDING_EXT = "-binding.wsdl";
- private static final String WSDL_EXTENSION = ".wsdl";
- private static final String WSDL_FOLDER = "wsdl";
- public static final String DEFAULT_SKELETON_PACKAGENAME = "service";
-
- /**
- * Returns the WSDL folder path
- * @param project the project
- */
- public static IPath getWSDLFolderPath (IProject project, String componentName)
- {
- IPath wsdlFolder=null;
-// IPath webModuleServerRoot = ResourceUtils.getWebModuleServerRoot( project ).getFullPath();
- IPath webModuleServerRoot = J2EEUtils.getWebContentPath(project);
- if (webModuleServerRoot != null )
- wsdlFolder = webModuleServerRoot.append(WSDL_FOLDER);
- return wsdlFolder;
- }
-
-
- /**
- * Returns the base name based on WSDL file name
- * @param wsdlName WSDL file name
- */
- public static String getBaseName (String wsdlLocation )
- {
- String wsdlName=wsdlLocation;
-
- int index = wsdlLocation.lastIndexOf('/');
- if (index!= -1) {
- wsdlName = wsdlLocation.substring(index+1,wsdlName.length());
- }
-
- String baseName=wsdlName;
- if ( wsdlName.endsWith(DEFAULT_SERVICE_EXT) ) {
- baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_SERVICE_EXT.length()));
- } else if ( wsdlName.toLowerCase().endsWith(DEFAULT_V4_SERVICE_EXT) ) {
- baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_V4_SERVICE_EXT.length()));
- } else if (wsdlName.endsWith(DEFAULT_BINDING_EXT)) {
- baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_BINDING_EXT.length()));
- } else if (wsdlName.toLowerCase().endsWith(DEFAULT_V4_BINDING_EXT)) {
- baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_V4_BINDING_EXT.length()));
- } else if (wsdlName.toLowerCase().endsWith(WSDL_EXTENSION)) {
- baseName = wsdlName.substring(0,(wsdlName.length() - WSDL_EXTENSION.length()));
- } else {
- // no recognizable suffix, just remove extension, if any
- int index4 = baseName.lastIndexOf('.');
- if (index4!=-1)
- baseName = baseName.substring(0, index4);
- }
- return baseName;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
deleted file mode 100644
index bd679f19f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of Filter that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class PropertiesResourceFilter extends AnyFilter
-{
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" and "<code>.class</code>" objects.
- * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
- */
- public PropertiesResourceFilter ()
- {
-
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return ConsumptionMessages.PROPERTIES_FILTER_NAME;
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return ConsumptionMessages.PROPERTIES_FILTER_DESC;
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * indicating whether or not if the given <code>object</code>
- * represents a Java resource.
- */
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT,
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FILE)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FILE,new Object[] {name}),
- null
- );
- }
- }
-
- if (name == null)
- {
- name = object.toString();
- }
-
- if (!name.endsWith(".properties"))
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION,new Object[] {name}),
- null
- );
- }
-
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java
deleted file mode 100644
index 08d2aa9ba..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class RequiredFacetVersion
-{
- private IProjectFacetVersion projectFacetVersion;
- private boolean allowNewer;
- private IProjectFacetVersion[] allowedProjectFacetVersions;
-
- public boolean getAllowNewer()
- {
- return allowNewer;
- }
- public void setAllowNewer(boolean allowNewer)
- {
- this.allowNewer = allowNewer;
- }
- public IProjectFacetVersion getProjectFacetVersion()
- {
- return projectFacetVersion;
- }
- public void setProjectFacetVersion(IProjectFacetVersion projectFacetVersion)
- {
- this.projectFacetVersion = projectFacetVersion;
- }
- public IProjectFacetVersion[] getAllowedProjectFacetVersions()
- {
- if (allowedProjectFacetVersions == null)
- {
- ArrayList versions = new ArrayList();
- IProjectFacetVersion minpfv = getProjectFacetVersion();
- versions.add(minpfv);
- //If allow-newer is true, add all the versions greater than the min version.
- if (getAllowNewer())
- {
- String minVersion = minpfv.getVersionString();
- Iterator allVersionsItr = minpfv.getProjectFacet().getVersions().iterator();
- while (allVersionsItr.hasNext())
- {
- IProjectFacetVersion testpfv = (IProjectFacetVersion)allVersionsItr.next();
- String testVersion = testpfv.getVersionString();
- if (FacetUtils.greaterThan(testVersion, minVersion))
- {
- versions.add(testpfv);
- }
- }
- }
-
- allowedProjectFacetVersions = (IProjectFacetVersion[])versions.toArray(new IProjectFacetVersion[0]);
- }
-
- return allowedProjectFacetVersions;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
deleted file mode 100644
index 0625cb2e3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.common;
-
-/**
- *
- */
-public class ServerInfo
-{
- String serverFactoryId;
- String serverInstanceId;
- /**
- * @return Returns the serverFactoryId.
- */
- public String getServerFactoryId()
- {
- return serverFactoryId;
- }
- /**
- * @param serverFactoryId The serverFactoryId to set.
- */
- public void setServerFactoryId(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
- /**
- * @return Returns the serverInstanceId.
- */
- public String getServerInstanceId()
- {
- return serverInstanceId;
- }
- /**
- * @param serverInstanceId The serverInstanceId to set.
- */
- public void setServerInstanceId(String serverInstanceId)
- {
- this.serverInstanceId = serverInstanceId;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java
deleted file mode 100644
index a6dd1815a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- * The factory class can be used to get at a single instance of the
- * WSDL parser. Note: This class is temporary. We will probably come
- * up with a better method of handling passing around the parser.
- *
- */
-//TODO We need to find a better way to pass around the parser than
-// using this singleton factory. Hopefully, we can then delete
-// this class.
-public class WSDLParserFactory
-{
- private static WebServicesParserExt parser_;
-
- private WSDLParserFactory()
- {
- }
-
- public static WebServicesParser getWSDLParser()
- {
- if( parser_ == null )
- {
- parser_ = new WebServicesParserExt();
- }
-
- return parser_;
- }
-
- public static void killParser()
- {
- parser_ = null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
deleted file mode 100644
index 33d372608..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
-* This is a kind of Filter that accepts only objects
-* which indicate a WSDL resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.wsdl</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class WSDLResourceFilter extends AnyFilter
-{
- /**
- * Constructs a new <code>WSDLResourceFilter</code>.
- */
- public WSDLResourceFilter ()
- {
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return ConsumptionMessages.WSDL_FILTER_NAME;
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return ConsumptionMessages.WSDL_FILTER_DESC;
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * indicating whether or not if the given <code>object</code>
- * represents a WSDL resource.
- */
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT,
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FILE)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FILE,new Object[] {name}),
- null
- );
- }
- }
-
- if (name == null)
- {
- name = object.toString();
- }
-
- if (!name.endsWith(".wsdl"))
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- NLS.bind(ConsumptionMessages.WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION,new Object[] {name}),
- null
- );
- }
-
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java
deleted file mode 100644
index 8b05856fa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-
-
-
-/**
-* This is the registry of WebServiceStartServerType objects.
-*/
-public class WebServiceStartServerRegistry
-{
-
- private static WebServiceStartServerRegistry instance_;
- private Hashtable StartServerTypes;
-
- //
- // Loads WebServiceStartServerType objects into this registry.
- // See method getInstance().
- //
- private void load ()
- {
- StartServerTypes = new Hashtable();
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption",
- "webServiceStartServerType");
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- try
- {
- String factoryId_ = elem.getAttribute("factoryId");
- StartServerTypes.put(factoryId_, elem);
-
- }
- catch (Exception e)
- {
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.ERROR, 5047, this, "load", e);
- }
-
- }
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceStartServerRegistry object.
- */
- public static WebServiceStartServerRegistry getInstance ()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceStartServerRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- public Object getServerStartByTypeId (String typeID) throws CoreException
- {
- if (typeID==null)
- return null;
- return ((IConfigurationElement)StartServerTypes.get(typeID)).createExecutableExtension("class");
- }
-
- public boolean isRemoveEARRequired(String typeId) throws CoreException {
- if (typeId!=null) {
- IConfigurationElement elem = (IConfigurationElement)StartServerTypes.get(typeId);
- if (elem!=null){
- String value = elem.getAttribute("removeEAR");
- if (value!=null){
- return Boolean.valueOf(value).booleanValue();
- }
- }
- }
- return true;
- }
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
deleted file mode 100644
index 03db95442..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* Objects of this class represent a Java bean.
-* Nearest moral equivalents: java.lang.Class, java.beans.BeanDescriptor.
-*/
-public class ArrayElement extends TypeElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static String ARRAY_NAME = "10101010array10101010";
- public static String REL_METHODS = "relmethods";
-
- /**
- * Constructor
- * @param projectElement The project this Bean belongs to.
- */
- public ArrayElement (String name)
- {
- this(name,new BasicModel("Project"),true);
- }
-
- /**
- * Constructor
- * @param parameterElement The parameter this Bean belongs to.
- */
- public ArrayElement (String name, Model model,boolean isRoot)
- {
- super(name,model,TypeElement.ARRAY);
- if(isRoot) model.setRootElement(this);
- fOwnerType = TypeElement.ROOT;
- }
-
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the bean element.
- */
- public ArrayElement ( ParameterElement parameterElement, String name)
- {
- super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
- fOwnerType = TypeElement.PARAMETER_OWNER;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public ArrayElement ( AttributeElement attributeElement, String name)
- {
- super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
- fOwnerType = TypeElement.ATTRIBUTE_OWNER;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param FieldElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public ArrayElement ( FieldElement fieldElement, String name)
- {
- super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
- fOwnerType = TypeElement.FIELD_OWNER;
- }
-
-
- /*
- * determine wether this is an object array or
- * primitive array
- */
- public String getTypeName()
- {
- return ARRAY_NAME + getName();
- }
-
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
deleted file mode 100644
index a125104e3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071122 210692 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class ArrayType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public ArrayType(String typeName)
- {
- this(TypeFactory.ARRAY_NAME,typeName);
- }
-
- public ArrayType(String name,String typeName)
- {
- super(name);
- }
-
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
-
- String nonBean = Generator.DOUBLE_TAB + "String temp"+ getUniqueName() + " = null;" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "if(" + name + " != null){" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "java.util.List list" + getUniqueName() + "= java.util.Arrays.asList(" + name + ");" +StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "temp"+ getUniqueName() +" = list" + getUniqueName() + ".toString();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
- return nonBean;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java
deleted file mode 100644
index 137cf7196..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class AttributeElement extends BasicElement implements AttributeElementType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String REL_TYPE = "type";
- public static final String REL_OWNING_BEAN = "owningbean";
-
- private String fSetterMethod;
- private String fGetterMethod;
-
- /**
- * Constructor this takes the owning bean.
- * @param name The name of the attribute.
- * @param beanElement the bean that owns this attribute.
- */
- public AttributeElement ( BeanElement beanElement, String name)
- {
- super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_ATTRIBUTES);
- }
-
- public void setSetterMethod(String setterMethod)
- {
- fSetterMethod = setterMethod;
- }
-
- public String getSetterMethod()
- {
- return fSetterMethod;
- }
-
- public String getGetterMethod()
- {
- return fGetterMethod;
- }
-
- public void setGetterMethod(String getterMethod)
- {
- fGetterMethod = getterMethod;
- }
-
- public String getSetterSignature(String attribute)
- {
- int bracket = fSetterMethod.indexOf("(");
- bracket++;
- String setter = fSetterMethod.substring(0,bracket);
- String fullSetter = setter + attribute + ");";
-
- return fullSetter;
- }
-
- /**
- * Returns the Bean that owns this Attribute.
- * @return BeanElement The bean that owns this attribute.
- */
- public BeanElement getOwningBeanElement ()
- {
- Enumeration e = getElements(REL_OWNING_BEAN);
- return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
- }
-
- /**
- * Returns the type that is owned by this attributte.
- * @return TypeElement The Type that of this attribute.
- */
- public TypeElement getTypeElement ()
- {
- Enumeration e = getElements(REL_TYPE);
- return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
deleted file mode 100644
index 0b0b6fc88..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public interface AttributeElementType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public void setSetterMethod(String setterMethod);
- public String getSetterMethod();
- public String getGetterMethod();
- public void setGetterMethod(String getterMethod);
- public BeanElement getOwningBeanElement ();
- public TypeElement getTypeElement ();
- /**
- * Return the signature with this value as the parmeter
- *
- */
- public String getSetterSignature(String attribute);
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
deleted file mode 100644
index 79c9d0ddf..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060612 145433 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-/**
-* Objects of this class represent a Java bean.
-* Nearest moral equivalents: java.lang.Class, java.beans.BeanDescriptor.
-*/
-public class BeanElement extends TypeElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static String STATELESS_BEAN = "10101010statelessbean10101010";
- public static String REL_METHODS = "relmethods";
- public static int READONLY = 0;
- public static int WRITEONLY = 1;
- public static int READWRITE = 2;
- private int attrib = 2;
-
-
- /**
- * Constructor
- * @param projectElement The project this Bean belongs to.
- */
- public BeanElement (String name)
- {
- this(name,new BasicModel("Project"),true);
- }
-
- /**
- * Constructor
- * @param parameterElement The parameter this Bean belongs to.
- */
- public BeanElement (String name, Model model,boolean isRoot)
- {
- super(name,model,TypeElement.BEAN);
- if(isRoot) model.setRootElement(this);
- fOwnerType = TypeElement.ROOT;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the bean element.
- */
- public BeanElement ( ParameterElement parameterElement, String name)
- {
- super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
- fOwnerType = TypeElement.PARAMETER_OWNER;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public BeanElement ( AttributeElement attributeElement, String name)
- {
- super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
- fOwnerType = TypeElement.ATTRIBUTE_OWNER;
- attribFunction(attributeElement);
- }
-
- private void attribFunction(AttributeElement attributeElement){
- if(attributeElement.getGetterMethod() != null && attributeElement.getSetterMethod() != null) attrib = READWRITE;
- else if(attributeElement.getGetterMethod() == null && attributeElement.getSetterMethod() != null) attrib = WRITEONLY;
- else if(attributeElement.getGetterMethod() != null && attributeElement.getSetterMethod() == null) attrib = READONLY;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public BeanElement ( FieldElement fieldElement, String name)
- {
- super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
- fOwnerType = TypeElement.FIELD_OWNER;
-
- }
-
- /**
- * Returns an enumeration of all Method objects of this Bean.
- * @return Enumeration All Method objects of this Bean.
- */
- public Enumeration getMethods ()
- {
- return getElements(REL_METHODS);
- }
-
- /**
- * Returns the number of Method objects of this Bean.
- * @return int The number of Method objects of this Bean.
- */
- public int getNumberOfMethodElements ()
- {
- return getNumberOfElements(REL_METHODS);
- }
-
- public String getTypeName()
- {
- if(isStateLess()) return STATELESS_BEAN + getName();
- return getName();
- }
-
- public int getAttrib()
- {
- return attrib;
- }
-
- public void setAttrib(int attrib)
- {
- this.attrib = attrib;
- }
-
- public boolean isStateLess()
- {
- Enumeration ea = getElements(TypeElement.REL_ATTRIBUTES);
- Enumeration ef = getElements(TypeElement.REL_FIELDS);
- if(ea.hasMoreElements() || ef.hasMoreElements()) return false;
- else return true;
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
deleted file mode 100644
index 174d6af33..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class BeanModelElementsFactory
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static final String RETURN_PARAM_NAME="returnp";
-
- private BeanModelElementsFactory(){}
-
- public static Element getBeanModelElement(Object object)
- {
- return BeanModelElementsFactory.getBeanModelElement(object,null,null);
- }
-
- public static Element getBeanModelElement(Object object,Element parentElement)
- {
- return BeanModelElementsFactory.getBeanModelElement(object,parentElement,null);
- }
-
- /*
- * Take in an object and return an element depending on what
- * type we are dealing with from the javamof
- **/
- public static Element getBeanModelElement(Object object,Element parentElement, Model model)
- {
- Element returnElement = null;
-
- if (object instanceof JavaClass){
- JavaClass javaClass = (JavaClass)object;
- String javaName = javaClass.getJavaName();
- if (!javaClass.isArray()){
- if(parentElement == null && model ==null) returnElement = new BeanElement(javaName);
- else if(parentElement == null && model !=null) returnElement = new BeanElement(javaName,model,false);
- else{
- if(parentElement instanceof ParameterElement){
- ParameterElement tempElement = (ParameterElement)parentElement;
- returnElement = new BeanElement(tempElement,javaName);
- }
- else if(parentElement instanceof AttributeElement){
- AttributeElement tempElement = (AttributeElement)parentElement;
- returnElement = new BeanElement(tempElement,javaName);
- }
- else if(parentElement instanceof FieldElement){
- FieldElement tempElement = (FieldElement)parentElement;
- returnElement = new BeanElement(tempElement,javaName);
- }
- else if(parentElement instanceof MethodElement){
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- }
- }
- }
- else{
- if(parentElement == null && model ==null) returnElement = new ArrayElement(javaName);
- else if(parentElement == null && model !=null) returnElement = new ArrayElement(javaName,model,false);
- else{
- if(parentElement instanceof ParameterElement){
- ParameterElement tempElement = (ParameterElement)parentElement;
- returnElement = new ArrayElement(tempElement,javaName);
- }
- else if(parentElement instanceof AttributeElement){
- AttributeElement tempElement = (AttributeElement)parentElement;
- returnElement = new ArrayElement(tempElement,javaName);
- }
- else if(parentElement instanceof FieldElement){
- FieldElement tempElement = (FieldElement)parentElement;
- returnElement = new ArrayElement(tempElement,javaName);
- }
- else if(parentElement instanceof MethodElement){
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- }
-
- }
- }
-
- }
- else if(object instanceof SamplePropertyDescriptor){
- SamplePropertyDescriptor pd = (SamplePropertyDescriptor)object;
- returnElement = new AttributeElement((BeanElement)parentElement,pd.getName());
- }
- else if(object instanceof Field){
- Field field = (Field)object;
- returnElement = new FieldElement((BeanElement)parentElement,field.getName());
- }
- else if (object instanceof Method){
- Method method = (Method)object;
- returnElement = new MethodElement((BeanElement)parentElement,method.getName(), method.getMethodElementSignature());
- }
- //non beaninfo
- else if (object instanceof String){
- String name = (String)object;
- returnElement = new AttributeElement((BeanElement)parentElement,name);
- }
- else if (object instanceof JavaParameter){
- JavaParameter javaParameter = (JavaParameter)object;
-
-
- if (javaParameter.isReturn())
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- else{
- //a java parameter gives us the qualified name we dont want this
- String name = javaParameter.getQualifiedName();
- String shortName;
- int index = name.lastIndexOf(".");
- if (index != -1){
- index++;
- shortName = name.substring(index);
- }
- else shortName = name;
-
- returnElement = new ParameterElement((MethodElement)parentElement,shortName,MethodElement.REL_PARAMETERS,false);
-
- }
-
- }
- else if (object instanceof JavaHelpers){
- JavaHelpers javaHelper = (JavaHelpers)object;
- String javaName;
- if (javaHelper.isArray()) javaName = TypeFactory.ARRAY_NAME;
- else javaName = javaHelper.getJavaName();
- if (parentElement instanceof ParameterElement){
- returnElement = new SimpleElement((ParameterElement)parentElement,javaName,javaHelper.isPrimitive());
- }
- else if(parentElement instanceof AttributeElement){
- returnElement = new SimpleElement((AttributeElement)parentElement,javaName,javaHelper.isPrimitive());
- }
- else if(parentElement instanceof FieldElement){
- returnElement = new SimpleElement((FieldElement)parentElement,javaName,javaHelper.isPrimitive());
- }
- else if(parentElement instanceof MethodElement){
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- }
- }
- return returnElement;
- }
-
-
-
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
deleted file mode 100644
index 24da0c1c0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class BigDecimalType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public BigDecimalType()
- {
- super(TypeFactory.BIG_DECIMAL_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- return "new java.math.BigDecimal(" + name + ");";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
deleted file mode 100644
index acf6033cc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class BigIntegerType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public BigIntegerType()
- {
- super(TypeFactory.BIG_INTEGER_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- return "new java.math.BigInteger(" + name + ");";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
deleted file mode 100644
index 4861a696f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* This class is used to simplify the codegen process
-* Because codegen may be processed differently depending on the type
-* we can handle how each type wants the code to look for a specific task
-* by creating a datatype and calling generic methods that are
-* to be specialized in subclasses
-*/
-public interface DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_TYPE = "type";
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName);
-
- /**
- * Often times in order to convert a type to string, string to type or just plain provide an input form
- * A temporary variable is used. If we run into a sitution where two of the same types are used in the
- * same method these temporary variables share the same name space. It isnt enough to use a name
- * because of we may have a nested scenario. Therefore any temporary variable that is used in a dataType
- * must use a unique name apeended to the end. This name must be passed in and it is up to the user of
- * DataType to insure it is unique.
- * @return Unique Name
- */
- public void setUniqueName(String name);
-
- /**
- * This is the name each temp variable will use
- *
- *
- */
- public String getUniqueName();
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id);
-
-
- /**
- * Input form returns the user input html
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name);
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name);
-
- /**
- * return the type
- * @return String the type(including package).
- */
- public String getType();
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
deleted file mode 100644
index 95a9c44ab..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071110 209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class DateType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public DateType()
- {
- super(TypeFactory.BIG_DECIMAL_NAME);
- }
-
-
- /**
- * inputForm returns the user input html
- * The simple form is just a text input box
- * This has been specialized to show an example
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\""
- + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE
- + "<%" + StringUtils.NEWLINE
- + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + "java.util.GregorianCalendar gcExamp" + getUniqueName()+ " = new java.util.GregorianCalendar();" + StringUtils.NEWLINE
- + "java.util.Date date" + getUniqueName()+ " = gcExamp" + getUniqueName()+ ".getTime();" + StringUtils.NEWLINE
- + "String tempResult" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".format(date" + getUniqueName()+ ");" + StringUtils.NEWLINE
- + "%>" + StringUtils.NEWLINE
- + "<TD ALIGN=\"left\">" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE
- + "<TR>" + StringUtils.NEWLINE
- + "<TD> </TD>" + StringUtils.NEWLINE
- + "<TD ALIGN=\"left\"> eg. <%= tempResult" + getUniqueName()+ " %> </TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
-
-
-
- return inputForm;
- }
-
-
- /*
- * This function needs to be specialized
- * We must use the date function to help
- * us convert back and forth
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + nodeName + "= dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * this is needed for most case
- * but it is peripheral as the stringconversion needed
- * to be overridden
- */
- public String StringToType(String name)
- {
- return "";
- }
-
-
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name)
- {
-
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(" + name +"));" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return conversion;
- }
-
-
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
deleted file mode 100644
index c0406ac6b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class DomElementType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public DomElementType()
- {
- fType = "org.w3c.dom.Element";
- fUniqueName = "";
- }
-
- /**
- * inputForm returns the user input html
- * The DomElement form is a text box
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\""
- + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
- return inputForm;
- }
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id)
- {
- String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE
- + id + "= request.getParameter(\""
- + name +"\");" + StringUtils.NEWLINE;
- return requestCode;
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB
- + "org.w3c.dom.Element " + nodeName + "= org.eclipse.jst.ws.util.DomElementHelper.createDomElementFromXMLString(" + attributeName + ");"
- + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.DomElementHelper.domWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return typeToString;
- }
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
deleted file mode 100644
index 44fbb1d7d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class FieldElement extends BasicElement implements AttributeElementType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private String fSetterMethod;
- private String fGetterMethod;
-
-
- public static final String REL_TYPE = "type";
- public static final String REL_OWNING_BEAN = "owningbean";
-
- /**
- * Constructor this takes the owning bean.
- * @param name The name of the attribute.
- * @param beanElement the bean that owns this attribute.
- */
- public FieldElement ( BeanElement beanElement, String name)
- {
- super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_FIELDS);
- fSetterMethod = name;
- fGetterMethod = name;
- }
-
- public void setSetterMethod(String setterMethod)
- {
- fSetterMethod = setterMethod;
- }
-
- public String getSetterMethod()
- {
- return fSetterMethod;
- }
-
- public String getGetterMethod()
- {
- return fGetterMethod;
- }
-
- public void setGetterMethod(String getterMethod)
- {
- fGetterMethod = getterMethod;
- }
-
- public String getSetterSignature(String attribute)
- {
- return fSetterMethod + " = " + attribute + ";";
- }
-
- /**
- * Returns the Bean that owns this Attribute.
- * @return BeanElement The bean that owns this attribute.
- */
- public BeanElement getOwningBeanElement ()
- {
- Enumeration e = getElements(REL_OWNING_BEAN);
- return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
- }
-
- /**
- * Returns the type that is owned by this attributte.
- * @return TypeElement The Type that of this attribute.
- */
- public TypeElement getTypeElement ()
- {
- Enumeration e = getElements(REL_TYPE);
- return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
deleted file mode 100644
index 3a9d9d197..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071110 209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class GregorianCalendarType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public GregorianCalendarType()
- {
- super(TypeFactory.GREGORIAN_CALENDAR_NAME);
- }
-
-
- /**
- * inputForm returns the user input html
- * The simple form is just a text input box
- * This has been specialized to show an example
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\""
- + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE
- + "<%" + StringUtils.NEWLINE
- + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + "java.util.GregorianCalendar gcExamp" + getUniqueName()+ " = new java.util.GregorianCalendar();" + StringUtils.NEWLINE
- + "java.util.Date date" + getUniqueName()+ " = gcExamp" + getUniqueName()+ ".getTime();" + StringUtils.NEWLINE
- + "String tempResult" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".format(date" + getUniqueName()+ ");" + StringUtils.NEWLINE
- + "%>" + StringUtils.NEWLINE
-
-
- + "<TD ALIGN=\"left\">" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE
- + "<TR>" + StringUtils.NEWLINE
- + "<TD> </TD>" + StringUtils.NEWLINE
- + "<TD ALIGN=\"left\"> eg. <%= tempResult" + getUniqueName()+ " %> </TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
-
-
-
- return inputForm;
- }
-
-
- /*
- * This function needs to be specialized
- * We must use the date function to help
- * us convert back and forth
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + "java.util.Date dateTemp" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + Generator.SPACE + nodeName + " = " + "new java.util.GregorianCalendar();"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + nodeName + ".setTime(dateTemp" + getUniqueName()+ ");"
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * this is needed for most case
- * but it is peripheral as the stringconversion needed
- * to be overridden
- */
- public String StringToType(String name)
- {
- return "";
- }
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name)
- {
-
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "java.util.Date date" + getUniqueName()+ " = " + name + ".getTime();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(date" + getUniqueName() + "));" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return conversion;
- }
-
-
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
deleted file mode 100644
index a1ff2cf46..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class HashtableType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public HashtableType()
- {
- super(TypeFactory.HASHTABLE_NAME);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
deleted file mode 100644
index 0035bfbe8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class MapType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public MapType()
- {
- super(TypeFactory.MAP_NAME);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
deleted file mode 100644
index 271e4ed26..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method.
-* Nearest moral equivalents: java.lang.reflect.Method, java.beans.MethodDescriptor.
-*/
-public class MethodElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String REL_BEAN = "bean";
- public static final String REL_PARAMETERS = "parameters";
- public static final String REL_RETURN_PARAMETERS = "returnparameters";
- private String fDisplayName;
- private String fName;
- private boolean fMethodOmitted;
-
- /**
- * Constructor.
- * @param bean The Bean that owns this method.
- * @param name The name of the method.
- * @param type The type of the method.
- */
- public MethodElement ( BeanElement beanElement, String name, String displayName)
- {
- super(name,beanElement,REL_BEAN,BeanElement.REL_METHODS);
- fDisplayName = displayName;
- fName = name;
- fMethodOmitted = false;
-
- }
-
- /*
- * In the event that there is an unsupported type
- * we will set the ommission boolean variable
- * @return boolean true if this method is to be ommited
- */
- public boolean getMethodOmmission()
- {
- return fMethodOmitted;
- }
-
- /*
- * In the event that there is an unsupported type
- * we will get the ommission boolean variable
- * @param boolean true if this method is to be ommited
- */
- public void setMethodOmmission(boolean bool)
- {
- fMethodOmitted = bool;
- }
-
-
- public String getName()
- {
- return fName;
- }
-
- public String getDisplayName()
- {
- return fDisplayName;
- }
-
- /**
- * Returns the Bean that owns this method.
- * @return Bean The Bean that owns this method.
- */
- public BeanElement getBeanElement ()
- {
- Enumeration e = getElements(REL_BEAN);
- return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
- }
-
- /**
- * Returns an enumeration of the return parameter of this method.
- * @return Enumeration holds the return parameter of this method.
- */
- public Enumeration getReturnParameterEnum ()
- {
- return getElements(REL_RETURN_PARAMETERS);
- }
-
- /**
- * Returns an enumeration of the return parameter of this method.
- * @return Enumeration holds the return parameter of this method.
- */
- public ParameterElement getReturnParameterElement ()
- {
- Enumeration e = getReturnParameterEnum();
- return e.hasMoreElements() ? (ParameterElement)e.nextElement() : null;
- }
-
- /**
- * Returns an enumeration of all Parameter objects of this method.
- * @return Enumeration All Parameter objects of this method.
- */
- public Enumeration getParameterElements ()
- {
- return getElements(REL_PARAMETERS);
- }
-
- /**
- * Returns the number of Parameter objects of this method.
- * @return int The number of Parameter objects of this method.
- */
- public int getNumberOfParameterElements ()
- {
- return getNumberOfElements(REL_PARAMETERS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ObjectType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ObjectType.java
deleted file mode 100644
index deebdff2e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ObjectType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060823 145643 mahutch@ca.ibm.com - Mark Hutchinson (created class)
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class ObjectType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public ObjectType()
- {
- super(TypeFactory.OBJECT_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- //We can't deserialize a String to an Object
- //this should never actually be called since
- //methods with Objects as input are omitted.
- return "new java.lang.Object();";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java
deleted file mode 100644
index 901cfc3c8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class ParameterElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String REL_METHOD = "method";
- public static final String REL_TYPE = "type";
-
- public boolean fReturnParameter=false;
-
- /**
- * Constructor.
- * @param method The Method that owns this parameter.
- * @param name The name of the parameter.
- * @param type The type of the parameter.
- */
- public ParameterElement ( MethodElement methodElement, String name, String relType,boolean returnParameter )
- {
- this(name,methodElement,REL_METHOD,relType);
- fReturnParameter = returnParameter;
- }
-
- /**
- * Constructor.
- * @param method The Method that owns this parameter.
- * @param name The name of the parameter.
- * @param type The type of the parameter.
- */
- public ParameterElement (String name, MethodElement methodElement, String outRel,String inRel)
- {
- super(name,methodElement,outRel,inRel);
- }
-
- /**
- * Returns the Method that owns this parameter.
- * @return Method The Method that owns this parameter.
- */
- public MethodElement getMethodElement ()
- {
- Enumeration e = getElements(REL_METHOD);
- return e.hasMoreElements() ? (MethodElement)e.nextElement() : null;
- }
-
- /**
- * Returns the Method that owns this parameter.
- * @return Method The Method that owns this parameter.
- */
- public TypeElement getTypeElement ()
- {
- Enumeration e = getElements(REL_TYPE);
- return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
- }
-
- public boolean isReturn()
- {
- return fReturnParameter;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
deleted file mode 100644
index 387306178..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class PrimitiveArrayType extends ArrayType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveArrayType(String typeName)
- {
- super(TypeFactory.PRIMITIVE_ARRAY_NAME, typeName);
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String trippleTab = Generator.DOUBLE_TAB + Generator.TAB;
-
- String nonBean = Generator.DOUBLE_TAB + "String temp" + getUniqueName() + " = \"[\";"
- + Generator.DOUBLE_TAB + "for(int i" + getUniqueName() + "=0;i" +getUniqueName() + "< " + name
- + ".length;i" + getUniqueName() + "++){" + StringUtils.NEWLINE
- + trippleTab + "temp"+ getUniqueName() +" = temp"+getUniqueName() + " + " + name + "[i" + getUniqueName()
- + "] + \",\";" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "int length" + getUniqueName() + " = temp" + getUniqueName() + ".length();"
- + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "temp" + getUniqueName() + " = temp"+getUniqueName()+".substring(0,(length"+getUniqueName()+" - 1)) + \"]\";"
- + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
- return nonBean;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
deleted file mode 100644
index f58ad9d80..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveBooleanType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveBooleanType()
- {
- super(TypeFactory.PRIM_BOOLEAN_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Boolean.valueOf(" + name + ").booleanValue();";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
deleted file mode 100644
index 5045d26dd..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveByteType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveByteType()
- {
- super(TypeFactory.PRIM_BYTE_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Byte.parseByte(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
deleted file mode 100644
index d52f90393..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveCharType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveCharType()
- {
- super(TypeFactory.PRIM_CHAR_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "" + name + ".charAt(0);";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
deleted file mode 100644
index 7b362e718..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveDoubleType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveDoubleType()
- {
- super(TypeFactory.PRIM_DOUBLE_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Double.parseDouble(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
deleted file mode 100644
index 200f9d7ca..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveFloatType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveFloatType()
- {
- super(TypeFactory.PRIM_FLOAT_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Float.parseFloat(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
deleted file mode 100644
index 2f33dd929..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveIntType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveIntType()
- {
- super(TypeFactory.PRIM_INTEGER_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Integer.parseInt(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
deleted file mode 100644
index f71523669..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveJavaTypes extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveJavaTypes(String type)
- {
- super(type);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- String conversion = fType + ".valueOf(" + name + ");";
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
deleted file mode 100644
index ef0c82698..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveLongType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveLongType()
- {
- super(TypeFactory.PRIM_LONG_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Long.parseLong(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
deleted file mode 100644
index 8f91ce6ac..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveShortType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveShortType()
- {
- super(TypeFactory.PRIM_SHORT_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Short.parseShort(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
deleted file mode 100644
index 43106b8ea..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071110 209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-/**
-* objects of this class represent a type
-*
-*/
-public abstract class PrimitiveType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveType(String type)
- {
- super(type);
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + typeName + Generator.SPACE + nodeName
- + Generator.SPACE + " = " + StringToType(attributeName)
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
deleted file mode 100644
index fc721a809..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class RecognizedReturnType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public RecognizedReturnType(String type)
- {
- fType = type;
- fUniqueName = "";
- }
-
- /**
- * not relevant at this point
- */
- public String inputForm(String name)
- {
- return "";
- }
-
- /**
- * again not relevant
- */
- public String getRequestCode(String name, String id)
- {
- return "";
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- return "";
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String nonBean = Generator.DOUBLE_TAB + "if(" + name + "!= null){" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String temp" + getUniqueName()+" = " + name + ".toString();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%=temp" + getUniqueName() +"%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "}";
- return nonBean;
- }
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
deleted file mode 100644
index 289e009e5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class SOAPElementType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public SOAPElementType()
- {
- fType = "javax.xml.soap.SOAPElement";
- fUniqueName = "";
- }
-
- /**
- * inputForm returns the user input html
- * The DomElement form is a text box
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\""
- + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
- return inputForm;
- }
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id)
- {
- String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE
- + id + "= request.getParameter(\""
- + name +"\");" + StringUtils.NEWLINE;
- return requestCode;
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB
- + "javax.xml.soap.SOAPElement " + nodeName + "= org.eclipse.jst.ws.util.SoapElementHelper.createSOAPElementFromXMLString(" + attributeName + ");"
- + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.SoapElementHelper.soapElementWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return typeToString;
- }
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
deleted file mode 100644
index f478345d1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* 1 of three type elements represents primitives
-*/
-public class SimpleElement extends TypeElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor
- * @param ParameterElement The Parameter that owns this simple type.
- * @param String Name of the simple element.
- */
- public SimpleElement ( ParameterElement parameterElement, String name, boolean prim)
- {
- super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
- fOwnerType = TypeElement.PARAMETER_OWNER;
- setPrimitive(prim);
- }
-
- /**
- * Constructor
- * @param ParameterElement The Attribute that owns this simple type.
- * @param String Name of the AttributeElement.
- */
- public SimpleElement ( AttributeElement attributeElement, String name, boolean prim)
- {
- super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
- fOwnerType = TypeElement.ATTRIBUTE_OWNER;
- setPrimitive(prim);
- }
-
- /**
- * Constructor
- * @param ParameterElement The Attribute that owns this simple type.
- * @param String Name of the AttributeElement.
- */
- public SimpleElement ( FieldElement fieldElement, String name, boolean prim)
- {
- super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
- fOwnerType = TypeElement.FIELD_OWNER;
- setPrimitive(prim);
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
deleted file mode 100644
index 116ede914..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20071110 209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public abstract class SimpleType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public SimpleType(String type)
- {
- fType = type;
- }
-
- /**
- * inputForm returns the user input html
- * The simple form is just a text input box
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\""
- + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
- return inputForm;
- }
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id)
- {
- String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE
- + id + "= request.getParameter(\""
- + name +"\");" + StringUtils.NEWLINE;
- return requestCode;
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * it uses another function that all subclasses of SimpleType are required to implement
- * The StringToType function
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + Generator.SPACE + nodeName
- + Generator.SPACE + " = " + StringToType(attributeName)
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public abstract String StringToType(String name);
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name)
- {
-
- String conversion = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(" + TypeToString(name) + ");" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public abstract String TypeToString(String name);
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java
deleted file mode 100644
index 40f9d6c4f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class StateLessBeanType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
-
- public StateLessBeanType(String name)
- {
- super(TypeFactory.STATELESS_BEAN);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
deleted file mode 100644
index 1b99c746e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class StringType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public StringType()
- {
- super(TypeFactory.STRING_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- String conversion = name + ";";
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
deleted file mode 100644
index af80d7f32..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070410 180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* TypeElement is the base class for Java bean features that have types.
-*/
-public abstract class TypeElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static final String NON_INSTANTIABLE = "nonInstantiable";
-
- public static int BEAN = 0;
- public static int SIMPLE = 1;
- public static int ARRAY = 2;
-
- private int fType;
- protected int fOwnerType;
- private boolean fPrimitive = false;
-
- /**
- * Constructor. Automatically adds this object to the given model.
- * @param name The name of the element
- * @param model The model to own this object.
- * @param type The type represented by this object, one of
- * <code>BEAN</code>, <code>SIMPLE</code> or <code>ARRAY</code>.
- */
- protected TypeElement ( String name, Model model, int type )
- {
- super(name,model);
- fType = type;
- }
-
- /**
- */
- protected TypeElement ( String name, Element element, String outboundRelName, String inboundRelName, int type )
- {
- super(name,element,outboundRelName,inboundRelName);
- fType = type;
- }
-
- /*
- *This will tell you wether the type is a bean
- *@param Boolean returns true if this is bean
- **/
- public boolean isBean()
- {
- if (fType == BEAN) return true;
- return false;
- }
-
- /*
- *This will tell you wether the type is a bean
- *@param Boolean returns true if this is bean
- **/
- public boolean isPrimitive()
- {
- return fPrimitive;
- }
-
- /*
- *This will tell you wether the type is a bean
- *@param Boolean returns true if this is bean
- **/
- protected void setPrimitive(boolean prim)
- {
- fPrimitive = prim;
- }
-
-
- /*
- * This is mainly needed for arrays as with all types the
- * names come out as java.util.type, but with an array it
- * isnt explicit in telling us its an array
- */
- public String getTypeName()
- {
- return getName();
- }
-
- /*
- *This will tell you wether the type is a simple
- *@param Boolean returns true if this is simple
- **/
- public boolean isSimple()
- {
- if (fType == SIMPLE) return true;
- return false;
- }
-
- /*
- *This will tell you wether the type is a array
- *@param Boolean returns true if this is array
- **/
- public boolean isArray()
- {
- if (fType == ARRAY) return true;
- return false;
- }
-
- public static String REL_ATTRIBUTES = "attributes";
- public static String REL_FIELDS = "fields";
- public static final String REL_TYPE = "type";
- public static final String REL_OWNER = "owner";
-
- public static int PARAMETER_OWNER = 0;
- public static int ATTRIBUTE_OWNER = 1;
- public static int FIELD_OWNER = 2;
- public static int ROOT = 3;
-
- /*
- * This could be The root test bean
- * @return boolean true if this is root bean
- */
- public boolean isRoot()
- {
- if(fOwnerType == ROOT) return true;
- return false;
- }
-
- /*
- * This Type could be owned by a Parameter or an attribute
- * @return boolean true if this is owned by a parameter
- */
- public boolean isOwnerParameter()
- {
- if(fOwnerType == PARAMETER_OWNER) return true;
- return false;
- }
-
- /*
- * This Type could be owned by a Parameter or an attribute
- * @return boolean true if this is owned by an attribute
- */
- public boolean isOwnerAttribute()
- {
- if(fOwnerType == ATTRIBUTE_OWNER) return true;
- return false;
- }
-
- /*
- * This Type could be owned by a Parameter or an attribute
- * @return boolean true if this is owned by an attribute
- */
- public boolean isOwnerField()
- {
- if(fOwnerType == FIELD_OWNER) return true;
- return false;
- }
-
- /**
- * This Type may be owned by a parameter or an attribute
- * Use this method in conjunction with isOwnerParamter, isOwner
- * @return BasicElement the element that owns this attribute.
- */
- public BasicElement getOwningElement ()
- {
- if (isOwnerParameter()){
- Enumeration e = getElements(REL_OWNER);
- return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
- }
- else if(isOwnerAttribute()){
- Enumeration e = getElements(REL_OWNER);
- return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
- }
- else if(isOwnerField()){
- Enumeration e = getElements(REL_OWNER);
- return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
- }
-
- return null;
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
deleted file mode 100644
index 7bed616cb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060726 145676 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060823 145643 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Hashtable;
-import org.eclipse.jem.java.JavaHelpers;
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class TypeFactory
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String URL_NAME = "java.net.URL";
- public static final String STRING_NAME = "java.lang.String";
- public static final String BIG_DECIMAL_NAME = "java.math.BigDecimal";
- public static final String BIG_INTEGER_NAME = "java.math.BigInteger";
- public static final String DATE_NAME = "java.util.Date";
- public static final String GREGORIAN_CALENDAR_NAME = "java.util.GregorianCalendar";
- public static final String CALENDAR_NAME = "java.util.Calendar";
- public static final String BOOLEAN_NAME = "java.lang.Boolean";
- public static final String BYTE_NAME = "java.lang.Byte";
- public static final String DOUBLE_NAME = "java.lang.Double";
- public static final String FLOAT_NAME = "java.lang.Float";
- public static final String INTEGER_NAME = "java.lang.Integer";
- public static final String LONG_NAME = "java.lang.Long";
- public static final String SHORT_NAME = "java.lang.Short";
- public static final String CHARACTER_NAME = "java.lang.Character";
- public static final String OBJECT_NAME = "java.lang.Object";
- public static final String PRIM_BOOLEAN_NAME = "boolean";
- public static final String PRIM_BYTE_NAME = "byte";
- public static final String PRIM_DOUBLE_NAME = "double";
- public static final String PRIM_FLOAT_NAME = "float";
- public static final String PRIM_INTEGER_NAME = "int";
- public static final String PRIM_LONG_NAME = "long";
- public static final String PRIM_SHORT_NAME = "short";
- public static final String PRIM_CHAR_NAME = "char";
- public static final String VOID_NAME = "void";
-
- //some special complex
- public static final String DOM_ELEMENT_NAME = "org.w3c.dom.Element";
- public static final String SOAP_ELEMENT_NAME = "javax.xml.soap.SOAPElement";
- public static final String STATELESS_BEAN = BeanElement.STATELESS_BEAN;
-
-
-
- public static Hashtable javaTypes = new Hashtable();
-
- public TypeFactory(){}
-
- static{
- javaTypes.put(BOOLEAN_NAME,new PrimitiveJavaTypes(BOOLEAN_NAME));
- javaTypes.put(BYTE_NAME, new PrimitiveJavaTypes(BYTE_NAME));
- javaTypes.put(DOUBLE_NAME, new PrimitiveJavaTypes(DOUBLE_NAME));
- javaTypes.put(FLOAT_NAME, new PrimitiveJavaTypes(FLOAT_NAME));
- javaTypes.put(INTEGER_NAME,new PrimitiveJavaTypes(INTEGER_NAME));
- javaTypes.put(LONG_NAME, new PrimitiveJavaTypes(LONG_NAME));
- javaTypes.put(SHORT_NAME, new PrimitiveJavaTypes(SHORT_NAME));
- javaTypes.put(CHARACTER_NAME, new PrimitiveJavaTypes(CHARACTER_NAME));
- }
-
-
- /*
- * This function allows us to handle recognized beans
- * in displaying and generating code for them instead of
- * treating them as complex types
- */
- public static boolean recognizedBean(String type)
- {
-
- //
- //current recognized beans (mostly java.lang)
- if (type.equals(BOOLEAN_NAME) ||
- type.equals(BYTE_NAME) ||
- type.equals(DOUBLE_NAME) ||
- type.equals(FLOAT_NAME) ||
- type.equals(INTEGER_NAME) ||
- type.equals(LONG_NAME) ||
- type.equals(SHORT_NAME) ||
- type.equals(CHARACTER_NAME) ||
- type.equals(DOM_ELEMENT_NAME) ||
- type.equals(SOAP_ELEMENT_NAME) ||
- type.equals(BIG_DECIMAL_NAME) ||
- type.equals(BIG_INTEGER_NAME) ||
- type.equals(DATE_NAME) ||
- type.equals(GREGORIAN_CALENDAR_NAME) ||
- type.equals(CALENDAR_NAME) ||
- type.equals(URL_NAME) ||
- type.equals(OBJECT_NAME) ||
- type.equals(STRING_NAME)) return true;
- return false;
-
- }
-
- /*
- * This function allows us to handle unsupported types
- * if we dont want to support a type and we want to omitt this
- * method from the samples
- * @param javaHelpers this is the type to be evaluated
- * @return boolean true if the type is not supported
- */
- public static boolean isUnSupportedType(JavaHelpers javaHelpers)
- {
- //we also dont support arrays
- //java.lang.Objects are ok for return types but not for input type
- if (javaHelpers.isArray()||
- javaHelpers.getJavaName().equals(MAP_NAME)||
- javaHelpers.getJavaName().equals(VECTOR_NAME)||
- javaHelpers.getJavaName().equals(DATA_HANDLER)||
- javaHelpers.getJavaName().equals(OBJECT_NAME) ||
- javaHelpers.getJavaName().equals("java.lang.class") ) return true;
-
- return false;
- }
-
- public static String HASHTABLE_NAME = "java.util.Hashtable";
- public static String MAP_NAME = "java.util.Map";
- public static String VECTOR_NAME = "java.util.Vector";
- public static String ARRAY_NAME = ArrayElement.ARRAY_NAME;
- public static String PRIMITIVE_ARRAY_NAME = "primitivearray";
- public static String DATA_HANDLER = "javax.activation.DataHandler";
-
- public static boolean isRecognizedReturnType(JavaHelpers javaHelpers)
- {
- //arrays
- //Hashtable
- //Vectors
- //java.lang.Objects are ok for return types
- if (javaHelpers.isArray()) return true;
- else if (javaHelpers.getJavaName().equals(HASHTABLE_NAME))return true;
- else if (javaHelpers.getJavaName().equals(VECTOR_NAME))return true;
- else if (javaHelpers.getJavaName().equals(MAP_NAME))return true;
- else if (javaHelpers.getJavaName().equals(OBJECT_NAME))return true;
- else return false;
- }
-
- public static boolean isRecognizedReturnType(String type)
- {
- //arrays
- //Hashtable
- //Vectors
- //java.lang.Objects are ok for return types
- if (type.startsWith(ARRAY_NAME)) return true;
- else if (type.equals(HASHTABLE_NAME))return true;
- else if (type.equals(VECTOR_NAME))return true;
- else if (type.equals(MAP_NAME))return true;
- else if (type.equals(OBJECT_NAME)) return true;
- else return false;
- }
-
- public static boolean isStateLessBean(String type)
- {
- if(type.startsWith(STATELESS_BEAN)) return true;
- return false;
- }
-
-
- /**
- * Creates a type based on the JavaHelper then sets this type in the element
- * @params JavaHelpers this holds the type
- * @param TypeElement The element which will hold the type created
- * @param String Uniquename to be used when naming temp variables
- */
-
- public static DataType createType(String type, String UniqueName)
- {
- //this guy might be both stateless and one of the below elements
- //we would like to be as specific as we can, stateless is the worst case
- boolean stateless = false;
- if(type.startsWith(STATELESS_BEAN)) {
- stateless = true;
- type = type.substring(29);
- }
-
- DataType datatype = null;
- if (type.equals(PRIM_BOOLEAN_NAME)) datatype = new PrimitiveBooleanType();
- else if (type.equals(PRIM_BYTE_NAME)) datatype = new PrimitiveByteType();
- else if (type.equals(PRIM_DOUBLE_NAME)) datatype = new PrimitiveDoubleType();
- else if (type.equals(PRIM_FLOAT_NAME)) datatype = new PrimitiveFloatType();
- else if (type.equals(PRIM_LONG_NAME)) datatype = new PrimitiveLongType();
- else if (type.equals(PRIM_INTEGER_NAME)) datatype = new PrimitiveIntType();
- else if (type.equals(PRIM_CHAR_NAME)) datatype = new PrimitiveCharType();
- else if (type.equals(PRIM_SHORT_NAME)) datatype = new PrimitiveShortType();
-
-
- //see if this critter is a javatype
- else if (type.equals(BOOLEAN_NAME) ||
- type.equals(BYTE_NAME) ||
- type.equals(DOUBLE_NAME) ||
- type.equals(FLOAT_NAME) ||
- type.equals(INTEGER_NAME) ||
- type.equals(LONG_NAME) ||
- type.equals(CHARACTER_NAME) ||
- type.equals(SHORT_NAME)) datatype = (DataType)javaTypes.get(type);
-
- //see if its a case we handle
- else if (type.equals(STRING_NAME)) datatype = new StringType();
- else if (type.equals(VOID_NAME)) datatype = new VoidType();
- else if (type.equals(DOM_ELEMENT_NAME)) datatype = new DomElementType();
- else if (type.equals(SOAP_ELEMENT_NAME)) datatype = new SOAPElementType();
- else if (type.equals(BIG_DECIMAL_NAME)) datatype = new BigDecimalType();
- else if (type.equals(BIG_INTEGER_NAME)) datatype = new BigIntegerType();
- else if (type.equals(DATE_NAME)) datatype = new DateType();
- else if (type.equals(URL_NAME)) datatype = new URLType();
- else if (type.equals(GREGORIAN_CALENDAR_NAME)) datatype = new GregorianCalendarType();
- else if (type.equals(CALENDAR_NAME)) datatype = new GregorianCalendarType();
-
- //it could be a return type we support
- else if (type.equals(HASHTABLE_NAME)) datatype = new HashtableType();
- else if (type.equals(VECTOR_NAME)) datatype = new VectorType();
- else if (type.equals(MAP_NAME)) datatype = new MapType();
- else if (type.equals(OBJECT_NAME)) datatype = new ObjectType();
-
- // need to see if it is an object array
- //or a primitive
- else if (type.startsWith(ARRAY_NAME)){
- String name = type.substring(21);
- if(name.startsWith(PRIM_BOOLEAN_NAME) ||
- name.startsWith(PRIM_BYTE_NAME) ||
- name.startsWith(PRIM_DOUBLE_NAME) ||
- name.startsWith(PRIM_FLOAT_NAME) ||
- name.startsWith(PRIM_LONG_NAME) ||
- name.startsWith(PRIM_INTEGER_NAME) ||
- name.startsWith(PRIM_CHAR_NAME) ||
- name.startsWith(PRIM_SHORT_NAME))
- datatype = new PrimitiveArrayType(name);
- else
- datatype = new ArrayType(name);
-
- }
- else if (stateless){
- datatype = new StateLessBeanType(type);
-
- }
-
-
- datatype.setUniqueName(UniqueName);
- return datatype;
-
- }
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
deleted file mode 100644
index 9c0fb28c8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class URLType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public URLType()
- {
- super(TypeFactory.URL_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- String conversion = "new java.net.URL(" + name + ");";
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
deleted file mode 100644
index 5a0718ddc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class VectorType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public VectorType()
- {
- super(TypeFactory.VECTOR_NAME);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
deleted file mode 100644
index 5fde91e13..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class VoidType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public VoidType()
- {
- super("void");
- }
-
- /**
- * for a void there is no need to return
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- return "";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
deleted file mode 100644
index bc0128ec6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.validate;
-
-import java.util.HashSet;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-/**
- * This class manages the validation state of projects that some tasks may want
- * to disable. The manager can then be used to restore the validation state.
-**/
-public class ValidationManager
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * This set contains a set of IProjects that need to be validated.
- **/
- private HashSet projects = null;
-
- /**
- * This object contains a reference to the j2ee validator.
- **/
- //pgm private ValidatorManager j2eeManager = null;
-
- /**
- * This boolean contains the auto build setting under preferrence
- **/
- private boolean isAutoBuild_;
- private boolean autoBuildDisabled_;
-
- public ValidationManager()
- {
- projects = new HashSet();
- //pgm j2eeManager = ValidatorManager.getManager();
- setAutoBuildPreference();
- autoBuildDisabled_ = false;
- }
-
- /**
- * Disables the validation for a project if required.
- **/
- public void disableValidationForProject( IProject project )
- {
- // We need to remember that this project needs have validation turned back on.
- projects.add( project );
-
- //pgm j2eeManager.suspendAllValidation( true );
- }
-
- /**
- * Restores the validation state for all needed projects.
- **/
- public void restoreValidationForProjects( boolean runValidation )
- {
- }
-
- public void modifyAutoBuild(boolean isAutoBuild) {
- try {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription workspaceDesc = workspace.getDescription();
- workspaceDesc.setAutoBuilding(isAutoBuild);
- workspace.setDescription(workspaceDesc);
- }
- catch (Exception e) {}
- }
-
- public void disableAutoBuild() {
- if (!autoBuildDisabled_) {
- setAutoBuildPreference();
- modifyAutoBuild(false);
- autoBuildDisabled_ = true;
- }
- }
-
- public void restoreAutoBuild() {
- if (autoBuildDisabled_) {
- modifyAutoBuild(getAutoBuildPreference());
- autoBuildDisabled_ = false;
- }
- }
-
- public boolean setAutoBuildPreference() {
- isAutoBuild_ = getWorkspaceAutoBuildPreference();
- return isAutoBuild_;
- }
-
- public boolean getAutoBuildPreference() {
- return isAutoBuild_;
- }
-
- public boolean getWorkspaceAutoBuildPreference() {
- IWorkspaceDescription workspaceDesc = ResourcesPlugin.getWorkspace().getDescription();
- return workspaceDesc.isAutoBuilding();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java
deleted file mode 100644
index 3ab1a2cc4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class BindingElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_PORT = "port";
- public static String REL_OPERATIONS = "operations";
- public static String REL_PORT_TYPE = "porttype";
-
- public BindingElement (PortElement portElement,String name)
- {
- super(name,portElement,REL_PORT,PortElement.REL_BINDING);
- }
-
- public Enumeration getPort()
- {
- return getElements(REL_PORT);
- }
-
- public Enumeration getPortType()
- {
- return getElements(REL_PORT_TYPE);
- }
-
- public Enumeration getOperations()
- {
- return getElements(REL_OPERATIONS);
- }
-
- public int getNumberOfOperations()
- {
- return getNumberOfElements(REL_OPERATIONS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java
deleted file mode 100644
index 8454c22c6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class DefinitionElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_SERVICES = "services";
- public static String REL_WSDL = "wsdl";
-
- public DefinitionElement (WSDLElement wsdlElement,String name)
- {
- super(name,wsdlElement,REL_WSDL,WSDLElement.REL_DEFINITIONS);
- }
-
- public Enumeration getWSDL()
- {
- return getElements(REL_WSDL);
- }
-
- public Enumeration getServices()
- {
- return getElements(REL_SERVICES);
- }
-
- public int getNumberOfServices()
- {
- return getNumberOfElements(REL_SERVICES);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java
deleted file mode 100644
index dbe2781db..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class MessageElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_OPERATION = "operation";
- public static String REL_PARTS = "parts";
-
- public MessageElement (OperationElement operationElement,String name)
- {
- super(name,operationElement,REL_OPERATION,OperationElement.REL_MESSAGES);
- }
-
- public Enumeration getOperation()
- {
- return getElements(REL_OPERATION);
- }
-
- public Enumeration getParts()
- {
- return getElements(REL_PARTS);
- }
-
- public int getNumberOfParts()
- {
- return getNumberOfElements(REL_PARTS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java
deleted file mode 100644
index 2489c2e4b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class OperationElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_BINDING = "binding";
- public static String REL_MESSAGES = "messages";
-
- public OperationElement (BindingElement bindingElement,String name)
- {
- super(name,bindingElement,REL_BINDING,BindingElement.REL_OPERATIONS);
- }
-
- public Enumeration getBinding()
- {
- return getElements(REL_BINDING);
- }
-
- public Enumeration getMessages()
- {
- return getElements(REL_MESSAGES);
- }
-
- public int getNumberOfMessages()
- {
- return getNumberOfElements(REL_MESSAGES);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java
deleted file mode 100644
index 42400dc62..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PartElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_MESSAGE = "message";
-
- public PartElement (MessageElement messageElement,String name)
- {
- super(name,messageElement,REL_MESSAGE,MessageElement.REL_PARTS);
- }
-
- public Enumeration getMessage()
- {
- return getElements(REL_MESSAGE);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
deleted file mode 100644
index 06bda9411..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PortElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_BINDING = "binding";
- public static String REL_SERVICE = "service";
-
- public PortElement (ServiceElement serviceElement,String name)
- {
- super(name,serviceElement,REL_SERVICE,ServiceElement.REL_PORTS);
- }
-
- public Enumeration getService()
- {
- return getElements(REL_SERVICE);
- }
-
- public Enumeration getBinding()
- {
- return getElements(REL_BINDING);
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java
deleted file mode 100644
index 9ed15601b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PortTypeElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_BINDING = "binding";
-
- public PortTypeElement (BindingElement bindingElement,String name)
- {
- super(name,bindingElement,REL_BINDING,BindingElement.REL_PORT_TYPE);
- }
-
- public Enumeration getBinding()
- {
- return getElements(REL_BINDING);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java
deleted file mode 100644
index e591d7fe2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class ServiceElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_PORTS = "ports";
- public static String REL_DEFINITION = "definition";
-
- public ServiceElement (DefinitionElement definitionElement,String name)
- {
- super(name,definitionElement,REL_DEFINITION,DefinitionElement.REL_SERVICES);
- }
-
- public Enumeration getDefinition()
- {
- return getElements(REL_DEFINITION);
- }
-
- public Enumeration getPorts()
- {
- return getElements(REL_PORTS);
- }
-
- public int getNumberOfPorts()
- {
- return getNumberOfElements(REL_PORTS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
deleted file mode 100644
index b28fa7685..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class StubbedWSDLModel
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected Model fModel;
- public StubbedWSDLModel()
- {
- WSDLElement wsdlElement = new WSDLElement("WSDLFiles");
- fModel = wsdlElement.getModel();
- }
-
- public Model getWSDLModel()
- {
- return fModel;
- }
-
- public void buildModel()
- {
- DefinitionElement def1 = new DefinitionElement((WSDLElement)fModel.getRootElement(),"StockQuote");
- ServiceElement ser1 = new ServiceElement(def1,"getQuote");
- ServiceElement ser2 = new ServiceElement(def1,"setQuote");
- PortElement port1 = new PortElement(ser1,"port1");
- PortElement port2 = new PortElement(ser1,"port2");
- PortElement port3 = new PortElement(ser2,"port1");
- PortElement port4 = new PortElement(ser2,"port2");
- BindingElement bind1 = new BindingElement(port1,"bind1");
- BindingElement bind2 = new BindingElement(port2,"bind1");
- BindingElement bind3 = new BindingElement(port3,"bind1");
- BindingElement bind4 = new BindingElement(port4,"bind1");
- OperationElement op1 = new OperationElement(bind1,"op1");
- new OperationElement(bind2,"op1");
- new OperationElement(bind3,"op1");
- new OperationElement(bind4,"op1");
- MessageElement me1 = new MessageElement(op1,"me1");
- MessageElement me2 = new MessageElement(op1,"me2");
- new PartElement(me1,"pe1");
- new PartElement(me2,"pe2");
-
- DefinitionElement def2 = new DefinitionElement((WSDLElement)fModel.getRootElement(),"TempConversion");
- ServiceElement ser3 = new ServiceElement(def2,"getTemp");
- ServiceElement ser4 = new ServiceElement(def2,"setTemp");
- PortElement port5 = new PortElement(ser3,"port1");
- PortElement port6 = new PortElement(ser4,"port1");
- BindingElement bind5 = new BindingElement(port5,"bind1");
- BindingElement bind6 = new BindingElement(port6,"bind1");
- new OperationElement(bind5,"op1");
- new OperationElement(bind6,"op1");
-
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
deleted file mode 100644
index 29b145f51..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class WSDLElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_DEFINITIONS = "definitions";
-
- /*
- *
- **/
- public WSDLElement (String name)
- {
- this(name,new BasicModel("WSDLModel"));
- }
-
- public WSDLElement (String name, Model model)
- {
- super(name,model);
- model.setRootElement(this);
- }
-
- public Enumeration getDefinitions()
- {
- return getElements(REL_DEFINITIONS);
- }
-
- public int getNumberOfDefinitions()
- {
- return getNumberOfElements(REL_DEFINITIONS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
deleted file mode 100644
index f622abaa4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreAssemblyFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
deleted file mode 100644
index 3b69fbc8c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreDeployFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
deleted file mode 100644
index 57fa1edb9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreDevelopFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
deleted file mode 100644
index 342a2b10c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreInstallFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
deleted file mode 100644
index 77cef3ba7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreAssemblyFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
deleted file mode 100644
index 8458f5c5b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreDeployFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
deleted file mode 100644
index ccb4d2f35..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreDevelopFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
deleted file mode 100644
index c849245d3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreInstallFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
deleted file mode 100644
index 3d4062a67..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the bulk of the Web Services runtime.
-* Only the graphical user interface portion of the runtime is
-* found elsewhere - in the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceConsumptionPlugin extends Plugin
-{
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.consumption";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceConsumptionPlugin instance_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceConsumptionPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws");
- * @return The WebServiceConsumptionPlugin singleton.
- */
- public static WebServiceConsumptionPlugin getInstance ()
- {
- return instance_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
deleted file mode 100644
index 1225e0324..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060612 145433 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-/**
-* Objects of this class represent a InputFileTypeGenerator.
-* */
-public class InputFileAttributeGenerator extends InputFileTypeGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private boolean fStateLess;
-
- /**
- * Constructor.
- *
- */
- public InputFileAttributeGenerator (StringBuffer buffer, int currentLevel, int levelsDeep)
- {
- super(buffer,currentLevel,levelsDeep);
- }
-
-
- /*
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public IStatus visit (Object object)
- {
-
- AttributeElementType attributeElementType = (AttributeElementType)object;
- //if it is a bean is it stateless
- attributeElementType.getTypeElement();
- if(attributeElementType.getSetterMethod() == null) return Status.OK_STATUS;
- if(attributeElementType.getTypeElement().isBean()){
- BeanElement bean = (BeanElement)attributeElementType.getTypeElement();
- fStateLess = bean.isStateLess();
- }
-
- TypeVisitor typeVisitor = new TypeVisitor();
- InputFileTypeGenerator inputFileTypeGenerator = new InputFileTypeGenerator(fbuffer,fCurrentLevel,fLevelsDeep);
- if(attributeElementType.getTypeElement().isBean() && !TypeFactory.recognizedBean(attributeElementType.getTypeElement().getName())
- && !(getReturnParam() && (TypeFactory.isRecognizedReturnType(attributeElementType.getTypeElement().getTypeName()) || fStateLess)))
-
- addParentGetter(attributeElementType.getGetterMethod(),attributeElementType.getTypeElement().getName());
- inputFileTypeGenerator.addParentGetter(returnParentGetter(),returnParentGetterType());
- inputFileTypeGenerator.setInstanceName(fInstanceName);
- inputFileTypeGenerator.setReturnParam(getReturnParam());
- typeVisitor.run(attributeElementType,inputFileTypeGenerator);
- fbuffer = inputFileTypeGenerator.getStringBuffer();
-
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
deleted file mode 100644
index 6d47bb0ba..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class InputFileGenerator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public String fResultName;
-
- /**
- * Constructor.
- * used directly
- */
- public InputFileGenerator (String result)
- {
- super();
- fResultName = result;
- }
-
- /**
- * Constructor.
- * called from subclasses
- */
- public InputFileGenerator (StringBuffer buffer, String result)
- {
- super(buffer);
- fResultName = result;
- }
-
- /**
- * Constructor.
- * called from subclasses
- */
- public InputFileGenerator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- public void setFileNames(String results)
- {
- fResultName = results;
- }
-
- //takes in a bean node
- public IStatus visit (Object object)
- {
- Element beanElement = (Element)object;
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>" + StringUtils.NEWLINE);
- fbuffer.append("<HTML>" + StringUtils.NEWLINE);
- fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<TITLE>Inputs</TITLE>" + StringUtils.NEWLINE);
- fbuffer.append("</HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<BODY>" + StringUtils.NEWLINE);
- fbuffer.append("<H1>Inputs</H1>" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE + "String method = request.getParameter(\"method\");" + StringUtils.NEWLINE);
- fbuffer.append("int methodID = 0;" + StringUtils.NEWLINE);
- fbuffer.append("if (method == null) methodID = -1;" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
- fbuffer.append("boolean valid = true;" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
- fbuffer.append("if(methodID != -1) methodID = Integer.parseInt(method);" + StringUtils.NEWLINE);
- fbuffer.append("switch (methodID){ " + StringUtils.NEWLINE);
-
- // go to the next generator
- MethodVisitor methodVisitor = new MethodVisitor();
- InputFileHelp1Generator inputFileHelp1Generator = new InputFileHelp1Generator(fbuffer,fResultName);
- methodVisitor.run(beanElement,inputFileHelp1Generator);
- fbuffer = inputFileHelp1Generator.getStringBuffer();
-
- fbuffer.append("case 1111111111:" + StringUtils.NEWLINE);
- fbuffer.append("valid = false;" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
- fbuffer.append("<TABLE>" + StringUtils.NEWLINE);
- fbuffer.append("<TR>" + StringUtils.NEWLINE);
- fbuffer.append("<TD COLSPAN=\"1\" ALIGN=\"LEFT\">URLString:</TD>" + StringUtils.NEWLINE);
- fbuffer.append("<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"url1111111111\" SIZE=20></TD>" + StringUtils.NEWLINE);
- fbuffer.append("</TR>" + StringUtils.NEWLINE);
- fbuffer.append("</TABLE>" + StringUtils.NEWLINE);
- fbuffer.append("<BR>" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
- fbuffer.append("</FORM>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("break;" + StringUtils.NEWLINE);
- fbuffer.append("case 1111111112:" + StringUtils.NEWLINE);
- fbuffer.append("valid = false;" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
- fbuffer.append("<BR>" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
- fbuffer.append("</FORM>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("break;" + StringUtils.NEWLINE);
-
-
-
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("if (valid) {" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE + "Select a method to test." + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append(Generator.TAB + "return;" + StringUtils.NEWLINE);
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE + StringUtils.NEWLINE);
- fbuffer.append("</BODY>" + StringUtils.NEWLINE);
- fbuffer.append("</HTML>" + StringUtils.NEWLINE);
-
- return Status.OK_STATUS;
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
deleted file mode 100644
index c46105fec..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a InputFileHelp1Generator.
-* */
-public class InputFileHelp1Generator extends InputFileGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final int INITIAL_STATE = 1;
- public static final int FINAL_STATE = 2;
-
- public int fstate;
-
- /**
- * Constructor.
- *
- */
- public InputFileHelp1Generator (StringBuffer buffer)
- {
- super(buffer);
- fstate = INITIAL_STATE;
- }
-
- /**
- * Constructor.
- *
- */
- public InputFileHelp1Generator (StringBuffer buffer,String resultName)
- {
- super(buffer,resultName);
- fstate = INITIAL_STATE;
- }
-
- /*
- * Takes in an element
- * @param Object Takes in an object to be acted upon
- */
- public IStatus visit (Object object)
- {
- Element methodElement = (Element)object;
- MethodElement method = (MethodElement)methodElement;
- if (method.getMethodOmmission()) return Status.OK_STATUS;
-
- ParameterVisitor parameterVisitor = new ParameterVisitor();
- fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
- fbuffer.append("valid = false;" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
-
- // go to the next generator
- InputFileHelp2Generator inputFileHelp2Generator = new InputFileHelp2Generator(fbuffer);
- parameterVisitor.run(methodElement,inputFileHelp2Generator);
- fbuffer = inputFileHelp2Generator.getStringBuffer();
-
- fbuffer.append("<BR>" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
- fbuffer.append("</FORM>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("break;" + StringUtils.NEWLINE);
-
-
- return Status.OK_STATUS;
-
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
deleted file mode 100644
index 2b7e64b6e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a InputFileHelp2Generator.
-* */
-public class InputFileHelp2Generator extends InputFileHelp1Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /*
- * This is actually used by the result generator to show the
- * resultant Bean
- * The name is the name the resultant bean is using as its instance name
- */
- protected String fInstanceName;
- private boolean fReturnParam=false;
-
- /**
- * Constructor.
- *
- */
- public InputFileHelp2Generator (StringBuffer buffer)
- {
- super(buffer);
- fInstanceName="";
- }
-
- /**
- * This is state data to be used by the generators
- * @param String name The instance name of the parameters type bean
- */
- public void setInstanceName(String name)
- {
- fInstanceName = name;
- }
-
- /**
- * This is state data to be used by the generators
- * @return String name The instance name of the parameters type bean
- */
- public String getInstanceName()
- {
- return fInstanceName;
- }
-
-
- /*
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public IStatus visit (Object object)
- {
- Element parameterElement = (Element)object;
- getVisitor();
-
- fbuffer.append("<TABLE>" + StringUtils.NEWLINE);
-
- TypeVisitor typeVisitor = new TypeVisitor();
- InputFileTypeGenerator inputFileTypeGenerator = new InputFileTypeGenerator(fbuffer,0);
- inputFileTypeGenerator.setReturnParam(getReturnParam());
- inputFileTypeGenerator.setInstanceName(fInstanceName);
- typeVisitor.run(parameterElement,inputFileTypeGenerator);
- fbuffer = inputFileTypeGenerator.getStringBuffer();
-
- fbuffer.append("</TABLE>" + StringUtils.NEWLINE);
-
- return Status.OK_STATUS;
-
- }
-
- public boolean getReturnParam()
- {
- return fReturnParam;
- }
-
- public void setReturnParam(boolean returnParam)
- {
- fReturnParam = returnParam;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
deleted file mode 100644
index 9b9bf6dc5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060612 145433 gilberta@ca.ibm.com - Gilbert Andrews
- * 20070410 180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.SimpleElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-/**
-* Objects of this class represent a InputFileTypeGenerator.
-* */
-public class InputFileTypeGenerator extends InputFileHelp2Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fParentGetters;
- protected int fLevelsDeep;
- protected int fColspan;
- protected int fCurrentLevel;
- private boolean fIsSimple;
- private boolean fStateLessBean;
- private Vector fGetters;
- private Vector fTypes;
- private boolean fWrite = true;
-
- /**
- * Constructor.
- *
- */
- public InputFileTypeGenerator (StringBuffer buffer, int currentLevel)
- {
- super(buffer);
- fCurrentLevel = currentLevel;
- fLevelsDeep = -1;
- fParentGetters = "";
- }
-
- /**
- * Constructor.
- *
- */
- public InputFileTypeGenerator (StringBuffer buffer, int currentLevel,int levelsDeep)
- {
- super(buffer);
- fCurrentLevel = currentLevel;
- fLevelsDeep = levelsDeep;
- fParentGetters = "";
- }
-
- public void setParentGetters(Vector getter,Vector type)
- {
- if(fGetters != null){
- fGetters.clear();
- fTypes.clear();
- }
- addParentGetter(getter,type);
- }
-
-
- /**
- * This function holds some state data that is important in getting the
- * Strings for display of resultant beans
- * @param String getter this is the getter of an attribute
- * The idea is that by the time we get to the simple type
- * we have getAddress().getStreet()....
- */
- public void addParentGetter(String getter, String type)
- {
- if(fGetters == null) fGetters = new Vector();
- if(fTypes == null) fTypes = new Vector();
- fGetters.addElement(getter);
- fTypes.addElement(type);
- }
-
- /*
- * this will be used when passing between two visitors
- *
- */
- public void addParentGetter(Vector getters, Vector types)
- {
- if(fGetters == null) fGetters = new Vector();
- if(fTypes == null) fTypes = new Vector();
- int size = getters.size();
- for(int i = 0; i<size; i++){
- fGetters.addElement(getters.get(i));
- fTypes.addElement(types.get(i));
- }
- }
-
- protected String returnParentGetter(int count)
- {
- if (fGetters == null || count > fGetters.size()) return null;
- return (String)fGetters.get(count);
- }
-
- protected String returnParentGetterType(int count)
- {
- if (fTypes == null || count > fTypes.size()) return null;
- return (String)fTypes.get(count);
- }
-
- protected Vector returnParentGetter()
- {
- if (fGetters == null ) return new Vector();
- return fGetters;
- }
-
- protected Vector returnParentGetterType()
- {
- if (fTypes == null ) return new Vector();
- return fTypes;
- }
-
- protected int getterCount()
- {
- if(fGetters == null) return 0;
- return fGetters.size();
- }
-
-
- /**
- * This function returns some state data that is important in getting the
- * Strings for display of resultant beans
- * @return String the string of getters to this point
- * The idea is that by the time we get to the simple type
- * we have getAddress().getStreet()....
- */
- public String getParentGetters()
- {
- return fParentGetters;
- }
-
- /*
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public IStatus visit (Object object)
- {
- TypeElement element = (TypeElement)object;
-
- if (Boolean.TRUE.equals(element.getPropertyAsObject(TypeElement.NON_INSTANTIABLE)))
- return Status.OK_STATUS;
-
- if (element instanceof SimpleElement) fIsSimple = true;
- else fIsSimple = false;
-
- //this could be a statelessbean need to know
- if (element instanceof BeanElement ){
- BeanElement bean = (BeanElement)element;
- if (bean.isStateLess()) fStateLessBean = true;
- if (bean.getAttrib() == BeanElement.READONLY) fWrite = false;
- }
-
-
-
- //Complex type support
- //first I need to find out how many levels deep
- if(fLevelsDeep == -1){
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- LevelsDeepVisitorAction ldva = new LevelsDeepVisitorAction();
- attributeVisitor.run(element,ldva);
- fLevelsDeep = ldva.getLevelsDeep();
- //check out the fields
- FieldVisitor fieldVisitor = new FieldVisitor();
- LevelsDeepVisitorAction ldva2 = new LevelsDeepVisitorAction();
- fieldVisitor.run(element,ldva2);
-
- if(fLevelsDeep < ldva2.getLevelsDeep())fLevelsDeep = ldva2.getLevelsDeep();
- fLevelsDeep++;
- }
- fColspan = fLevelsDeep - fCurrentLevel;
-
- //if we have a return param with no getter make sure we are on the
- //attribute and not the parameter then return
- if(getReturnParam() && element.getOwningElement() instanceof AttributeElementType &&(((AttributeElementType)element.getOwningElement()).getGetterMethod() == null) ) return Status.OK_STATUS;
-
- //Code gen for all elements
- if(fWrite){
- fbuffer.append("<TR>" + StringUtils.NEWLINE);
- for (int i = 0; i < fCurrentLevel;i++){
- fbuffer.append("<TD WIDTH=\"5%\"></TD>" + StringUtils.NEWLINE);
- }
- fbuffer.append("<TD COLSPAN=\"" + fColspan + "\" ALIGN=\"LEFT\">" + element.getOwningElement().getName() + ":</TD>" + StringUtils.NEWLINE);
- }
- if(fIsSimple || TypeFactory.recognizedBean(element.getName())
- || (getReturnParam() && fStateLessBean)
- || (getReturnParam() && TypeFactory.isRecognizedReturnType(element.getTypeName()))){
- if(getInstanceName().equals("")){
- if(fWrite){
- DataType dataType = TypeFactory.createType(element.getName(),element.getOwningElement().getMUID());
- fbuffer.append(dataType.inputForm(element.getOwningElement().getMUID()));
- }
- }
- else{
- if(getReturnParam() && (TypeFactory.isRecognizedReturnType(element.getTypeName()) || fStateLessBean)){
- DataType dataType = TypeFactory.createType(element.getTypeName(),element.getOwningElement().getMUID());
- String uniqueName = "type" + dataType.getUniqueName();
- fbuffer.append("<TD>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("if(" + getInstanceName() + " != null){" + StringUtils.NEWLINE);
- String afterString = getInstanceName();
- String tmpString = "tebece";
- String prevString = getInstanceName();
- String newTmpString = "";
- for(int i=0;i<getterCount();i++){
- newTmpString = tmpString + i;
- fbuffer.append(returnParentGetterType(i) + " " + newTmpString + "=" + prevString + "." + returnParentGetter(i) + ";" + StringUtils.NEWLINE);
- prevString = newTmpString;
- fbuffer.append("if(" + newTmpString + " != null){" + StringUtils.NEWLINE);
- afterString = newTmpString;
- }
- fbuffer.append(element.getName() + " " + uniqueName + " = " + afterString + "." + ((AttributeElementType)element.getOwningElement()).getGetterMethod()+ ";" + StringUtils.NEWLINE);
- fbuffer.append(dataType.TypeConversion(uniqueName));
- for(int i=0;i<getterCount();i++){
- fbuffer.append("}");
- }
- fbuffer.append("}%>" + StringUtils.NEWLINE);
- fbuffer.append("</TD>" + StringUtils.NEWLINE);
- }
-
- else{
- fbuffer.append("<TD>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("if(" + getInstanceName() + " != null){" + StringUtils.NEWLINE);
- String afterString = getInstanceName();
- String tmpString = "tebece";
- String prevString = getInstanceName();
- String newTmpString = "";
- for(int i=0;i<getterCount();i++){
- newTmpString = tmpString + i;
- fbuffer.append(returnParentGetterType(i) + " " + newTmpString + "=" + prevString + "." + returnParentGetter(i) + ";" + StringUtils.NEWLINE);
- prevString = newTmpString;
- fbuffer.append("if(" + newTmpString + " != null){" + StringUtils.NEWLINE);
- afterString = newTmpString;
- }
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<%=");
- fbuffer.append(afterString + "." + ((AttributeElementType)element.getOwningElement()).getGetterMethod()+ StringUtils.NEWLINE);
- fbuffer.append("%>");
- fbuffer.append("<%");
- for(int i=0;i<getterCount();i++){
- fbuffer.append("}");
- }
- fbuffer.append("}%>" + StringUtils.NEWLINE);
- fbuffer.append("</TD>" + StringUtils.NEWLINE);
- }
- }
-
- }
-
- //Now carry on down the rest of the bean
- else {
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- attributeVisitor.setResidentVector1(returnParentGetter());
- attributeVisitor.setResidentVector2(returnParentGetterType());
- InputFileAttributeGenerator inputFileAttributeGenerator = new InputFileAttributeGenerator(fbuffer,(fCurrentLevel + 1),fLevelsDeep);
- inputFileAttributeGenerator.setReturnParam(getReturnParam());
- inputFileAttributeGenerator.setInstanceName(fInstanceName);
- attributeVisitor.run(element,inputFileAttributeGenerator);
- fbuffer = inputFileAttributeGenerator.getStringBuffer();
-
- //now do fields very similar
- FieldVisitor fieldVisitor = new FieldVisitor();
- fieldVisitor.setResidentVector1(returnParentGetter());
- fieldVisitor.setResidentVector2(returnParentGetterType());
- InputFileAttributeGenerator inputFileAttributeGenerator2 = new InputFileAttributeGenerator(fbuffer,(fCurrentLevel + 1),fLevelsDeep);
- inputFileAttributeGenerator2.setReturnParam(getReturnParam());
- inputFileAttributeGenerator2.setInstanceName(fInstanceName);
- fieldVisitor.run(element,inputFileAttributeGenerator2);
- fbuffer = inputFileAttributeGenerator2.getStringBuffer();
-
-
-
- }
-
-
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java
deleted file mode 100644
index 2f2e1a926..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a LevelsDeepVisitorAction.
-* */
-public class LevelsDeepVisitorAction implements VisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private int fLevelsDeep;
- private int fDeepestLevel;
-
- /**
- * Constructor.
- * This is the starting point
- *
- */
- public LevelsDeepVisitorAction ()
- {
- fLevelsDeep = 0;
- }
-
- /**
- * Constructor.
- * This is the starting point
- *
- */
- public LevelsDeepVisitorAction (int current,boolean increment)
- {
- fLevelsDeep = current;
- if(increment) fLevelsDeep++;
- fDeepestLevel = fLevelsDeep;
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
-
-
- /**
- * The visitor that called this VisitorAction
- * @param visitor the visitor that called this visitor action
- */
- public void setVisitor(Visitor visitor)
- {
- }
-
-
- /**
- * Returns the level of nesting within this bean
- * @return int returns the int number representing the number of nests of this bean
- */
- public int getLevelsDeep()
- {
- return fDeepestLevel;
- }
-
-
- /**
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public IStatus visit (Object object)
- {
- Element element = (Element)object;
- if (element instanceof AttributeElement || element instanceof TypeElement){
- TypeVisitor typeVisitor = new TypeVisitor();
- LevelsDeepVisitorAction lvda = new LevelsDeepVisitorAction(fLevelsDeep,true);
- typeVisitor.run(element,lvda);
-
- if (lvda.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda.getLevelsDeep();
-
- }
- else if (element instanceof BeanElement && !(TypeFactory.recognizedBean(element.getName()))){
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- LevelsDeepVisitorAction lvda = new LevelsDeepVisitorAction(fLevelsDeep,false);
- attributeVisitor.run(element,lvda);
- if (lvda.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda.getLevelsDeep();
-
- FieldVisitor fieldVisitor = new FieldVisitor();
- LevelsDeepVisitorAction lvda2 = new LevelsDeepVisitorAction(fLevelsDeep,false);
- fieldVisitor.run(element,lvda2);
- if (lvda2.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda2.getLevelsDeep();
-
- }
-
- return Status.OK_STATUS;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
deleted file mode 100644
index caec50e47..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class MethodFileGenerator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public String fInputName;
- /**
- * Constructor.
- *
- */
- public MethodFileGenerator (String inputs)
- {
- super();
- fInputName = inputs;
- }
-
- /**
- * Constructor.
- * @param StringBuffer buffer to append codegen
- */
- public MethodFileGenerator (StringBuffer buffer,String inputs)
- {
- super(buffer);
- fInputName = inputs;
- }
-
-
- public void setFileNames(String inputs)
- {
- fInputName = inputs;
- }
-
- //public static String LOCATOR = "Locator";
- public static String BEAN = "Proxy";
- public static String GET = "get";
-
-
- //takes in a bean node
- public IStatus visit (Object object)
- {
- Element beanElement = (Element)object;
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
- fbuffer.append("<HTML>" + StringUtils.NEWLINE + "<HEAD>" + StringUtils.NEWLINE + "<TITLE>Methods</TITLE>" + StringUtils.NEWLINE + "</HEAD>" + StringUtils.NEWLINE + "<BODY>" + StringUtils.NEWLINE + "<H1>Methods</H1>" + StringUtils.NEWLINE + "<UL>" + StringUtils.NEWLINE);
- MethodVisitor methodVisitor = new MethodVisitor();
- MethodFileHelpGenerator methodFileHelpGenerator = new MethodFileHelpGenerator(fbuffer,fInputName);
- methodVisitor.run(beanElement,methodFileHelpGenerator);
- fbuffer = methodFileHelpGenerator.getStringBuffer();
- fbuffer.append("</UL>" + StringUtils.NEWLINE + "</BODY>" + StringUtils.NEWLINE + "</HTML>");
-
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
deleted file mode 100644
index d5d0b7598..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class MethodFileHelpGenerator extends MethodFileGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
- public MethodFileHelpGenerator (StringBuffer buffer,String inputName)
- {
- super(buffer,inputName);
- }
-
-
- //takes in a Method node
- public IStatus visit (Object object)
- {
- Element methodElement = (Element)object;
- MethodElement method = (MethodElement)methodElement;
- if (method.getMethodOmmission()) return Status.OK_STATUS;
-
- fbuffer.append("<LI><A HREF=\"" + fInputName + "?method=" + method.getNumberID());
- fbuffer.append("\" TARGET=\"inputs\"> " + method.getDisplayName());
- fbuffer.append("</A></LI>" + StringUtils.NEWLINE);
-
- return Status.OK_STATUS;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
deleted file mode 100644
index d1866f4e1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060612 145433 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-/**
-* Objects of this class represent a ResultFileAttributeGenerator.
-* */
-public class ResultFileAttributeGenerator extends ResultFileHelp2Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Vector fSetterVector;
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileAttributeGenerator (StringBuffer buffer)
- {
- super(buffer);
-
- }
-
- /**
- * Setter vector
- */
- public Vector getSetterVector()
- {
- return fSetterVector;
- }
-
-
- /**
- * Visit Method generates code for this Visitor
- * @param Parameter parameter code will be generated
- */
- public IStatus visit (Object object)
- {
- AttributeElementType attributeElementType = (AttributeElementType)object;
- if(attributeElementType.getSetterMethod() == null) return Status.OK_STATUS;
- BasicElement element = (BasicElement)object;
- if(attributeElementType.getTypeElement().isSimple() || TypeFactory.recognizedBean(attributeElementType.getTypeElement().getName())){
- //start the codegen
- //ask the datatype for its request line, it may need mark up or not.
- //ie For the simple types we need the mark up
- //for the dom element we cant use it.
- DataType dataType = TypeFactory.createType(attributeElementType.getTypeElement().getName(),element.getMUID());
- setTypeOwnerId(idName(element.getName()));
- fbuffer.append(dataType.getRequestCode(element.getMUID(),getTypeOwnerId()));
-
- }
-
- TypeVisitor typeVisitor = new TypeVisitor();
- ResultFileTypeGenerator resultFileTypeGenerator = new ResultFileTypeGenerator(fbuffer);
- resultFileTypeGenerator.setNumberFactory(getNumberFactory());
- resultFileTypeGenerator.setTypeOwnerId(getTypeOwnerId());
-
- typeVisitor.run(attributeElementType,resultFileTypeGenerator);
- setNumberFactory(resultFileTypeGenerator.getNumberFactory());
- Vector setterInputs = resultFileTypeGenerator.getResidentVector();
- putResidentVector(attributeElementType.getSetterSignature((String)setterInputs.firstElement()));
-
- return Status.OK_STATUS;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
deleted file mode 100644
index 0427721f0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060523 142296 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class ResultFileGenerator extends Generator
-{
- public static String TRIPLE_TAB = Generator.DOUBLE_TAB + Generator.TAB;
- public static String QUAD_TAB = Generator.DOUBLE_TAB + Generator.DOUBLE_TAB;
-
- private String setEndpointMethod;
-
- /**
- * Constructor.
- *
- */
- public ResultFileGenerator ()
- {
- super();
- }
-
- /**
- * Constructor.
- *
- */
- public ResultFileGenerator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- //takes in a bean node
- public IStatus visit (Object object)
- {
- Element beanElement = (Element)object;
- BeanElement bean = (BeanElement)beanElement;
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>"+ StringUtils.NEWLINE);
- fbuffer.append("<% request.setCharacterEncoding(\"UTF-8\"); %>"+ StringUtils.NEWLINE);
- fbuffer.append("<HTML>" + StringUtils.NEWLINE);
- fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<TITLE>Result</TITLE>" + StringUtils.NEWLINE);
- fbuffer.append("</HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<BODY>" + StringUtils.NEWLINE);
- fbuffer.append("<H1>Result</H1>" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
- fbuffer.append("<jsp:useBean id=\""+ getSessionBeanId() + "\" scope=\"session\" class=\"");
- fbuffer.append(bean.getName() + "\" />" + StringUtils.NEWLINE);
- if (setEndpointMethod != null && setEndpointMethod.length() > 0)
- {
- fbuffer.append("<%");
- fbuffer.append(StringUtils.NEWLINE);
- fbuffer.append("if (request.getParameter(\"endpoint\") != null && request.getParameter(\"endpoint\").length() > 0)");
- fbuffer.append(StringUtils.NEWLINE);
- fbuffer.append(getSessionBeanId());
- fbuffer.append(".");
- int index = setEndpointMethod.indexOf('?');
- if (index != -1)
- {
- fbuffer.append(setEndpointMethod.substring(0, index));
- fbuffer.append("(new ");
- fbuffer.append(setEndpointMethod.substring(index+1, setEndpointMethod.length()));
- fbuffer.append("(request.getParameter(\"endpoint\")));");
- }
- else
- {
- fbuffer.append(setEndpointMethod);
- fbuffer.append("(request.getParameter(\"endpoint\"));");
- }
- fbuffer.append(StringUtils.NEWLINE);
- fbuffer.append("%>");
- fbuffer.append(StringUtils.NEWLINE);
- }
- fbuffer.append(StringUtils.NEWLINE);
-
- //carry on with regular gorp
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("String method = request.getParameter(\"method\");" + StringUtils.NEWLINE);
- fbuffer.append("int methodID = 0;" + StringUtils.NEWLINE);
- fbuffer.append("if (method == null) methodID = -1;" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
- fbuffer.append("if(methodID != -1) methodID = Integer.parseInt(method);" + StringUtils.NEWLINE);
- fbuffer.append("boolean gotMethod = false;" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
- fbuffer.append("try {" + StringUtils.NEWLINE);
- fbuffer.append("switch (methodID){ " + StringUtils.NEWLINE);
-
- // go to the next generator
- MethodVisitor methodVisitor = new MethodVisitor();
- ResultFileHelp1Generator resultFileHelp1Generator = new ResultFileHelp1Generator(fbuffer);
- resultFileHelp1Generator.setNumberFactory(getNumberFactory());
- resultFileHelp1Generator.setClientFolderPath(getClientFolderPath());
- methodVisitor.run(beanElement,resultFileHelp1Generator);
- setNumberFactory(resultFileHelp1Generator.getNumberFactory());
-
- fbuffer = resultFileHelp1Generator.getStringBuffer();
-
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("} catch (Exception e) { " + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("exception: <%= e %>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("return;" + StringUtils.NEWLINE);
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("if(!gotMethod){" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("result: N/A" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("</BODY>" + StringUtils.NEWLINE);
- fbuffer.append("</HTML>");
-
- return Status.OK_STATUS;
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public void setSetEndpointMethod(String setEndpointMethod)
- {
- this.setEndpointMethod = setEndpointMethod;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java
deleted file mode 100644
index a1677f788..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ReturnParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a ResultFilegenerator.
-* */
-public class ResultFileHelp1Generator extends ResultFileGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final int INITIAL_STATE = 1;
- public static final int FINAL_STATE = 2;
- public static final String MTEMP = "mtemp";
- public static String BEAN = "Proxy";
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileHelp1Generator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- /**
- * Visit Method generates code for this Visitor
- * @param method method code will be generated for
- */
- public IStatus visit (Object object)
- {
- Element methodElement = (Element)object;
-
-
- MethodElement method = (MethodElement)methodElement;
- if (method.getMethodOmmission()) return Status.OK_STATUS;
-
- fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
- visitHelper(method);
-
- fbuffer.append("break;" + StringUtils.NEWLINE);
-
- return Status.OK_STATUS;
- }
- /**
- * Helps out the visitor
- * @param method method code will be generated for
- */
- public void visitHelper (Element methodElement)
- {
-
- fbuffer.append(Generator.DOUBLE_TAB + "gotMethod = true;" + StringUtils.NEWLINE);
-
- MethodElement method = (MethodElement)methodElement;
- // go to the next generator
- ResultFileHelp2Generator resultFileHelp2Generator = new ResultFileHelp2Generator(fbuffer);
- resultFileHelp2Generator.setNumberFactory(getNumberFactory());
- ParameterVisitor parameterVisitor = new ParameterVisitor();
- parameterVisitor.run(methodElement,resultFileHelp2Generator);
- fbuffer = resultFileHelp2Generator.getStringBuffer();
- setNumberFactory(resultFileHelp2Generator.getNumberFactory());
- // we must now grab the state data from the resident vector
- setResidentVector(resultFileHelp2Generator.getResidentVector());
-
-
- //there is no return type if void occurs
-
-
- if (method.getReturnParameterElement().getTypeElement().getName().equals("void"))
- fbuffer.append(Generator.DOUBLE_TAB + getSessionBeanId() + "." +method.getName() + "(");
-
- else{
- fbuffer.append(Generator.DOUBLE_TAB + method.getReturnParameterElement().getTypeElement().getName() + Generator.SPACE + method.getMUID() + MTEMP + Generator.SPACE);
- fbuffer.append("=" + Generator.SPACE + getSessionBeanId() + "." + method.getName() + "(");
- }
-
- Enumeration e = fResidentVector.elements();
- while (e.hasMoreElements()){
- fbuffer.append((String)e.nextElement());
- if (e.hasMoreElements())
- fbuffer.append(",");
- }
- fbuffer.append(");" + StringUtils.NEWLINE);
- if (!method.getReturnParameterElement().getTypeElement().getName().equals("void") && !method.getReturnParameterElement().getTypeElement().isPrimitive()){
- //in case our result is null
- fbuffer.append("if(" + method.getMUID() + "mtemp == null){" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<%=" + method.getMUID() + "mtemp %>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("}else{" + StringUtils.NEWLINE);
- }
-
- //now lets display the return bean
- // if it is simple we dont need to use the generator
-
- if (!method.getReturnParameterElement().getTypeElement().getName().equals("void")){
- if (method.getReturnParameterElement().getTypeElement().isSimple()
- || TypeFactory.recognizedBean(method.getReturnParameterElement().getTypeElement().getName())
- || TypeFactory.isStateLessBean(method.getReturnParameterElement().getTypeElement().getTypeName())
- || TypeFactory.isRecognizedReturnType(method.getReturnParameterElement().getTypeElement().getTypeName())){
- DataType dataType = TypeFactory.createType(method.getReturnParameterElement().getTypeElement().getTypeName(),method.getReturnParameterElement().getMUID());
- fbuffer.append(dataType.TypeConversion(method.getMUID() + MTEMP));
- }
- else{
- fbuffer.append("%>" + StringUtils.NEWLINE);
- InputFileHelp2Generator inputFileHelp2Generator = new InputFileHelp2Generator(fbuffer);
- inputFileHelp2Generator.setInstanceName(method.getMUID() + MTEMP);
- inputFileHelp2Generator.setReturnParam(true);
- ReturnParameterVisitor returnParameterVisitor = new ReturnParameterVisitor();
- returnParameterVisitor.run(method,inputFileHelp2Generator);
- fbuffer = inputFileHelp2Generator.getStringBuffer();
- fbuffer.append("<%" + StringUtils.NEWLINE);
-
- }
- }
-
- if (!method.getReturnParameterElement().getTypeElement().getName().equals("void") && !method.getReturnParameterElement().getTypeElement().isPrimitive()) fbuffer.append("}" + StringUtils.NEWLINE);
-
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
deleted file mode 100644
index b12280718..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-/**
-* Objects of this class represent a ResultFileHelp2generator.
-* */
-public class ResultFileHelp2Generator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String fTypeOwnerId;
-
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileHelp2Generator (StringBuffer buffer)
- {
- super(buffer);
-
- }
-
- /**
- * Visit Method generates code for this Visitor
- * @param Parameter parameter code will be generated
- */
- public IStatus visit (Object object)
- {
-
-
- ParameterElement parameterElement = (ParameterElement)object;
- parameterElement.getTypeElement();
- if(parameterElement.getTypeElement().isSimple() || TypeFactory.recognizedBean(parameterElement.getTypeElement().getName())){
- //start the codegen
- //ask the datatype for its request line, it may need mark up or not.
- //ie For the simple types we need the mark up
- //for the dom element we cant use it.
- DataType dataType = TypeFactory.createType(parameterElement.getTypeElement().getName(),parameterElement.getMUID());
- setTypeOwnerId(idName(parameterElement.getName()));
- fbuffer.append(dataType.getRequestCode(parameterElement.getMUID(),getTypeOwnerId()));
- }
-
- //visit the type generator
- ResultFileTypeGenerator resultFileTypeGenerator = new ResultFileTypeGenerator(fbuffer);
- resultFileTypeGenerator.setNumberFactory(getNumberFactory());
- resultFileTypeGenerator.setTypeOwnerId(getTypeOwnerId());
- TypeVisitor TypeVisitor = new TypeVisitor();
- TypeVisitor.run(parameterElement,resultFileTypeGenerator);
- fbuffer = resultFileTypeGenerator.getStringBuffer();
- setNumberFactory(resultFileTypeGenerator.getNumberFactory());
- String name = (String)resultFileTypeGenerator.getResidentVector().firstElement();
- putResidentVector(name);
-
- return Status.OK_STATUS;
- }
-
-
- public String getTypeOwnerId()
- {
- if (fTypeOwnerId == null) fTypeOwnerId = "";
- return fTypeOwnerId;
- }
-
- public void setTypeOwnerId(String name)
- {
- fTypeOwnerId = name;
- }
-
- public String idName(String name)
- {
-
- String uniqueNum = String.valueOf(getUniqueNumber());
- String newName = name.replace('.','1') + "_" +uniqueNum + "id";
- return newName;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
deleted file mode 100644
index d60d89799..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070410 180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- * 20071110 209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-/**
-* Objects of this class represent a ResultFileHelp2generator.
-* */
-public class ResultFileTypeGenerator extends ResultFileHelp2Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-
- public String fTypeIdName;
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileTypeGenerator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- /**
- * Visit Method generates code for this Visitor
- * @param Parameter parameter code will be generated
- */
- public IStatus visit (Object object)
- {
- Element typeElement = (Element)object;
- TypeElement type = (TypeElement)typeElement;
- // right now we only have simple to worry about
- if(type.isSimple() || TypeFactory.recognizedBean(type.getName())){
- // create the type that represents the simple type name
- DataType dataType = TypeFactory.createType(type.getName(),type.getOwningElement().getMUID());
-
- String nodeName = getTypeOwnerId()+ "Temp";
- if(!type.isPrimitive()){
-
- fbuffer.append(Generator.DOUBLE_TAB + Generator.TAB + type.getName() + " " + nodeName + " = null;" + StringUtils.NEWLINE);
- fbuffer.append(Generator.DOUBLE_TAB + "if(!" + getTypeOwnerId() + ".equals(\"\")){" + StringUtils.NEWLINE);
- fbuffer.append(dataType.stringConversion("",nodeName,getTypeOwnerId()));
- fbuffer.append(Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE);
- }
- else
- fbuffer.append(dataType.stringConversion(type.getName(),nodeName,getTypeOwnerId()));
-
- putResidentVector(nodeName);
- }
-
- else {
- //must be complex
- String typeName = typeElement.getName();
- fTypeIdName = idName(typeName);
-
- if (!Boolean.TRUE.equals(typeElement.getPropertyAsObject(TypeElement.NON_INSTANTIABLE))) {
-
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- ResultFileAttributeGenerator resultFileAttributeGenerator = new ResultFileAttributeGenerator(fbuffer);
- resultFileAttributeGenerator.setNumberFactory(getNumberFactory());
- attributeVisitor.run(typeElement,resultFileAttributeGenerator);
- setNumberFactory(resultFileAttributeGenerator.getNumberFactory());
- fbuffer = resultFileAttributeGenerator.getStringBuffer();
-
- FieldVisitor fieldVisitor = new FieldVisitor();
- ResultFileAttributeGenerator resultFileAttributeGenerator2 = new ResultFileAttributeGenerator(fbuffer);
- resultFileAttributeGenerator2.setNumberFactory(getNumberFactory());
- fieldVisitor.run(typeElement,resultFileAttributeGenerator2);
- setNumberFactory(resultFileAttributeGenerator2.getNumberFactory());
- fbuffer = resultFileAttributeGenerator2.getStringBuffer();
-
-
- fbuffer.append(Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE);
- fbuffer.append(Generator.DOUBLE_TAB + "<jsp:useBean id=\"" + fTypeIdName + "\" scope=\"session\" class=\"" + typeName + "\" />" + StringUtils.NEWLINE);
- fbuffer.append(Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE);
-
- Enumeration e = resultFileAttributeGenerator.getResidentVector().elements();
- while(e.hasMoreElements()){
- fbuffer.append(Generator.DOUBLE_TAB + fTypeIdName + "." + e.nextElement() + StringUtils.NEWLINE);
- }
-
- Enumeration e2 = resultFileAttributeGenerator2.getResidentVector().elements();
- while(e2.hasMoreElements()){
- fbuffer.append(Generator.DOUBLE_TAB + fTypeIdName + "." + e2.nextElement() + StringUtils.NEWLINE);
- }
- }
- else
- fbuffer.append(Generator.DOUBLE_TAB + typeName + " " + fTypeIdName + " = null;"+ StringUtils.NEWLINE);
-
- putResidentVector(fTypeIdName);
- //end of changes
-
- }
-
- return Status.OK_STATUS;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
deleted file mode 100644
index 04714bbdd..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* Objects of this class represent a TestClientFilegenerator.
-* */
-public class TestClientFileGenerator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public String fMethodName;
- public String fInputName;
- public String fResultName;
-
- /**
- * Constructor.
- *
- */
- public TestClientFileGenerator (String inputs, String methods, String results)
- {
- super();
- fInputName = inputs;
- fMethodName = methods;
- fResultName = results;
- }
-
- public void setFileNames(String inputs, String methods, String results)
- {
- fInputName = inputs;
- fMethodName = methods;
- fResultName = results;
- }
-
- //takes in a bean node
- public IStatus visit (Object object)
- {
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
- fbuffer.append("<HTML>" + StringUtils.NEWLINE);
- fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<TITLE>Web Services Test Client</TITLE>" + StringUtils.NEWLINE);
- fbuffer.append("</HEAD>" + StringUtils.NEWLINE + "");
- fbuffer.append("<FRAMESET COLS=\"220,*\">" + StringUtils.NEWLINE);
- fbuffer.append("<FRAME SRC=\""+ fMethodName + "\" NAME=\"methods\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
- fbuffer.append("<FRAMESET ROWS=\"80%,20%\">" + StringUtils.NEWLINE);
- fbuffer.append("<FRAME SRC=\""+ fInputName + "\" NAME=\"inputs\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
- fbuffer.append("<%").append(StringUtils.NEWLINE);
- fbuffer.append("StringBuffer resultJSP = new StringBuffer(\"").append(fResultName).append("\");").append(StringUtils.NEWLINE);
- fbuffer.append("resultJSP.append(\"?\");").append(StringUtils.NEWLINE);
- fbuffer.append("java.util.Enumeration resultEnum = request.getParameterNames();");
- fbuffer.append("while (resultEnum.hasMoreElements()) {").append(StringUtils.NEWLINE);
- fbuffer.append("Object resultObj = resultEnum.nextElement();").append(StringUtils.NEWLINE);
- fbuffer.append("resultJSP.append(resultObj.toString()).append(\"=\").append(request.getParameter(resultObj.toString())).append(\"&\");").append(StringUtils.NEWLINE);
- fbuffer.append("}").append(StringUtils.NEWLINE);
- fbuffer.append("%>").append(StringUtils.NEWLINE);
- fbuffer.append("<FRAME SRC=\"<%=resultJSP.toString()%>\" NAME=\"result\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
- fbuffer.append("</FRAMESET>" + StringUtils.NEWLINE);
-
-
- fbuffer.append("<NOFRAMES>" + StringUtils.NEWLINE);
- fbuffer.append("<BODY>" + StringUtils.NEWLINE);
- fbuffer.append("The Web Services Test Client requires a browser that supports frames." + StringUtils.NEWLINE);
- fbuffer.append("</BODY>" + StringUtils.NEWLINE);
- fbuffer.append("</NOFRAMES>" + StringUtils.NEWLINE);
- fbuffer.append("</FRAMESET>" + StringUtils.NEWLINE);
- fbuffer.append("</HTML>");
-
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
deleted file mode 100644
index d1d7f87c5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.command;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-/**
- * MofToBeanModelCommand
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class GeneratePageCommand extends AbstractDataModelOperation
-{
-
-private Model model_;
-private Generator fGenerator;
-private IFile fIFile;
-private ResourceContext resourceContext_;
-private StringBuffer fStringBuffer;
-
-/**
- * Build constructor comment.
- */
-public GeneratePageCommand()
-{
-}
-
-/**
-* Constructor
-* This command will generate code from a Model
-* @param model The model to be traversed
-* @param generator The code generator to be used
-* @param resource the resource to place the finished product
-*/
-public GeneratePageCommand(ResourceContext context, Model model, Generator generator, IFile file)
-{
- model_ = model;
- fGenerator = generator;
- fIFile = file;
- resourceContext_ = context;
-}
-
-public Model getJavaDataModel()
-{
- return model_;
-}
-
-/**
- *
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
- try {
- fGenerator.visit(model_.getRootElement());
- fStringBuffer = fGenerator.getStringBuffer();
- String tempString = fStringBuffer.toString();
- OutputStream fileResource = FileResourceUtils.newFileOutputStream(resourceContext_, fIFile.getFullPath(), monitor, env.getStatusHandler());
- //PrintStream ps = new PrintStream(fileResource);
- //ps.print(tempString);
- OutputStreamWriter osw = new OutputStreamWriter(fileResource,"UTF-8");
- osw.write(tempString,0,fStringBuffer.length());
- osw.close();
- fileResource.close();
- return status;
- } catch (IOException ioexc) {
- status = StatusUtils.errorStatus( ioexc );
- return status;
- }
-}
-
-public void setRootElement(Element rootElement)
-{
-}
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
deleted file mode 100644
index b40810432..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.command;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions.JavaMofBeanVisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* This is the base class for commands that need to report progress
-* and status during and after their execution. This class extends
-* {@link org.eclipse.emf.common.command.AbstractCommand AbstractCommand}
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-* with methods to {@link #setProgressMonitor set}
-* and {@link #getProgressMonitor get} a progress monitor,
-* and to get a status object {@link #getReadyStatus before}
-* or {@link #getResultStatus after} execution.
-* <p>
-* Note that the responsibility of providing an
-* {@link org.eclipse.core.runtime.IProgressMonitor IProgressMonitor}
-* rests with frameworks that construct or run ProgressCommand objects,
-* whereas the responsibility of providing an
-* {@link org.eclipse.core.runtime.IStatus IStatus}
-* object lies with the subclasses of ProgressCommand.
-* Subclasses must follow the rules described for
-* {@link org.eclipse.emf.common.command.AbstractCommand AbstractCommand}.
-*/
-public class JavaToModelCommand extends AbstractDataModelOperation
-{
-
- private String clientProject;
- private BooleanSelection[] methods;
- private String proxyBean;
- private JavaClass javaClass;
- private Model model;
- private Element parentElement;
-
- public JavaToModelCommand ()
- {
- }
-
-
- private IStatus createJavaReflection(IEnvironment env, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- JavaMofReflectionCommand javaMofReflectionCommand = new JavaMofReflectionCommand();
- javaMofReflectionCommand.setClientProject(clientProject);
- javaMofReflectionCommand.setProxyBean(proxyBean);
- javaMofReflectionCommand.setEnvironment( env );
- //javaMofReflectionCommand.setStatusMonitor(getStatusMonitor());
- status = javaMofReflectionCommand.execute( monitor, null);
- javaClass = (JavaClass)javaMofReflectionCommand.getJavaClass();
- return status;
- }
-
- /**
- * The Model that was created from this javamof
- * @return Model The data model that was created
- **/
- public Model getJavaDataModel()
- {
- return model;
- }
-
- /**
- * Build the datamodel from the mof
- */
- public IStatus buildModelFromMof (IEnvironment env) throws CoreException
- {
-
- Choice OKChoice = new Choice('O', ConsumptionMessages.LABEL_OK, ConsumptionMessages.DESCRIPTION_OK);
- Choice CancelChoice = new Choice('C', ConsumptionMessages.LABEL_CANCEL, ConsumptionMessages.DESCRIPTION_CANCEL);
-
- // we could have one of three cases:
- //1. The model is null meaning we want and the parent element is null, meaning we want to
- // create a brand new model and make this bean its root
- //2. The model is null but the parentElement is not, meaning we want to add the Bean to the
- // given parent element
- //3. The model is not null however the parentElement is, meaning we want to add this Bean to
- // This model but dont attach it to anything
- IStatus status = Status.OK_STATUS;
-
- if(model == null && parentElement == null){
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(clientProject,methods, env);
- //beanVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- model = beanVisitorAction.getModel();
-
- }
- else if (model == null && parentElement != null){
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(parentElement,clientProject, env);
- //beanVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- model = beanVisitorAction.getModel();
- }
- else {
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(model,clientProject, env);
- //beanVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SAMPLE_CREATION_CANCELED );
- }
-
- }
- //
- model = beanVisitorAction.getModel();
- }
-
- return status;
- }
-
- /**
- * Get the java model from the resource then
- * build the model from the mof
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- if(clientProject == null) return status;
-
- status = createJavaReflection(env, monitor);
- if (status.getSeverity()==Status.ERROR) return status;
- try{
- status = buildModelFromMof(env);
- return status;
- }catch(CoreException exc){
- IStatus embeddedStatus = exc.getStatus();
- status = embeddedStatus;
- return status;
- }
-
- }
-
- public void setMethods(BooleanSelection[] methods)
- {
- this.methods = methods;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- public void setParentElement(Element parentElement)
- {
- this.parentElement = parentElement;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
deleted file mode 100644
index 74f4b0115..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.common;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-
-
-/**
-* Objects of this class represent a PropertyDescriptor.
-* */
-public class SamplePropertyDescriptor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Method fReadMethod;
- private Method fWriteMethod;
- private String fPropertyName;
- private JavaHelpers fPropertyType;
- private boolean fStatic;
-
- /*
- * Constructor
- **/
- public SamplePropertyDescriptor(String name)
- {
- fPropertyName = name;
- }
-
- /*
- * set the ReadMethod
- */
- public void setReadMethod(Method readMethod)
- {
- fReadMethod = readMethod;
- }
-
- /*
- * get the ReadMethod
- */
- public Method getReadMethod()
- {
- return fReadMethod;
- }
-
- /*
- * set the writeMethod
- */
- public void setWriteMethod(Method writeMethod)
- {
- fWriteMethod = writeMethod;
- }
-
- /*
- * get the writeMethod
- */
- public Method getWriteMethod()
- {
- return fWriteMethod;
- }
-
- /*
- * set the propertyName
- */
- public void setName(String name)
- {
- fPropertyName= name;
- }
-
- /*
- * get the propertyName
- */
- public String getName()
- {
- return fPropertyName;
- }
-
- /*
- * set the PropertyType
- */
- public void setPropertyType(JavaHelpers propertyType)
- {
- fPropertyType = propertyType;
- }
-
- /*
- * get the PropertyType
- */
- public JavaHelpers getPropertyType()
- {
- return fPropertyType;
- }
-
- public boolean isfStatic()
- {
- return fStatic;
- }
-
- public void setfStatic(boolean fStatic)
- {
- this.fStatic = fStatic;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
deleted file mode 100644
index 7ea7ff5f7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import java.util.List;
-
-public interface IWSFinder
-{
- public String getID();
- public void setID(String id);
-
- public String getName();
- public void setName(String name);
-
- public String getDescription();
- public void setDescription(String desc);
-
- public List find();
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
deleted file mode 100644
index 75614bb48..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-
-public class LiveWSDLFilter extends Thread
-{
- private String wsdlURL_;
- private boolean finish_;
- private boolean live_;
-
- public LiveWSDLFilter(String wsdlURL)
- {
- wsdlURL_ = wsdlURL;
- finish_ = false;
- live_ = false;
- }
-
- public String getWSDLURL()
- {
- return wsdlURL_;
- }
-
- public boolean isFinish()
- {
- return finish_;
- }
-
- public boolean isWSDLLive()
- {
- return live_;
- }
-
- public void run()
- {
- try
- {
- live_ = validateWSDL();
- }
- catch (Throwable t)
- {
- live_ = false;
- }
- finally
- {
- finish_ = true;
- }
- }
-
- private boolean validateWSDL() throws WSDLException, MalformedURLException, IOException, WWWAuthenticationException
- {
- WebServicesParserExt parser = new WebServicesParserExt();
- Definition definition = parser.getWSDLDefinitionVerbose(wsdlURL_);
- Map services = definition.getServices();
- Iterator serviceIterator = services.values().iterator();
- while (serviceIterator.hasNext())
- {
- Service service = (Service)serviceIterator.next();
- Map ports = service.getPorts();
- Iterator portIterator = ports.values().iterator();
- while (portIterator.hasNext())
- {
- Port port = (Port)portIterator.next();
- List extensibilityElements = port.getExtensibilityElements();
- Iterator extensibilityElementsIterator = extensibilityElements.iterator();
- while (extensibilityElementsIterator.hasNext())
- {
- ExtensibilityElement extensibilityElement = (ExtensibilityElement)extensibilityElementsIterator.next();
- if ((extensibilityElement instanceof SOAPAddress) || (extensibilityElement instanceof HTTPAddress))
- return true;
- }
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
deleted file mode 100644
index 1bbf27aaf..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class WSFinderRegistry
-{
- private static WSFinderRegistry instance_;
- private Vector wsfinders_;
-
- private WSFinderRegistry()
- {
- wsfinders_ = new Vector();
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WSFinderRegistry object.
- */
- public static WSFinderRegistry getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new WSFinderRegistry();
- instance_.init();
- }
- return instance_;
- }
-
- private void init()
- {
- IExtensionRegistry pluginReg = Platform.getExtensionRegistry();
- IConfigurationElement[] configElements = pluginReg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "wsfinder");
- for (int i = 0; i < configElements.length; i++)
- {
- try
- {
- Object object = configElements[i].createExecutableExtension("class");
- if (object instanceof IWSFinder)
- {
- IWSFinder wsfinder = (IWSFinder)object;
- wsfinder.setID(configElements[i].getAttribute("id"));
- wsfinder.setName(configElements[i].getAttribute("name"));
- wsfinder.setDescription(configElements[i].getAttribute("description"));
- wsfinders_.add(wsfinder);
- }
- }
- catch (CoreException ce)
- {
- }
- }
- }
-
- public List getWSFinders()
- {
- return wsfinders_;
- }
-
- public List getWebServices()
- {
- List ws = new Vector();
- List wsFinders = getWSFinders();
- for (Iterator it = wsFinders.iterator(); it.hasNext();)
- {
- IWSFinder wsFinder = (IWSFinder)it.next();
- ws.addAll(wsFinder.find());
- }
- return ws;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
deleted file mode 100644
index 97ea2bdd9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class DomElementHelper {
-
-
- public static org.w3c.dom.Element createDomElementFromXMLString(java.lang.String xmlString )
- {
- java.io.StringReader stringReader = new java.io.StringReader(xmlString);
- org.xml.sax.InputSource inputSource = new org.xml.sax.InputSource(stringReader);
- try
- {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- Document document = docBuilder.parse(inputSource);
- return document.getDocumentElement();
- }
- catch (Throwable t)
- {
- return null;
- }
- }
-
- public static java.lang.String domWriter(org.w3c.dom.Node node,java.lang.StringBuffer buffer)
- {
- if ( node == null ) {
- return "";
- }
- int type = node.getNodeType();
- switch ( type ) {
- case org.w3c.dom.Node.DOCUMENT_NODE: {
- buffer.append(JspUtils.markup("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + "<br>");
- domWriter(((org.w3c.dom.Document)node).getDocumentElement(),buffer);
- break;
- }
- case org.w3c.dom.Node.ELEMENT_NODE: {
- buffer.append(JspUtils.markup("<" + node.getNodeName()));
- org.w3c.dom.Attr attrs[] = sortAttributes(node.getAttributes());
- for ( int i = 0; i < attrs.length; i++ ) {
- org.w3c.dom.Attr attr = attrs[i];
- buffer.append(" " + attr.getNodeName() + "=\"" + JspUtils.markup(attr.getNodeValue()) + "\"");
- }
- buffer.append(JspUtils.markup(">"));
- org.w3c.dom.NodeList children = node.getChildNodes();
- if ( children != null ) {
- int len = children.getLength();
- for ( int i = 0; i < len; i++ ) {
- if(((org.w3c.dom.Node)children.item(i)).getNodeType() == org.w3c.dom.Node.ELEMENT_NODE)
- buffer.append("<br>");
- domWriter(children.item(i),buffer);
- }
- }
- buffer.append(JspUtils.markup("</" + node.getNodeName() + ">"));
- break;
- }
- case org.w3c.dom.Node.ENTITY_REFERENCE_NODE: {
- org.w3c.dom.NodeList children = node.getChildNodes();
- if ( children != null ) {
- int len = children.getLength();
- for ( int i = 0; i < len; i++ )
- {
- buffer.append(children.item(i));
- }
- }
- break;
- }
- case org.w3c.dom.Node.CDATA_SECTION_NODE: {
- buffer.append(JspUtils.markup(node.getNodeValue()));
- break;
- }
- case org.w3c.dom.Node.TEXT_NODE:{
- buffer.append(JspUtils.markup(node.getNodeValue()));
- break;
- }
- case org.w3c.dom.Node.PROCESSING_INSTRUCTION_NODE:{
- buffer.append(JspUtils.markup("<?"));
- buffer.append(node.getNodeName());
- String data = node.getNodeValue();
- if ( data != null && data.length() > 0 ){
- buffer.append(" ");
- buffer.append(data);
- }
- buffer.append(JspUtils.markup("?>"));
- break;
- }
- }
- return buffer.toString();
- }
-
- public static org.w3c.dom.Attr[] sortAttributes(org.w3c.dom.NamedNodeMap attrs)
- {
- int len = (attrs != null) ? attrs.getLength() : 0;
- org.w3c.dom.Attr array[] = new org.w3c.dom.Attr[len];
- for ( int i = 0; i < len; i++ ){
- array[i] = (org.w3c.dom.Attr)attrs.item(i);
- }
- for ( int i = 0; i < len - 1; i++ ) {
- String name = array[i].getNodeName();
- int index = i;
- for ( int j = i + 1; j < len; j++ ) {
- String curName = array[j].getNodeName();
- if ( curName.compareTo(name) < 0 ) {
- name = curName;
- index = j;
- }
- }
- if ( index != i ) {
- org.w3c.dom.Attr temp = array[i];
- array[i] = array[index];
- array[index] = temp;
- }
- }
- return (array);
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
deleted file mode 100644
index abb9013e9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class JspUtils {
- public static String markup(String text) {
- if (text == null) {
- return null;
- }
-
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; i < text.length(); i++) {
- char c = text.charAt(i);
- switch (c) {
- case '<':
- buffer.append("&lt;");
- break;
- case '&':
- buffer.append("&amp;");
- break;
- case '>':
- buffer.append("&gt;");
- break;
- case '"':
- buffer.append("&quot;");
- break;
- default:
- buffer.append(c);
- break;
- }
- }
- return buffer.toString();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
deleted file mode 100644
index 18030062b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005,2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 123963 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-package org.eclipse.jst.ws.util;
-
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.SAXException;
-
-/**
- * @author gilberta
- */
-public class SoapElementHelper
-{
- public static javax.xml.soap.SOAPElement createSOAPElementFromXMLString(String xmlString) throws ParserConfigurationException, IOException, SAXException
- {
- java.io.StringReader stringReader = new java.io.StringReader(xmlString);
- org.xml.sax.InputSource inputSource = new org.xml.sax.InputSource(stringReader);
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setNamespaceAware(true);
- SAXParser parser = factory.newSAXParser();
- SoapElementSaxHandler handler = new SoapElementSaxHandler();
- parser.parse(inputSource,handler);
- return handler.getSOAPElement();
- }
-
- public static java.lang.String soapElementWriter(javax.xml.soap.SOAPElement node,java.lang.StringBuffer buffer)
- {
- if (node == null ) {
- return "";
- }
-
- buffer.append(JspUtils.markup("<" + node.getElementName().getLocalName()));
- java.util.Iterator attrs = node.getAllAttributes();
- while(attrs.hasNext()) {
- javax.xml.soap.Name attr = (javax.xml.soap.Name)attrs.next();
- buffer.append(" " + attr.getQualifiedName() + "=\"" + JspUtils.markup(node.getAttributeValue(attr)) + "\"");
- }
- buffer.append(JspUtils.markup(">"));
- java.util.Iterator children = node.getChildElements();
- if ( children != null ) {
- while(children.hasNext()){
- javax.xml.soap.Node childNode = (javax.xml.soap.Node)children.next();
- if(childNode instanceof javax.xml.soap.SOAPElement){
- buffer.append("<br>");
- soapElementWriter((javax.xml.soap.SOAPElement)childNode,buffer);
- }
- else
- buffer.append(JspUtils.markup(((javax.xml.soap.Text)childNode).getValue()));
- }
- buffer.append(JspUtils.markup("</" + node.getElementName().getLocalName() + ">"));
- }
- return buffer.toString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java
deleted file mode 100644
index 0d670fe3c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class SoapElementRuntimeException extends Exception {
-
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3761693372674748471L;
-
-public SoapElementRuntimeException(String message){
- super(message);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java
deleted file mode 100644
index 26bbf6e30..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 123963 andyzhai@ca.ibm.com - Andy Zhai
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * @author xinzhai
- */
-public class SoapElementSaxHandler extends DefaultHandler
-{
- //Stores all values of pairs of prefix and URI in the document
- private HashMap prefixURIMapping = new HashMap();
- //Stores a list of URIs for a particular SOAP element
- private ArrayList uris = new ArrayList();
- //Represents the whole(root) SOAP document
- private SOAPElement rootElement = null;
- //Represents the current SOAP element where SAX parser is reading
- private SOAPElement currentElement = null;
- private SOAPFactory soapFactory;
-
- public SOAPElement getSOAPElement()
- {
- return rootElement;
- }
-
- public void startDocument() throws SAXException
- {
- try
- {
- soapFactory = SOAPFactory.newInstance();
- }
- catch (SOAPException e)
- {
- throw new SAXException("Can't create a SOAPFactory instance", e);
- }
- }
-
- public void startPrefixMapping(String prefix, String uri)
- {
- prefixURIMapping.put(uri,prefix);
- uris.add(uri);
- }
-
- public void characters(char[] ch, int start, int length) throws SAXException
- {
- String str = String.valueOf(ch);
- //Add non-trivial text as a text node
- if (length > 1)
- {
- try
- {
- currentElement.addTextNode(str.substring(start,start+length));
- }
- catch (SOAPException e)
- {
- throw new SAXException("Can't add a text node into SOAPElement from text", e);
- }
- }
- }
-
- public void endElement (String uri, String localName, String qName)
- {
- if (currentElement != rootElement )
- {
- currentElement = currentElement.getParentElement();
- }
- }
- public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException
- {
- String prefix = (String)prefixURIMapping.get(namespaceURI);
- try
- {
- // Create and/or add child element
- if (rootElement == null && currentElement == null)
- {
- rootElement = soapFactory.createElement(localName,prefix,namespaceURI);
- currentElement = rootElement;
- }
- else
- {
- currentElement = currentElement.addChildElement(localName,prefix,namespaceURI);
- }
-
- // Add namespace declaration
- if (uris.size() > 0)
- {
- for (int i = 0; i < uris.size(); i++)
- {
- String uri = (String)uris.get(i);
- String pre = (String)prefixURIMapping.get(uri);
- currentElement.addNamespaceDeclaration(pre,uri);
- }
- // Need to reset uris as we will use it for next element.
- uris.clear();
- }
-
- // Add attibutes
- for (int i =0; i<atts.getLength(); i++)
- {
- Name attriName;
- if (atts.getURI(i) != null)
- {
- String attriPre = (String)prefixURIMapping.get(atts.getURI(i));
- attriName = soapFactory.createName(atts.getLocalName(i),attriPre,atts.getURI(i));
- }
- else
- {
- attriName = soapFactory.createName(atts.getLocalName(i));
- }
- currentElement.addAttribute(attriName, atts.getValue(i));
- }
- }
- catch (SOAPException e)
- {
- throw new SAXException(e);
- }
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project
deleted file mode 100644
index 802346176..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.creation.ejb.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 76281b393..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Jun 03 01:57:00 EDT 2007
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=2
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 0dccec3a5..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ejb.ui; singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.304,1.1.0)"
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
deleted file mode 100644
index 6e2940fa0..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = plugin.xml,\
- plugin.properties,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
deleted file mode 100644
index 13fe654ef..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Creation EJB Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-#
-# Web service types
-#
-WEBSERVICETYPE_NAME_EJB_TP=EJB Web Service
-WEBSERVICETYPE_NAME_WSDL_EJB_TP=Skeleton EJB Web Service
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
deleted file mode 100644
index 2835c24c4..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- EJB Web Service Types -->
-<!--
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
- <webServiceType
- label="%WEBSERVICETYPE_NAME_WSDL_EJB_TP"
- resourceTypeMetadata="File IResource"
- extensionMetadata=".wsdl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
- includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
- excludeNatures=""
- id="org.eclipse.jst.ws.type.wsdl.ejb">
- </webServiceType>
-
- <webServiceType
- label="%WEBSERVICETYPE_NAME_EJB_TP"
- resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
- extensionMetadata=".java .class .SessionImpl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
- includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
- excludeNatures=""
- id="org.eclipse.jst.ws.type.ejb">
- </webServiceType>
- </extension>
--->
-
- <!-- Popups -->
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.ejb">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.jst.javaee.ejb.EnterpriseBeans"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.ejb3">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
- </extension>
-
-
-<!-- EJB stuff -->
- <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
- <webServiceImpl
- id="org.eclipse.jst.ws.wsImpl.ejb"
- label="%WEBSERVICETYPE_NAME_EJB_TP"
- resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean org.eclipse.jst.javaee.ejb.EnterpriseBeans SessionImpl SessionBeanImpl"
- extensionMetadata=".java .class .SessionImpl .SessionBeanImpl"
- mergerClass="org.eclipse.jst.ws.internal.consumption.common.JavaMerger"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
- </webServiceImpl>
- </extension>
-
-
-
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.creation.ui/.classpath
deleted file mode 100644
index 196d49a46..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
deleted file mode 100644
index 8e6edef01..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.project b/bundles/org.eclipse.jst.ws.creation.ui/.project
deleted file mode 100644
index b9c8bfcaf..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.creation.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8bab1893c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Sat Jun 02 17:07:06 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5971ac072..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:04 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index b0d4f525d..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true
-Bundle-Version: 1.0.305.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.creation.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.ant;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.extension;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.preferences;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.server;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets.binding;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets.test;x-internal:=true
-Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.ws.explorer;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ui/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ui/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
deleted file mode 100644
index ca44ef839..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
deleted file mode 100644
index 2d737f07a..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png
deleted file mode 100644
index 3d6bcabe1..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png
deleted file mode 100644
index 45f876a63..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg
deleted file mode 100644
index 5d3793332..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg
deleted file mode 100644
index bd58bc06d..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg
deleted file mode 100644
index 38ff6a6f9..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg
deleted file mode 100644
index 58fcdba85..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg
deleted file mode 100644
index 5c912f705..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg
deleted file mode 100644
index ab5695991..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
deleted file mode 100644
index d6e85f0aa..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Creation Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-PLUGIN_NEW_WIZARD_NAME_WS_SERVICE=Web Service
-PLUGIN_EXPORT_WIZARD_NAME_WS=Web Service
-PLUGIN_NEW_WIZARD_DESC_WS_SERVICE=Create a new XML web service.
-PLUGIN_EXPORT_WIZARD_DESC_WS=A wizard for exporting a web service.
-
-#
-# Web Services Preferance Pages
-#
-# Dialogs
-CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG=Hide &Create Web service Dialog
-CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG=Hide Generate Java Bean S&keleton Dialog
-CHECKBOX_SHOW_GENERATE_WSDL_FILES_DIALOG=Hide Generate WSDL Files Dialog
-CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG=Hide Publish &WSDL Dialog
-
-PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults
-
-
-#
-# Preferences Tooltips
-#
-#Action Dialogs
-TOOLTIP_PPAD_CHECKBOX_DEPLOY=Hides the dialog for deploying a Web service action
-TOOLTIP_PPAD_CHECKBOX_SKELETON=Hides the dialog for generating Java bean Skeleton action
-TOOLTIP_PPAD_CHECKBOX_WSDL=Hides the dialog for generating WSDL files action
-TOOLTIP_PPAD_CHECKBOX_PUBLISH=Hides the dialog for publishing the WSDL action
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-ACTION_GENERATE_JAVA_SKELETON=Generate Java bean skeleton
-ACTION_PUBLISH_WSDL=Publish WSDL file
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSS=Web Service
-
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
deleted file mode 100644
index 9271f77ce..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- Wizards -->
-
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- name="%PLUGIN_NEW_CATEGORY_NAME_WS"
- id="org.eclipse.jst.ws.ui.new">
- </category>
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_SERVICE"
- icon="icons/full/ctool16/new_webserv_wiz.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- <description>
- %PLUGIN_NEW_WIZARD_DESC_WS_SERVICE
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/webservices_wiz.png"
- title="%WIZARD_TITLE_WSS"
- class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ServerWidgetBinding"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.exportWizards">
- <category
- id="org.eclipse.jst.ws.creation.ui.wsexport.category"
- name="%PLUGIN_NEW_CATEGORY_NAME_WS"/>
- </extension>
-
- <extension
- point="org.eclipse.ui.exportWizards">
- <wizard
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- icon="icons/export_ws.gif"
- category="org.eclipse.jst.ws.creation.ui.wsexport.category"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.consumption.ui.wsexport">
- <description>
- %PLUGIN_EXPORT_WIZARD_DESC_WS
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/export_ws_wiz.png"
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
- id="org.eclipse.jst.ws.consumption.ui.wsexport">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/export_ws_wiz.png"
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </dynamicWizard>
- </extension>
-
- <!-- "Don't Show Me" Preferences -->
-
- <extension
- point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_DEPLOY"
- infopop="org.eclipse.jst.ws.creation.ui.PPAD0006"
- category="org.eclipse.jst.wss.popup.category"
- objectids="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.ejb org.eclipse.jst.ws.creation.ui.wizard.serverwizard.ejb3 org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.file org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.compunit org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.service.bean org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.bean.link"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_SKELETON"
- infopop="org.eclipse.jst.ws.creation.ui.PPAD0008"
- category="org.eclipse.jst.wss.popup.category"
- objectids="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsdl org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.service org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.wsdlres org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.serviceref org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsil"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_PUBLISH"
- infopop="org.eclipse.jst.ws.creation.ui.PPAD0009"
- category="org.eclipse.jst.wss.popup.category"
- objectids="org.eclipse.jst.ws.creation.ui.wizard.publish.file org.eclipse.jst.ws.creation.ui.wizard.publish.service org.eclipse.jst.ws.creation.ui.wizard.publish.wsdlres org.eclipse.jst.ws.creation.ui.wizard.publish.serviceref"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </actionDialogPreferenceType>
-
- </extension>
-
- <!-- Popups -->
-
- <extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.file">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.compunit">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsdl">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.service">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.wsdlres">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.serviceref">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.service.bean">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.bean.link">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsil"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsil">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish.file">
- <action
- label="%ACTION_PUBLISH_WSDL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish.service">
- <action
- label="%ACTION_PUBLISH_WSDL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish.wsdlres">
- <action
- label="%ACTION_PUBLISH_WSDL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish.serviceref">
- <action
- label="%ACTION_PUBLISH_WSDL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </action>
- </objectContribution>
-
- </extension>
-
- <!-- Preference Pages -->
-
- <extension point="org.eclipse.ui.preferencePages">
- <page
- name="%PREFERENCE_CATEGORY_SCENARIO_DEFAULTS"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage"
- id="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage">
- </page>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="StartServiceServer"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand"
- class="org.eclipse.jst.ws.internal.creation.ui.server.StartServerWidgetFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.antScenario">
- <antScenario
- class="org.eclipse.jst.ws.internal.creation.ui.ant.AntServiceRootCommandFragment"
- scenarioType="service"/>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.antDataMapping">
- <map
- key="InitialSelection"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand"
- property="InitialSelection"
- required="true"
- transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
- <map
- key="InitialSelection"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand"
- property="ObjectSelection"
- required="true"
- transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
- <map
- key="Project"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand"
- property="Project"
- transform="org.eclipse.jst.ws.internal.common.StringToIProjectTransformer"/>
- <map
- key="ComponentName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand"
- property="ComponentName"/>
- <map
- key="Service.RuntimeId"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.ServerId"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.TypeId"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="GenerateProxy"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand"
- property="GenerateProxy"/>
- <map
- key="Service.RuntimeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.ServerId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.TypeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
-
- <map
- key="ServiceProjectName"
- operation="org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand"
- property="ServiceProjectName"/>
-
- <map
- key="ServiceProjectName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceProjectName"/>
-
- <map
- key="ServiceComponentName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceComponentName"/>
-
- <map
- key="ServiceEarProjectName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceEarProjectName"/>
-
- <map
- key="ServiceEarComponentName"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand"
- property="ServiceEarComponentName"/>
- <map
- key="Service.RuntimeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.ServerId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- <map
- key="Service.TypeId"
- operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment"
- property="ServiceTypeRuntimeServer"
- transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties
deleted file mode 100644
index eb7d98c79..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 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
-###############################################################################
-
-#
-# Wizard pages
-#
-PAGE_TITLE_OBJECT_SELECTION=Object Selection Page
-PAGE_DESC_OBJECT_SELECTION=Object Selection Page
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java
deleted file mode 100644
index eb19e8bc6..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class CreationUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.creation.ui.CreationUI";//$NON-NLS-1$
-
- private CreationUIMessages() {
- // Do not instantiate
- }
-
- public static String PAGE_TITLE_OBJECT_SELECTION;
- public static String PAGE_DESC_OBJECT_SELECTION;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, CreationUIMessages.class);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java
deleted file mode 100644
index c6c605018..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060530 144358 kathy@ca.ibm.com - Kathy Chan
- * 20060530 144350 kathy@ca.ibm.com - Kathy Chan
- * 20060823 154938 pmoogk@ca.ibm.com - Peter Moogk
- * 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20061011 159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
- * 20070501 178129 makandre@ca.ibm.com - Andrew Mak, workspace reports "crash detected" after running WS ant task (cmdline)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.ant;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntDefaultingOperation;
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntRestoringCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntWorkspaceSaveCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.ListOptionsCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-/**
- *
- * Command fragment for generating web service top down or bottom up using Ant task.
- * Run headless Eclipse or within workspace using Run as Ant Build. This fragment eliminates any UI specific
- * commands and data mappings between commands and widgets. Widget to command mappings are
- * replaced by Ant property file to command mappings which are enabled by a antDataMapping extension
- * point in the org.eclipse.wst.command.env plugin.
- *
- * @author joan
- *
- */
-
-public class AntServiceRootCommandFragment extends SequenceFragment
-{
-
- public AntServiceRootCommandFragment()
- {
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
- add( new SimpleFragment(new ListOptionsCommand(), ""));
- add (new SimpleFragment(new AntDefaultingOperation(), ""));
- add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));
- add( new ObjectSelectionFragment() );
- add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));
- add( new ServiceRootFragment() );
- add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
- add(new FinishFragment());
- add( new SimpleFragment( new AntRestoringCommand(), "" ));
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
- add( new SimpleFragment( new AntWorkspaceSaveCommand(), ""));
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialComponentName", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "WebServicesParser", ServerExtensionDefaultingCommand.class );
-
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidgetOutputCommand.class);
-
- // Map ServerWizardWidgetOutputCommand.
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ObjectSelectionFragment.class, "TypeRuntimeServer", null);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployService", ServerExtensionDefaultingCommand.class);
-
- //Map AntDefaultingFragment
- dataRegistry.addMapping(AntDefaultingOperation.class, "ServiceIdsFixed", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "ClientIdsFixed", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "StartService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "InstallService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping(AntDefaultingOperation.class, "DeployService", PreServiceDevelopCommand.class);
-
- // Map ServerRuntimeSelectionWidgetDefaultingCommand
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
-
-
- // Map ServerExtensionDefaultingCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-
- // Setup the PreServiceDevelopCommand.
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class);
-
- dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class );
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
-
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DevelopService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "AssembleService", PreServiceDevelopCommand.class);
-
-
-
- dataRegistry.addMapping( ObjectSelectionOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() );
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
-
- // Map ServerExtensionOutputCommand for ServerStart()
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null);
-
- dataRegistry.addMapping(AntDefaultingOperation.class, "RendererValidation", AntRestoringCommand.class);
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
deleted file mode 100644
index afd743a70..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060524 141925 kathy@ca.ibm.com - Kathy Chan
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20070509 182274 kathy@ca.ibm.com - Kathy Chan
- * 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071220 213640 kathy@ca.ibm.com - Kathy Chan
- * 20080325 222473 makandre@ca.ibm.com - Andrew Mak, Create EAR version based on the version of modules to be added
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentMergeContext;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class PreServiceAssembleCommand extends AbstractDataModelOperation
-{
- private IWebService webService_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private IContext context_;
- private IProject initialProject_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- // For top down scenarios, merge the content of the skeleton files with the previous version stored.
- // The Web service extensions triggers the storing of the content of the old skeleton file by
- // calling WebServiceInfo.setImplURLs() before the new skeleton is generated in the extension's
- // develop() method.
-
- if (context_.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
- PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
- IMerger merger = webService_.getWebServiceInfo().getMerger();
- if (mergeContext.isSkeletonMergeEnabled() && merger != null) {
- status = merger.merge(monitor, getEnvironment().getStatusHandler());
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
-
- if (context_.getAssemble()) {
-
- // Check if EAR module is req'd, ie. !=null
- if (earProject_==null)
- return Status.OK_STATUS;
-
-
-
- //Create the service EAR module
-
- CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
- command.setProjectName(earProject_);
- command.setTemplateId(IJ2EEModuleConstants.JST_EAR_TEMPLATE);
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(project_);
- command.setRequiredFacetVersions(FacetUtils.getRequiredEARFacetVersions(project));
-
- command.setServerFactoryId(webService_.getWebServiceInfo().getServerFactoryId());
- command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
- status = command.execute( monitor, adaptable );
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- return status;
- }
-
- //Associate the service module and service EAR
- AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
- associateCommand.setProject(project_);
- associateCommand.setModule(module_);
- associateCommand.setEARProject(earProject_);
- associateCommand.setEar(ear_);
- associateCommand.setEnvironment( environment );
- status = associateCommand.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
-
- //make sure the ear file has been created.
-
- if(initialProject_ != null && FacetUtils.isJavaProject(initialProject_)) {
- IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject_);
- J2EEUtils.addJavaProjectAsUtilityJar(initialProject_, earProject, monitor);
- }
-
- }
- return status;
- }
-
- public void setInitialProject(IProject initialProject)
- {
- initialProject_ = initialProject;
- }
-
- public IProject getInitialProject()
- {
- return initialProject_;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEarProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-
- public void setContext (IContext context) {
- context_ = context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
deleted file mode 100644
index 4e557598c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-
-public class PreServiceDeployCommand extends AbstractDataModelOperation
-{
- private IContext context_;
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- if (context_.getDeploy())
- {
- //If and when there are framework specific deploy things to be done,
- //do them here.
- }
-
- return Status.OK_STATUS;
- }
-
- public void setContext(IContext context)
- {
- context_=context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
deleted file mode 100644
index a6b221fd8..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060516 126965 kathy@ca.ibm.com - Kathy Chan
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20070123 167487 makandre@ca.ibm.com - Andrew Mak
- * 20070403 173654 kathy@ca.ibm.com - Kathy Chan
- * 20070509 182274 kathy@ca.ibm.com - Kathy Chan
- * 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071220 213640 kathy@ca.ibm.com - Kathy Chan
- * 20080326 221364 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.common.HTTPUtility;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-public class PreServiceDevelopCommand extends AbstractDataModelOperation
-{
- private TypeRuntimeServer typeRuntimeServer_;
- private String serviceRuntimeId_;
- private IContext context_;
- private ISelection selection_;
- private String project_;
- private String module_;
- private String moduleType_;
- private String earProject_;
- private String ear_;
- private IProject initialProject_;
-
- private IWebService webService_;
- private String j2eeLevel_;
- private ResourceContext resourceContext_;
-
- private boolean develop_;
- private boolean assemble_;
- private boolean deploy_;
- private boolean install_;
- private boolean run_;
- private boolean client_;
- private boolean test_;
- private boolean publish_;
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- if (develop_) {
- IEnvironment environment = getEnvironment();
-
- // Split up the project and module
- int index = module_.indexOf("/");
- if (index!=-1){
- project_ = module_.substring(0,index);
- module_ = module_.substring(index+1);
- }
-
- if (ear_!=null && ear_.length()>0)
- {
- int earIndex = ear_.indexOf("/");
- if (earIndex!=-1) {
- earProject_ = ear_.substring(0,earIndex);
- ear_ = ear_.substring(earIndex+1);
- }
- }
-
-
- IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils2.getServiceRuntime( serviceRuntimeId_ );
- WebServiceInfo wsInfo = new WebServiceInfo();
-
- wsInfo.setServerFactoryId( typeRuntimeServer_.getServerId() );
- wsInfo.setServerInstanceId( typeRuntimeServer_.getServerInstanceId());
- wsInfo.setState( WebServiceState.UNKNOWN_LITERAL );
- wsInfo.setWebServiceRuntimeId( typeRuntimeServer_.getRuntimeId() );
-
- environment.getLog().log(ILog.INFO, "ws_framework", 5107, this, "PreServiceDevelopCommand", "serviceRuntimeId_ = "+ serviceRuntimeId_);
- ServiceRuntimeDescriptor serviceRuntimeDescriptor = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_);
- IMerger merger = serviceRuntimeDescriptor.getServiceImplementationType().getMergerClass();
- wsInfo.setMerger(merger);
-
- webService_ = wsrt.getWebService( wsInfo );
-
- //Set up the IContext
- WebServiceScenario scenario = null;
- int scenarioInt = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeRuntimeServer_.getTypeId());
- if (scenarioInt == WebServiceScenario.BOTTOMUP)
- {
- scenario = WebServiceScenario.BOTTOMUP_LITERAL;
- String impl = (String)(selection_.getSelection())[0];
- wsInfo.setImplURL(impl);
- }
- else if (scenarioInt == WebServiceScenario.TOPDOWN)
- {
- scenario = WebServiceScenario.TOPDOWN_LITERAL;
- String wsdlURL = (String)(selection_.getSelection())[0];
-
- // check for redirection in the wsdl
- HTTPUtility httpUtil = new HTTPUtility();
- wsInfo.setWsdlURL(httpUtil.handleRedirect(wsdlURL));
- }
-
- context_ = new SimpleContext(develop_, assemble_, deploy_, install_, run_, client_, test_, publish_,
- scenario,
- resourceContext_.isOverwriteFilesEnabled(),
- resourceContext_.isCreateFoldersEnabled(),
- resourceContext_.isCheckoutFilesEnabled());
-
- // Create the service module if needed.
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(project_);
- RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRequiredFacetVersions();
- if (!project.exists())
- {
- boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, moduleType_);
- if (matches)
- {
- CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
- command.setProjectName(project_);
- command.setTemplateId(moduleType_);
- command.setRequiredFacetVersions(rfv);
- command.setServerFactoryId(typeRuntimeServer_.getServerId());
- command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- status = command.execute( monitor, adaptable );
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- return status;
- }
- }
- } else {
- // add facets required by Web service runtime
- if (rfv.length != 0) {
- status = FacetUtils.addRequiredFacetsToProject(project, rfv, monitor);
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- return status;
- }
- }
- }
-
-
- if(initialProject_ != null && FacetUtils.isJavaProject(initialProject_)){
- J2EEUtils.addJavaProjectAsUtilityJar(initialProject_, project, monitor);
- try{
- String uri = initialProject_.getName() + ".jar";
- J2EEUtils.addJAROrModuleDependency(project, uri);
- } catch (CoreException ce){
- String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
- IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
- environment.getStatusHandler().reportError(errorStatus);
- } catch (IOException ioe){
- String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
- IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
- environment.getStatusHandler().reportError(errorStatus);
- }
- }
- }
- return status;
-
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
- {
- typeRuntimeServer_ = typeRuntimeServer;
- }
-
- public void setServiceRuntimeId(String id)
- {
- serviceRuntimeId_ = id;
- }
-
- public void setServiceJ2EEVersion( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public String getJ2eeLevel()
- {
- return j2eeLevel_;
- }
-
- public IWebService getWebService()
- {
- return webService_;
- }
-
- public IContext getContext()
- {
- return context_;
- }
-
- public void setResourceContext( ResourceContext resourceContext )
- {
- resourceContext_ = resourceContext;
- }
-
- public ISelection getSelection()
- {
- return selection_;
- }
-
- public void setSelection( ISelection selection )
- {
- selection_ = selection;
- }
-
- public String getProject()
- {
- return project_;
- }
-
- public String getModule()
- {
- return module_;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setModuleType(String type)
- {
- moduleType_ = type;
- }
-
- public String getEarProject()
- {
- return earProject_;
- }
-
- public String getEar()
- {
- return ear_;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setInstallService(boolean installService)
- {
- install_ = installService;
- }
-
- public void setDevelopService(boolean developService) {
- develop_ = developService;
- }
-
- public void setAssembleService(boolean assembleService) {
- assemble_ = assembleService;
- }
-
- public void setDeployService(boolean deployService) {
- deploy_ = deployService;
- }
-
- public void setStartService(boolean startService)
- {
- run_ = startService;
- }
-
- public void setTestService(boolean testService)
- {
- test_ = testService;
- }
-
- public void setPublishService(boolean publishService)
- {
- publish_ = publishService;
- }
-
- public void setGenerateProxy(boolean genProxy)
- {
- client_ = genProxy;
- }
-
- public void setInitialProject(IProject initialProject)
- {
- initialProject_ = initialProject;
- }
-
- public IProject getInitialProject()
- {
- return initialProject_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
deleted file mode 100644
index baae3777a..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070815 199626 kathy@ca.ibm.com - Kathy Chan
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceInstallCommand extends AbstractDataModelOperation
-{
- private IWebService webService_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private IContext context_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- if (context_.getInstall())
- {
- IEnvironment environment = getEnvironment();
-
- if (webService_.getWebServiceInfo().getServerInstanceId()==null)
- {
- CreateServerCommand createServerCommand = new CreateServerCommand();
- createServerCommand.setServerFactoryid(webService_.getWebServiceInfo().getServerFactoryId());
- createServerCommand.setServerRuntimeId(webService_.getWebServiceInfo().getServerRuntimeId());
- createServerCommand.setEnvironment( environment );
- IStatus createServerStatus = createServerCommand.execute( monitor, null);
- if (createServerStatus.getSeverity()==Status.OK)
- {
- webService_.getWebServiceInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
- webService_.getWebServiceInfo().setServerCreated(true);
- }
- else
- {
- if (createServerStatus.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(createServerStatus);
- }
- return createServerStatus;
- }
- }
-
-
-
- AddModuleToServerCommand command = new AddModuleToServerCommand();
- command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
- if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
- {
- command.setProject(earProject_);
- command.setModule(ear_);
- }
- else
- {
- command.setProject(project_);
- command.setModule(module_);
- }
-
- command.setEnvironment( environment );
- IStatus status = command.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- return status;
- }
- return Status.OK_STATUS;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEarProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-
- public void setContext(IContext context)
- {
- context_=context;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
deleted file mode 100644
index b758bca54..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceRunCommand extends AbstractDataModelOperation
-{
- private IWebService webService_;
- private IContext context_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- if (context_.getRun())
- {
- IEnvironment environment = getEnvironment();
-
- StartServerCommand command = new StartServerCommand();
- command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
- command.setEnvironment( environment );
- status = command.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- }
-
- return status;
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-
- public void setContext (IContext context)
- {
- context_ = context;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
deleted file mode 100644
index d6e853a9d..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060331 128827 kathy@ca.ibm.com - Kathy Chan
- * 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand;
-import org.eclipse.wst.ws.internal.extensions.AssembleServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.RunServiceFragment;
-
-public class ServiceRootFragment extends SequenceFragment
-{
- public ServiceRootFragment()
- {
- add( new SimpleFragment( new PreServiceDevelopCommand(), "" ) );
- add( new DevelopServiceFragment() );
- add( new SimpleFragment( new PreServiceAssembleCommand(), "" ) );
- add( new AssembleServiceFragment() );
- add( new SimpleFragment( new PreServiceDeployCommand(), "" ) );
- add( new DeployServiceFragment() );
- add( new SimpleFragment( new PreServiceInstallCommand(), "" ) );
- add( new InstallServiceFragment() );
- add( new SimpleFragment( new PreServiceRunCommand(),
- "org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand" ) );
- add( new RunServiceFragment() );
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- //Mappings from framework to extension fragments
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", DevelopServiceFragment.class );
-
- // Map the PreServiceDevelopCommand into the dataObject and the PreClientDevelopCommand.
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", DataObjectCommand.class, "DataObject", null );
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreClientDevelopCommand.class, "DataObject", null );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", AssembleServiceFragment.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", DeployServiceFragment.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", InstallServiceFragment.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", RunServiceFragment.class );
-
- //Mappings from framework to framework commands
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "InitialProject", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceAssembleCommand.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceDeployCommand.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceInstallCommand.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceRunCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceRunCommand.class );
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
deleted file mode 100644
index 47b8a0b83..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060504 138118 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.plugin;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-
-/**
-* This is the plugin class for the Web Services Creation UI plugin.
-* <p>
-* The Web Services Creation UI plugin's sole function is to add
-* user interface of the Web Services Creation Wizard, contained in
-* the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceCreationUIPlugin extends Plugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.creation.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceCreationUIPlugin instance_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceCreationUIPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.creation.ui");
- * @return The WebServiceCreationUIPlugin singleton.
- */
- public static WebServiceCreationUIPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor ( String name )
- {
- try
- {
- URL imageURL = FileLocator.find(instance_.getBundle(), new Path("$nl$/"+name), null);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (Exception e)
- {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
deleted file mode 100644
index 34e09f1ab..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060417 136391 joan@ca.ibm.com - Joan Haggarty
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-
-/**
- *
- */
-public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
- private ServerWizardWidget serverWidget_ = null;
-
- public void init(IWorkbench workbench) { }
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
-
- protected Control createContents(Composite parent)
- {
- UIUtils utils = new UIUtils(null);
-
- Composite page = utils.createComposite( parent, 1 );
-
- serverWidget_ = new ServerWizardWidget( false, true );
- serverWidget_.addControls( page, new Listener()
- {
- public void handleEvent( Event evt ){}
- } );
- initializeValues();
- serverWidget_.disableNonPreferenceWidgets();
- applyDialogFont(page);
- return page;
- }
-
- private void initializeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
- // Set values from context.
- TypeRuntimeServer serverIds = new TypeRuntimeServer();
- TypeRuntimeServer clientIds = new TypeRuntimeServer();
-
- serverIds.setTypeId( context.getWebServiceType() );
- clientIds.setTypeId( context.getClientWebServiceType() );
-
- serverWidget_.setServiceTypeRuntimeServer( serverIds );
- serverWidget_.setClientTypeRuntimeServer( clientIds );
- //jvh serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxy()) );
- serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorer()) );
- serverWidget_.setInstallService( new Boolean(context.getInstallWebService()) );
- serverWidget_.setInstallClient( new Boolean(context.getInstallClient()) );
- serverWidget_.setStartService( new Boolean(context.getStartWebService()) );
- serverWidget_.setTestService( new Boolean(context.getTestWebService()) );
- serverWidget_.setTestClient( new Boolean(context.getTestWebService()) );
- serverWidget_.setMonitorService(new Boolean(context.getMonitorWebService()));
- serverWidget_.setServiceGeneration(context.getGenerateWebService()); //jvh
- serverWidget_.setClientGeneration(context.getGenerateClient()); //jvh
- serverWidget_.internalize();
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- setToDefaults();
- }
-
- private void setToDefaults()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
- // Set values from context.
- TypeRuntimeServer serverIds = new TypeRuntimeServer();
- TypeRuntimeServer clientIds = new TypeRuntimeServer();
-
- serverIds.setTypeId( context.getWebServiceTypeDefault() );
- clientIds.setTypeId( context.getClientWebServiceTypeDefault() );
-
- serverWidget_.setServiceTypeRuntimeServer( serverIds );
- serverWidget_.setClientTypeRuntimeServer( clientIds );
- serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorerDefault()) );
- serverWidget_.setInstallService( new Boolean(context.getInstallWebServiceDefault()) );
- serverWidget_.setInstallClient( new Boolean(context.getInstallClientDefault()) );
- serverWidget_.setStartService( new Boolean(context.getStartWebServiceDefault()) );
- serverWidget_.setTestService( new Boolean(context.getTestWebServiceDefault()) );
- serverWidget_.setTestClient( new Boolean(context.getTestWebServiceDefault()) );
- serverWidget_.setMonitorService(new Boolean(context.getMonitorWebServiceDefault()));
- serverWidget_.setServiceGeneration(context.getGenerateWebServiceDefault()); //jvh
- serverWidget_.setClientGeneration(context.getGenerateClientDefault()); //jvh
- serverWidget_.internalize();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- storeValues();
- return true;
- }
-
- private void storeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
- TypeRuntimeServer serverIds = serverWidget_.getServiceTypeRuntimeServer();
- TypeRuntimeServer clientIds = serverWidget_.getClientTypeRuntimeServer();
-
- context.setWebServiceType( serverIds.getTypeId() );
- context.setClientWebServiceType( clientIds.getTypeId() );
- context.setGenerateProxy( serverWidget_.getGenerateProxy().booleanValue() );
- context.setLaunchWebServiceExplorer( serverWidget_.getPublishService().booleanValue() );
- context.setInstallWebService( serverWidget_.getInstallService().booleanValue() );
- context.setInstallClient( serverWidget_.getInstallClient().booleanValue() );
- context.setStartWebService( serverWidget_.getStartService().booleanValue() );
- context.setTestWebService( serverWidget_.getTestService().booleanValue() );
- context.setMonitorWebService(serverWidget_.getMonitorService().booleanValue());
- context.setGenerateWebService(serverWidget_.getServiceGeneration());
- context.setGenerateClient(serverWidget_.getClientGeneration());
- }
-
- protected void performApply()
- {
- performOk();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
deleted file mode 100644
index fc96c1c97..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.server;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.server.StartServerWidget;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartServerWidgetContributor implements INamedWidgetContributor
-{
- private IServer server_;
-
- public StartServerWidgetContributor( IServer server )
- {
- server_ = server;
- }
-
- public String getDescription()
- {
- return ConsumptionUIMessages.PAGE_DESC_WS_START_SERVER;
- }
-
- public String getName()
- {
- return "";
- }
-
- public String getTitle()
- {
- return ConsumptionUIMessages.PAGE_TITLE_WS_START_SERVER;
- }
-
- public WidgetContributorFactory getWidgetContributorFactory()
- {
- return new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new StartServerWidget( server_ );
- }
- };
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
deleted file mode 100644
index 98717b1a5..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20070328 173345 pmoogk@ca.ibm.com - Peter Moogk, Peek next page problem
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.server;
-
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class StartServerWidgetFactory implements INamedWidgetContributorFactory
-{
- private IWebService webservice_;
- private IContext context_;
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- IServer server = null;
-
- if( webservice_ != null && context_.getRun())
- {
- String instanceId = webservice_.getWebServiceInfo().getServerInstanceId();
-
- if( instanceId != null && instanceId.length() > 0 )
- {
- server = ServerCore.findServer( instanceId );
- }
- }
-
- if( server != null && server.getServerState() != IServer.STATE_STARTED )
- {
- return new StartServerWidgetContributor( server );
- }
-
- return null;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", StartServerWidgetFactory.class );
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "Context", StartServerWidgetFactory.class );
- }
-
- public void setWebService( IWebService webservice )
- {
- webservice_ = webservice;
- }
- public void setContext ( IContext context )
- {
- context_ = context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
deleted file mode 100644
index a5a612cd7..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
+++ /dev/null
@@ -1,1682 +0,0 @@
-/*******************************************************************************
- * 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060407 135415 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060407 135443 joan@ca.ibm.com - Joan Haggarty
- * 20060410 135442 kathy@ca.ibm.com - Kathy Chan
- * 20060410 135441 joan@ca.ibm.com - Joan Haggarty
- * 20060410 135562 joan@ca.ibm.com - Joan Haggarty
- * 20060411 136167 kathy@ca.ibm.com - Kathy Chan
- * 20060417 136390/136391/136159 joan@ca.ibm.com - Joan Haggarty
- * 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 136158 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 136705 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 136182 kathy@ca.ibm.com - Kathy Chan
- * 20060420 137820 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420 135912 joan@ca.ibm.com - Joan Haggarty
- * 20060421 136761 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060424 138052 kathy@ca.ibm.com - Kathy Chan
- * 20060425 137831 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060426 138519 joan@ca.ibm.com - Joan Haggarty
- * 20060427 138058 joan@ca.ibm.com - Joan Haggarty
- * 20060504 138035 joan@ca.ibm.com - Joan Haggarty
- * 20060524 142276 joan@ca.ibm.com - Joan Haggarty
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060605 145081 joan@ca.ibm.com - Joan Haggarty
- * 20060607 144826 joan@ca.ibm.com - Joan Haggarty
- * 20060607 144049 joan@ca.ibm.com - Joan Haggarty
- * 20060614 146270 joan@ca.ibm.com - Joan Haggarty
- * 20060616 147317 joan@ca.ibm.com - Joan Haggarty
- * 20060717 150577 makandre@ca.ibm.com - Andrew Mak
- * 20060726 150865 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060803 152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow
- * 20060817 140017 makandre@ca.ibm.com - Andrew Mak, longer project or server/runtime strings do not resize wizard
- * 20060825 135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
- * 20060829 155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize
- * 20060830 155114 pmoogk@ca.ibm.com - Peter Moogk, Updated patch for this defect.
- * 20060831 155441 makandre@ca.ibm.com - Andrew Mak, Small tweak for this bug
- * 20061003 159142 kathy@ca.ibm.com - Kathy Chan
- * 20061212 164177 makandre@ca.ibm.com - Andrew Mak, Incorrect validation error complaining about runtime not supporting a project type
- * 20061212 159911 makandre@ca.ibm.com - Andrew Mak, changing service definition resets some configuration fields
- * 20070205 172687 makandre@ca.ibm.com - Andrew Mak, NPE in Scencario Defaults preferences page
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080205 170141 kathy@ca.ibm.com - Kathy Chan
- * 20080215 216337 pmoogk@ca.ibm.com - Peter Moogk
- * 20080301 221034 kathy@ca.ibm.com - Kathy Chan
- * 20080312 147442 trungha@ca.ibm.com - Trung Ha
- * 20080318 213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
- * 20080326 198439 kathy@ca.ibm.com - Kathy Chan
- * 20080402 198439 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.DefaultingUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.IObjectSelectionLaunchable;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ProjectSelectionDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.IObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.Timer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.Accessible;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlEvent;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Scale;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.HyperlinkGroup;
-import org.eclipse.ui.forms.HyperlinkSettings;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServerWizardWidget extends SimpleWidgetDataContributor implements Runnable, IPackable {
-
- //INFOPOPS
- /* CONTEXT_ID WSWSCEN0001 for the Scenario Page */
- private String INFOPOP_WSWSCEN_PAGE = "WSWSCEN0001";
- /* CONTEXT_ID WSWSCEN0010 for the Web Service Type combo box of the Scenario Page */
- private String INFOPOP_WSWSCEN_COMBO_SERVICETYPE = "WSWSCEN0010";
- /* CONTEXT_ID WSWSCEN0014 for the monitor service checkbox of the Scenario page */
- private String INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE = "WSWSCEN0014";
- /* CONTEXT_ID WSWSCEN0012 for the Launch UDDI check box of the Scenario Page */
- private String INFOPOP_WSWSCEN_CHECKBOX_LAUNCH_WS = "WSWSCEN0012";
- /* CONTEXT_ID WSWSCEN0020 for the Service Implemenation text field of the Scenario Page */
- private String INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL = "WSWSCEN0020";
- /* CONTEXT_ID WSWSCEN0021 for theService Slider of the Scenario Page */
- private String INFOPOP_WSWSCEN_SCALE_SERVICE = "WSWSCEN0021";
- /* CONTEXT_ID WSWSCEN0022 for the Server hyperlink of the Scenario Page */
- private String INFOPOP_WSWSCEN_HYPERLINK_SERVER = "WSWSCEN0022";
- /* CONTEXT_ID WSWSCEN0023 for the Runtime hyperlink of the Scenario Page */
- private String INFOPOP_WSWSCEN_HYPERLINK_RUNTIME = "WSWSCEN0023";
- /* CONTEXT_ID WSWSCEN0024 for theProjects hyperlink of the Scenario Page */
- private String INFOPOP_WSWSCEN_HYPERLINK_PROJECTS = "WSWSCEN0024";
- /* CONTEXT_ID WSWSCEN0030 for the Overwrite Files checkbox of the Scenario Page */
- private String INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE = "WSWSCEN0030";
-
- private ScaleSelectionListener scaleSelectionListener = new ScaleSelectionListener();
- private Listener statusListener_;
- private ModifyListener objectModifyListener_ ;
- private int validationState_;
- boolean validObjectSelection_ = true;
-
- private ImageRegistry imageReg_;
-
- private TypeRuntimeServer ids_;
- private LabelsAndIds labelIds_;
- private String serviceProjectName_;
- private String serviceEarProjectName_;
- private String serviceComponentType_;
- private WebServicesParser parser_;
- private boolean needEar_;
-
- private boolean developService_;
- private boolean assembleService_;
- private boolean deployService_;
-
- private IStructuredSelection objectSelection_;
- private Boolean testService_;
- private Boolean startService_;
- private Boolean installService_;
-
- private boolean displayPreferences_;
- private boolean preferencesPage_;
-
- private Composite groupComposite_;
- private Composite hCompService_;
- private WebServiceClientTypeWidget clientWidget_;
- private Label serviceLabel_;
- private Combo webserviceType_;
- private Text serviceImpl_;
- private Scale serviceScale_;
- private Label topologySpot_;
- private Button browseButton_;
- private Button publishButton_;
- private Button monitorButton_;
- private Button overwriteButton_;
- private ServiceImplSelectionDialog browseDialog_;
- private ProjectSelectionDialog projectDialog_;
- private Hyperlink hLinkServiceRuntime_;
- private Hyperlink hLinkServiceServer_;
- private Hyperlink hLinkServiceProject_;
- private Hyperlink hLinkServiceEAR_;
-
- private Object objectSelectionWidget_; //may be IObjectSelectionLaunchable or IObjectSelectionWidget
-
- private ResourceContext resourceContext_;
-
- private Timer timer_ = null;
-
- private UIUtils utils_ = new UIUtils("org.eclipse.jst.ws.creation.ui");
-
- private boolean forceRefreshRuntime = false;
-
- private String GRAPHIC_SERVICE_0="icons/service_test.jpg"; //$NON-NLS-N$
- private String GRAPHIC_SERVICE_1="icons/service_run.jpg"; //$NON-NLS-N$
- private String GRAPHIC_SERVICE_2="icons/service_install.jpg"; //$NON-NLS-N$
- private String GRAPHIC_SERVICE_3="icons/service_deploy.jpg"; //$NON-NLS-N$
- private String GRAPHIC_SERVICE_4="icons/service_assemble.jpg"; //$NON-NLS-N$
- private String GRAPHIC_SERVICE_5="icons/service_develop.jpg"; //$NON-NLS-N$
-
- private String ICON_SCALE_BG_0="icons/scale0_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_1="icons/scale1_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_2="icons/scale2_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_3="icons/scale3_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_4="icons/scale4_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_5="icons/scale5_bground.jpg"; //$NON-NLS-N$
- private String ICON_SCALE_BG_6="icons/scale6_bground.jpg"; //$NON-NLS-N$
-
- private String SERVICE_RUNTIME_PREFIX = ConsumptionUIMessages.LABEL_RUNTIMES_LIST ;
- private String SERVICE_SERVER_PREFIX = ConsumptionUIMessages.LABEL_SERVERS_LIST;
- private String SERVICE_PROJECT_PREFIX = ConsumptionUIMessages.LABEL_SERVICE_PROJECT;
- private String SERVICE_EAR_PREFIX = ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT;
-
- /**
- * @param displayPreferences Set to true if preferences such as overwrite should be displayed on the wizard page
- * @param prefPage Set to true if the widget is being used on the preferences page. Alters widget layout.
- */
- public ServerWizardWidget(boolean displayPreferences, boolean prefPage) {
- displayPreferences_ = displayPreferences;
- preferencesPage_ = prefPage;
- initImageRegistry();
- validationState_ = ValidationUtils.VALIDATE_ALL;
- }
-
- private Composite serviceComposite_;
-
- /**
- * Run this ServerWizardWidget, which validates the entry field values.
- */
- public void run() {
-
- // do minimal check here, this call will determine if we at least
- // have a "validObjectSelection_"
- checkServiceImplTextStatus();
-
- if (validObjectSelection_)
- {
- boolean refreshRuntime = (getWebServiceScenario() != WebServiceScenario.TOPDOWN);
-
- if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
- {
- IObjectSelectionLaunchable launchable = (IObjectSelectionLaunchable)objectSelectionWidget_;
- callObjectTransformation(launchable.getObjectSelection(), launchable.getProject(), launchable.getComponentName(), refreshRuntime);
- }
- else
- {
- IObjectSelectionWidget widget = (IObjectSelectionWidget)objectSelectionWidget_;
- callObjectTransformation(widget.getObjectSelection(), widget.getProject(), widget.getComponentName(), refreshRuntime);
- }
- }
- else
- setObjectSelection(null);
-
- // do full validation after all transformations and calculations have occurred
- validationState_ = ValidationUtils.VALIDATE_ALL;
- statusListener_.handleEvent(null);
- }
-
- /**
- * Pack this widget and the client-side widget as well.
- */
- private void packSelf() {
- // don't need to call packIt(), since clientWidget_ has a callback to packIt() already.
- clientWidget_.packIt();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable#packIt()
- */
- public void packIt() {
- groupComposite_.pack(true);
- utils_.horizontalResize(groupComposite_.getShell(), groupComposite_, UIUtils.DEFAULT_PADDING);
- }
-
- public WidgetDataEvents addControls(Composite parent,
- Listener statusListener) {
-
- statusListener_ = statusListener;
- utils_.createInfoPop(parent, INFOPOP_WSWSCEN_PAGE);
-
- Composite typeComposite = utils_.createComposite(parent, 3);
-
- webserviceType_ = utils_.createCombo(typeComposite,
- ConsumptionUIMessages.LABEL_WEBSERVICETYPE,
- ConsumptionUIMessages.TOOLTIP_PWPR_COMBO_TYPE,
- INFOPOP_WSWSCEN_COMBO_SERVICETYPE, SWT.SINGLE | SWT.BORDER
- | SWT.READ_ONLY);
- GridData gdata1 = (GridData) webserviceType_.getLayoutData();
- gdata1.horizontalSpan = 2;
- webserviceType_.setLayoutData(gdata1);
-
- webserviceType_.addSelectionListener(new SelectionListener(){
- public void widgetDefaultSelected(SelectionEvent e) {}
-
- public void widgetSelected(SelectionEvent e) {
- String oldTypeId = ids_.getTypeId();
- int currentSelectionIdx = webserviceType_.getSelectionIndex();
- String currentTypeId = labelIds_.getIds_()[currentSelectionIdx];
- if (!oldTypeId.equals(currentTypeId)) {
- ids_.setTypeId(currentTypeId);
-
- // don't need to refresh runtime or validate fields if we are on the preference page, just return
- if (preferencesPage_)
- return;
-
- int oldScenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(oldTypeId);
- int currentScenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(currentTypeId);
-
- objectSelectionWidget_ = getSelectionWidget();
- // change the label for the service
- // implementation/definition based on the web service type
- handleTypeChange();
-
- // After bug 159911, we will not refresh the runtime in TOPDOWN scenario unless we absolutely
- // have to. Therefore, if we are switching from another scenario type, we should check if the
- // current selections are valid for this TOPDOWN scenario, if not, try to pick a more suitable
- // runtime.
- if (currentScenario == WebServiceScenario.TOPDOWN) {
- validationState_ = ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES;
-
- // this will force a refresh the next time the wsdl is changed
- forceRefreshRuntime = !checkErrorStatus().isOK();
- }
-
- //if the web service type change is from one top-down type to another
- //top-down type leave the object selection field in tact and refresh
- //the server/runtime project defaulting.
- //Otherwise clear the object selection field since it's value is not valid anymore
- if (oldScenario==WebServiceScenario.TOPDOWN && currentScenario==WebServiceScenario.TOPDOWN)
- {
- // if switching from one TOPDOWN scenario to another TOPDOWN scenario and
- // we've determined that the current runtime selection is not suitable, we
- // can refresh the runtime now (don't need to wait for the next time the
- // wsdl is changed).
- if (forceRefreshRuntime) {
- refreshServerRuntimeSelection();
- forceRefreshRuntime = false;
- }
- }
- else
- {
- //clear the object selection field
- // serviceImpl may be null if on the preferences page
- if (serviceImpl_ != null)
- {
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText("");
- setObjectSelection(null);
- serviceImpl_.addModifyListener(objectModifyListener_);
- }
- }
- validationState_ = ValidationUtils.VALIDATE_ALL;
- statusListener_.handleEvent(null);
-
- }
- }
-
- });
-
- // Create text field and browse for object selection if not on preferences page
- if (!preferencesPage_)
- {
- //text of this label is based on the web service type selected in webserviceType_ combo
- serviceLabel_ = new Label( typeComposite, SWT.WRAP);
- serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEIMPL);
- serviceLabel_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL);
-
- serviceImpl_ = new Text(typeComposite, SWT.LEFT | SWT.BORDER );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- serviceImpl_.setLayoutData( griddata );
- serviceImpl_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL);
- utils_.createInfoPop(serviceImpl_, INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL);
-
- objectModifyListener_ = new ModifyListener(){
- public void modifyText(ModifyEvent e) {
- if (serviceImpl_.getText().indexOf(':') > 0) {
- timer_ = Timer.newInstance(timer_, Display.getCurrent(), ServerWizardWidget.this);
- timer_.startTimer();
- }
- else
- run();
- }
- };
-
- serviceImpl_.addModifyListener(objectModifyListener_);
-
- browseButton_ = utils_.createPushButton(typeComposite,
- ConsumptionUIMessages.BUTTON_BROWSE, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL, null);
-
- IWorkbench workbench = PlatformUI.getWorkbench();
- browseDialog_ = new ServiceImplSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(),
- new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION, "",
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ObjectSelectionWidget();
- }
- }));
- browseButton_.addSelectionListener(new ServiceImplBrowseListener());
- }
- // Service Lifecycle section - scales for service & client, graphic
-
- groupComposite_ = new Composite(parent, SWT.NONE);
- GridLayout gclayout = new GridLayout();
- gclayout.numColumns = 2;
- gclayout.horizontalSpacing=0;
- gclayout.marginHeight=0;
- gclayout.marginBottom=5;
- groupComposite_.setLayout( gclayout );
- GridData gcGridData = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true);
- groupComposite_.setLayoutData(gcGridData);
-
- groupComposite_.addControlListener(new ControlListener()
- {
- public void controlMoved(ControlEvent e) {
- // TODO Auto-generated method stub
-
- }
- public void controlResized(ControlEvent e) {
- groupComposite_.pack(true);
- }
- });
-
- serviceComposite_ = new Composite(groupComposite_, SWT.NONE);
- GridLayout gridlayout = new GridLayout();
- gridlayout.numColumns = 2;
- gridlayout.horizontalSpacing=0;
- gridlayout.marginHeight=0;
- serviceComposite_.setLayout( gridlayout );
- GridData scGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- serviceComposite_.setLayoutData(scGridData);
-
- serviceComposite_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
-
-
- serviceScale_ = new Scale(serviceComposite_, SWT.VERTICAL | SWT.BORDER);
- utils_.createInfoPop(serviceScale_, INFOPOP_WSWSCEN_SCALE_SERVICE);
- serviceScale_.setMinimum(0);
- serviceScale_.setMaximum(6);
- serviceScale_.setIncrement(1);
- serviceScale_.setPageIncrement(1);
- serviceScale_.addSelectionListener(scaleSelectionListener);
- serviceScale_.setSelection(getServiceGeneration());
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
-
- Accessible accessibleScale = serviceScale_.getAccessible();
- accessibleScale.addAccessibleListener(new AccessibleAdapter(){
- // return a string that describes what to do with the slider
- // this is read by the screen reader when the slider first gets focus
- public void getName(AccessibleEvent e) {
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE;
- }
- });
- accessibleScale.addAccessibleControlListener(new AccessibleControlAdapter(){
- // return a meaningful string when the screen reader
- // attempts to get the value from the service scale
- public void getValue(AccessibleControlEvent e) {
- int selection = serviceScale_.getSelection();
- switch (selection) {
- case 0:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST;
- break;
- case 1:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN;
- break;
- case 2:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL;
- break;
- case 3:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY;
- break;
- case 4:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE;
- break;
- case 5:
- case 6:
- e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP;
- break;
- default:
- break;
- }
- }
- });
-
- GridData layoutData1 = new GridData();
- layoutData1.horizontalAlignment=SWT.CENTER;
- layoutData1.verticalAlignment = SWT.BEGINNING;
- Rectangle scaleR = (imageReg_.get(ICON_SCALE_BG_0)).getBounds();
- layoutData1.heightHint=scaleR.height;
- layoutData1.widthHint=scaleR.width+1;
- serviceScale_.setLayoutData(layoutData1);
-
- topologySpot_ = new Label(serviceComposite_, SWT.BORDER | SWT.TOP );
- topologySpot_.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- topologySpot_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
-
- GridData layoutData2 = new GridData();
- layoutData2.horizontalAlignment=SWT.BEGINNING;
- layoutData2.verticalAlignment = SWT.BEGINNING;
- Rectangle topR = (imageReg_.get(GRAPHIC_SERVICE_0)).getBounds();
- layoutData2.heightHint=topR.height;
- layoutData2.widthHint=topR.width;
- topologySpot_.setLayoutData(layoutData2);
-
- setGraphics(getServiceGeneration());
-
- hCompService_ = utils_.createComposite(groupComposite_, 1);
-
- Label serviceDetailsLabel = new Label(hCompService_, SWT.NONE);
- serviceDetailsLabel.setText(ConsumptionUIMessages.LABEL_SUMMARY);
-
- hLinkServiceServer_= new Hyperlink(hCompService_, SWT.NULL);
- utils_.createInfoPop(hLinkServiceServer_, INFOPOP_WSWSCEN_HYPERLINK_SERVER);
- hLinkServiceServer_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_SERVER);
- hLinkServiceServer_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchRuntimeSelectionDialog(false, true);
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- hLinkServiceRuntime_ = new Hyperlink(hCompService_, SWT.NULL);
- utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_RUNTIME);
- hLinkServiceRuntime_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_RUNTIME);
- hLinkServiceRuntime_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchRuntimeSelectionDialog(false);
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- IWorkbench workbench = PlatformUI.getWorkbench();
- projectDialog_ = new ProjectSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(),
- new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_PROJECT_SETTINGS, "",
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ProjectSelectionWidget();
- }
- }));
-
- hLinkServiceProject_= new Hyperlink(hCompService_, SWT.NULL);
- utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
- hLinkServiceProject_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK);
- hLinkServiceProject_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchProjectDialog();
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- hLinkServiceEAR_= new Hyperlink(hCompService_, SWT.NULL);
- utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
- hLinkServiceEAR_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK);
- hLinkServiceEAR_.addHyperlinkListener(new IHyperlinkListener(){
- public void linkActivated(HyperlinkEvent e){
- launchProjectDialog();
- }
- public void linkEntered(HyperlinkEvent e){}
- public void linkExited(HyperlinkEvent e){}
- });
-
- hLinkServiceServer_.setText(SERVICE_SERVER_PREFIX);
- hLinkServiceRuntime_.setText(SERVICE_RUNTIME_PREFIX);
- hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX);
- hLinkServiceEAR_.setText(SERVICE_EAR_PREFIX);
-
- HyperlinkGroup serverRuntimeGroup = new HyperlinkGroup(Display.getCurrent());
-
- serverRuntimeGroup.add(hLinkServiceServer_);
- serverRuntimeGroup.add(hLinkServiceRuntime_);
- serverRuntimeGroup.add(hLinkServiceProject_);
- serverRuntimeGroup.add(hLinkServiceEAR_);
- serverRuntimeGroup.setHyperlinkUnderlineMode(HyperlinkSettings.UNDERLINE_ALWAYS);
-
- utils_.createHorizontalSeparator(parent, 1);
-
- // Add client widgets...
- clientWidget_ = new WebServiceClientTypeWidget(false);
- clientWidget_.addControls(parent, statusListener );
- clientWidget_.setPackable(this);
- clientWidget_.enableClientSlider(serviceScale_.getSelection()<=ScenarioContext.WS_START);
-
- // Advanced buttons section
- utils_.createHorizontalSeparator(parent, 3);
-
- Composite advancedButtonPanel = utils_.createComposite(parent, 1);
-
- publishButton_ = utils_.createCheckbox(advancedButtonPanel,
- ConsumptionUIMessages.BUTTON_WSWSCEN_PUBLISH, ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS, INFOPOP_WSWSCEN_CHECKBOX_LAUNCH_WS);
- monitorButton_ = utils_.createCheckbox(advancedButtonPanel,
- ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE, ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE, INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE);
-
- if (displayPreferences_ && getResourceContext().isOverwriteFilesEnabled()) {
- utils_.createHorizontalSeparator(parent, 1);
- Composite prefButtonPanel = utils_.createComposite(parent, 1);
- overwriteButton_ = utils_.createCheckbox(prefButtonPanel,
- ConsumptionUIMessages.CHECKBOX_OVERWRITE_FILES, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_OVERWRITE_FILES, INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE);
- overwriteButton_.setSelection(getResourceContext()
- .isOverwriteFilesEnabled());
- }
-
- return this;
- }
-
- private void launchProjectDialog()
- {
- String currentProjectName = getServiceProjectName();
- String currentEarProjectName = getServiceEarProjectName();
- String currentProjectType = getServiceComponentType();
- boolean currentNeedEar = getServiceNeedEAR();
-
- projectDialog_.setProjectName(currentProjectName);
- projectDialog_.setEarProjectName(currentEarProjectName);
- projectDialog_.setProjectComponentType(currentProjectType);
- projectDialog_.setNeedEAR(currentNeedEar);
-
- int status = projectDialog_.open();
- if (status == Window.OK)
- {
- String newProjectName = projectDialog_.getProjectName();
- String newEarProjectName = projectDialog_.getEarProjectName();
- String newProjectType = projectDialog_.getProjectComponentType();
- boolean newNeedEar = projectDialog_.getNeedEAR();
-
- //Update project settings and validate page if selections changed.
- if (!newProjectName.equals(currentProjectName)
- || !newEarProjectName.equals(currentEarProjectName)
- || !newProjectType.equals(currentProjectType)
- || newNeedEar != currentNeedEar) {
- setServiceProjectName(newProjectName);
- setServiceEarProjectName(newEarProjectName);
- setServiceComponentType(newProjectType);
- setServiceNeedEAR(newNeedEar);
- validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_PROJECT_CHANGES);
- statusListener_.handleEvent(null);
- }
-
- /*check to see if text has changed for project and EAR
- if so, repaint links */
- if (!newProjectName.equals(currentProjectName))
- {
- hLinkServiceProject_.pack(true);
- packSelf();
- }
- if (!newEarProjectName.equals(currentEarProjectName))
- {
- hLinkServiceEAR_.pack(true);
- packSelf();
- }
- }
- }
-
- private void launchRuntimeSelectionDialog(boolean clientContext)
- {
- launchRuntimeSelectionDialog(clientContext, false);
- }
-
- private void launchRuntimeSelectionDialog(boolean clientContext, boolean selectServerFirst)
- {
- byte mode = clientContext ? (byte)1 : (byte)0;
-
- //TODO: jvh - investigate - don't think j2ee version shouldn't be hard coded (last parm)
- // question - where to pick it up from?
- //Remember the current values
- TypeRuntimeServer currentServiceTRS = getServiceTypeRuntimeServer();
- IWorkbench workbench = PlatformUI.getWorkbench();
- RuntimeServerSelectionDialog rssd = new RuntimeServerSelectionDialog(
- workbench.getActiveWorkbenchWindow().getShell(), mode, currentServiceTRS, "14");
- rssd.setSelectServerFirst(selectServerFirst);
- int result = rssd.open();
- if (result == Window.OK)
- {
- TypeRuntimeServer newServiceTRS = rssd.getTypeRuntimeServer();
- if (!currentServiceTRS.equals(newServiceTRS))
- {
- setServiceTypeRuntimeServer(newServiceTRS);
- refreshClientServerRuntimeSelection();
- validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES);
- clientWidget_.setValidationState(ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES);
- statusListener_.handleEvent(null); //Revalidate the page since server/runtime selections changed.
- }
-
- }
- }
-
- public void setClientTypeRuntimeServer(TypeRuntimeServer ids) {
- clientWidget_.setTypeRuntimeServer( ids );
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer() {
- return clientWidget_.getTypeRuntimeServer();
- }
-
- public void setInstallClient(Boolean install) {
- clientWidget_.setInstallClient( install );
- }
-
- public Boolean getInstallClient() {
- return clientWidget_.getInstallClient();
- }
-
- public void setStartClient(Boolean startClient) {
- clientWidget_.setStartClient( startClient );
- }
-
- public Boolean getStartClient() {
- return clientWidget_.getStartClient();
- }
-
- public void setTestClient(Boolean testClient) {
- clientWidget_.setTestClient( testClient );
- }
-
- public Boolean getTestClient() {
- return clientWidget_.getTestClient();
- }
-
- public void setDevelopClient(boolean develop) {
- clientWidget_.setDevelopClient( develop );
- }
-
- public boolean getDevelopClient() {
- return clientWidget_.getDevelopClient();
- }
-
- public void setAssembleClient(boolean assemble) {
- clientWidget_.setAssembleClient( assemble );
- }
-
- public boolean getAssembleClient() {
- return clientWidget_.getAssembleClient();
- }
-
- public void setDeployClient(boolean deploy) {
- clientWidget_.setDeployClient( deploy );
- }
-
- public boolean getDeployClient() {
- return clientWidget_.getDeployClient();
- }
-
-private void handleTypeChange()
- {
- if (!preferencesPage_) {
- int scenario = getWebServiceScenario();
-
- if (scenario == WebServiceScenario.BOTTOMUP)
- {
- serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEIMPL);
- }
- else if (scenario == WebServiceScenario.TOPDOWN)
- {
- serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEDEF);
- }
- }
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer ids) {
- LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils2
- .getServiceTypeLabels();
- // rskreg
- int selection = 0;
- String[] serviceIds = labelIds.getIds_();
- String selectedId = ids.getTypeId();
-
- webserviceType_.setItems(labelIds.getLabels_());
-
- // Now find the selected one.
- for (int index = 0; index < serviceIds.length; index++) {
- if (selectedId.equals(serviceIds[index])) {
- selection = index;
- break;
- }
- }
- webserviceType_.select(selection);
-
- ids_ = ids;
-
- if (ids_ != null)
- {
- String serviceServerText = "";
- String serverId = ids_.getServerId();
- if (serverId != null && serverId.length()>0)
- {
- serviceServerText = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
- }
- String serviceRuntimeText = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(ids_.getRuntimeId());
-
- String currentServerText = hLinkServiceServer_.getText();
- String currentRuntimeText = hLinkServiceRuntime_.getText();
- String newServerText = SERVICE_SERVER_PREFIX + " " + serviceServerText;
- String newRuntimeText = SERVICE_RUNTIME_PREFIX + " " + serviceRuntimeText;
- hLinkServiceServer_.setText(newServerText);
- hLinkServiceRuntime_.setText(newRuntimeText);
-
- /*check to see if text has changed for server or runtime
- if so, repaint links */
- if (!newServerText.equals(currentServerText))
- {
- hLinkServiceServer_.pack(true);
- packSelf();
- }
-
- if (!newRuntimeText.equals(currentRuntimeText))
- {
- hLinkServiceRuntime_.pack(true);
- packSelf();
- }
- }
- labelIds_ = labelIds;
- handleTypeChange();
-
- if (projectDialog_ != null)
- projectDialog_.setTypeRuntimeServer(ids_);
-
-
- //When the server changes, the state of needEar could change.
- //If the the server change results in a change in the state of needEar,
- //update needEar and serviceEarProjectName.
- ValidationUtils vu = new ValidationUtils();
- boolean oldNeedEar = getServiceNeedEAR();
- boolean serviceProjectOrProjectTypeNeedsEar;
-
- if (!oldNeedEar)
- {
- //If an EAR was not needed previously it could have been because of the project/project type or the server.
- //If it was because of the project/project type, changing the server should have no impact
- //on the state of needEar.
- serviceProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getServiceProjectName(), getServiceComponentType());
- }
- else
- {
- serviceProjectOrProjectTypeNeedsEar = true;
- }
-
- //boolean serviceProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getServiceProjectName(), getServiceComponentType());
- if (serviceProjectOrProjectTypeNeedsEar)
- {
- //Could not rule out need for an Ear from the project/project type so changing the server
- //may impact the need for an Ear.
-
- boolean currentServiceServerNeedsEar = vu.serverNeedsEAR(getServiceTypeRuntimeServer().getServerId());
- if (oldNeedEar != currentServiceServerNeedsEar)
- {
- //Update needEar and serviceEarProjectName.
- if (currentServiceServerNeedsEar)
- {
- //Calculate a reasonable default for the Ear project name
- String earProjectName = DefaultingUtils.getDefaultEARProjectName(getServiceProjectName());
- setServiceNeedEAR(currentServiceServerNeedsEar);
- setServiceEarProjectName(earProjectName);
- }
- else
- {
- setServiceNeedEAR(currentServiceServerNeedsEar);
- setServiceEarProjectName("");
- }
-
- }
- }
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer() {
- return ids_;
- }
-
- public void setServiceGeneration(int value)
- {
- serviceScale_.setSelection(value);
- setGraphics(value);
-
- //enable client widget based on service scale setting
- clientWidget_.enableClientSlider(value<=ScenarioContext.WS_START);
-
- /*for popup case need to make sure that the UI is refreshed based on
- changes to data*/
- packSelf();
- }
-
- public int getServiceGeneration()
- {
- return serviceScale_.getSelection();
- }
-
- public boolean getDevelopService() {
- return developService_;
- }
-
- public void setDevelopService(boolean developService) {
- this.developService_ = developService;
- }
-
- public boolean getAssembleService() {
- return assembleService_;
- }
-
- public void setAssembleService(boolean assembleService) {
- this.assembleService_ = assembleService;
- }
-
- public boolean getDeployService() {
- return deployService_;
- }
-
- public void setDeployService(boolean deployService) {
- this.deployService_ = deployService;
- }
-
- public Boolean getStartService(){
- return startService_;
- }
-
- public void setStartService(Boolean value) {
- startService_=value;
- }
-
- public Boolean getInstallService() {
- return installService_;
- }
-
- public void setInstallService(Boolean value) {
- installService_=value;
- }
-
- public Boolean getTestService() {
- return
- new Boolean( testService_.booleanValue() || clientWidget_.getTestClient().booleanValue());
- }
-
- public void setTestService(Boolean value) {
- testService_= value;
- }
- public Boolean getMonitorService() {
- return new Boolean(monitorButton_.getSelection());
- }
-
- public void setMonitorService(Boolean value) {
- monitorButton_.setSelection(value.booleanValue());
- }
-
- public Boolean getPublishService() {
- return new Boolean(publishButton_.getSelection());
- }
-
- public void setPublishService(Boolean value) {
- publishButton_.setSelection( value.booleanValue() );
- }
-
- public Boolean getGenerateProxy() {
- return new Boolean(clientWidget_.getGenerateProxy());
- }
-
- public void setClientGeneration(int value)
- {
- clientWidget_.setClientGeneration(value);
- /*for popup case need to make sure that the UI is refreshed based on
- changes to data*/
- packSelf();
- }
-
- public String getClientEarProjectName()
- {
- return clientWidget_.getClientEarProjectName();
- }
-
- public String getClientProjectName()
- {
- return clientWidget_.getClientProjectName();
- }
-
- public int getClientGeneration()
- {
- return clientWidget_.getClientGeneration();
- }
-
- public ResourceContext getResourceContext() {
- if (resourceContext_ == null) {
- resourceContext_ = WebServicePlugin.getInstance()
- .getResourceContext();
- }
- return resourceContext_;
- }
-
- public void setResourceContext(ResourceContext context) {
- resourceContext_ = context;
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return objectSelection_;
- }
-
- public void setObjectSelection(IStructuredSelection selection )
- {
- objectSelection_ = selection;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return parser_;
- }
-
- public void setWebServicesParser(WebServicesParser parser)
- {
- parser_ = parser;
- clientWidget_.setWebServicesParser(parser);
- }
-
- public void internalize() {
-
- if (preferencesPage_)
- return;
-
- if (objectSelectionWidget_ == null)
- objectSelectionWidget_ = getSelectionWidget();
-
- String displayable = null;
-
- if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable) {
- IObjectSelectionLaunchable launchable = (IObjectSelectionLaunchable) objectSelectionWidget_;
- launchable.setInitialSelection(objectSelection_);
- objectSelection_ = launchable.getObjectSelection();
- displayable = launchable.getObjectSelectionDisplayableString();
- }
- else {
- IObjectSelectionWidget selectionWidget = (IObjectSelectionWidget) objectSelectionWidget_;
- selectionWidget.setInitialSelection(objectSelection_);
- displayable = selectionWidget.getObjectSelectionDisplayableString();
- }
-
- if (displayable == null || displayable.length() == 0)
- return;
-
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText(displayable);
- serviceImpl_.addModifyListener(objectModifyListener_);
- }
-
- public IStatus getStatus() {
- IStatus status = Status.OK_STATUS;
-
- IStatus missingFieldStatus = checkMissingFieldStatus();
- if (missingFieldStatus.getSeverity() == IStatus.ERROR) {
- return missingFieldStatus;
- }
-
- IStatus serviceImplValidationStatus = checkServiceImplTextStatus();
- if (serviceImplValidationStatus.getSeverity() == IStatus.ERROR) {
- return serviceImplValidationStatus;
- }
- else if (serviceImplValidationStatus.getSeverity() == IStatus.WARNING){
- return serviceImplValidationStatus;
- }
-
- IStatus possibleErrorStatus = checkErrorStatus();
- if (possibleErrorStatus.getSeverity() == IStatus.ERROR || possibleErrorStatus.getSeverity() == IStatus.WARNING) {
- return possibleErrorStatus;
- }
-
- IStatus possibleWarningStatus = checkWarningStatus();
- if (possibleWarningStatus.getSeverity() == IStatus.WARNING) {
- return possibleWarningStatus;
- }
-
- // If no warnings/errors were reported, clear validation state on
- // service side and client side (if enabled)
- validationState_ = ValidationUtils.VALIDATE_NONE;
- if (clientWidget_.getGenerateProxy()) {
- clientWidget_.setValidationState(ValidationUtils.VALIDATE_NONE);
- }
-
- return status;
- }
-
- /*
- * call validation code in the object selection widget to ensure any
- * modifications to the serviceImpl_ field are valid
- */
- private IStatus checkServiceImplTextStatus() {
-
- String fieldText = serviceImpl_.getText().trim();
-
- if (objectSelectionWidget_ == null)
- {
- objectSelectionWidget_ = getSelectionWidget();
- }
-
- IObjectSelectionLaunchable launchable = null;
- if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
- {
- launchable = (IObjectSelectionLaunchable)objectSelectionWidget_;
- validObjectSelection_ = launchable.validate(fieldText);
- }
- else
- {
- IObjectSelectionWidget widget = (IObjectSelectionWidget)objectSelectionWidget_;
- validObjectSelection_ = widget.validate(fieldText);
- }
-
- if (!validObjectSelection_)
- {
- int scenario = getWebServiceScenario();
-
- if (scenario == WebServiceScenario.BOTTOMUP){
- if (launchable != null){
- IStatus valStatus = launchable.validateSelection(new StructuredSelection(fieldText));
- if (valStatus.getSeverity() == IStatus.WARNING)
- return StatusUtils.warningStatus(ConsumptionUIMessages.MSG_WARN_SERVICE_IMPL_NAMING_CONVENTION);
- }
- else
- return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_IMPL);
- }
- else
- return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_DEF);
- }
-
- return Status.OK_STATUS;
- }
-
- private int getWebServiceScenario()
- {
- int index = webserviceType_.getSelectionIndex();
- String typeId = labelIds_.getIds_()[index];
- return WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId);
- }
-
- private IStatus checkMissingFieldStatus() {
-
- // 1. Check for missing fields on service side
- ValidationUtils valUtils = new ValidationUtils();
- String serviceImpl = serviceImpl_.getText().trim();
- String typeId = getServiceTypeRuntimeServer().getTypeId();
- String runtimeId = getServiceTypeRuntimeServer().getRuntimeId();
- String serverId = getServiceTypeRuntimeServer().getServerId();
- String projectName = getServiceProjectName();
- boolean needEar = getServiceNeedEAR();
- String earProjectName = getServiceEarProjectName();
- String projectTypeId = getServiceComponentType();
-
- IStatus serviceMissingFieldStatus = valUtils.checkMissingFieldStatus(validationState_, typeId, serviceImpl,
- runtimeId, serverId, projectName, needEar, earProjectName, projectTypeId, false);
- if (serviceMissingFieldStatus.getSeverity() == IStatus.ERROR) {
- return serviceMissingFieldStatus;
- }
-
- // 2. Check for missing fields on the client side if it's visible.
- if (clientWidget_.getGenerateProxy()) {
- IStatus clientMissingFieldsStatus = clientWidget_.checkMissingFieldStatus();
- if (clientMissingFieldsStatus.getSeverity() == IStatus.ERROR) {
- return clientMissingFieldsStatus;
- }
-
- }
-
- return Status.OK_STATUS;
- }
-
- private IStatus checkErrorStatus() {
-
- ValidationUtils valUtils = new ValidationUtils();
-
- // 1. Check for errors on service side
- String runtimeId = getServiceTypeRuntimeServer().getRuntimeId();
- String serverId = getServiceTypeRuntimeServer().getServerId();
- String serverInstanceId = getServiceTypeRuntimeServer().getServerInstanceId();
- String typeId = getServiceTypeRuntimeServer().getTypeId();
- String projectName = getServiceProjectName();
- boolean needEar = getServiceNeedEAR();
- String earProjectName = getServiceEarProjectName();
- String projectTypeId = getServiceComponentType();
- IStatus serviceSideErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId,
- serverInstanceId, projectName, needEar, earProjectName, projectTypeId, false);
- if (serviceSideErrorStatus.getSeverity() == IStatus.ERROR) {
- return serviceSideErrorStatus;
- }
-
- // 2. Check for errors on client side if it is visible
- if (clientWidget_.getGenerateProxy()) {
- IStatus clientSideErrorStatus = clientWidget_.checkErrorStatus();
- if (clientSideErrorStatus.getSeverity() == IStatus.ERROR) {
- return clientSideErrorStatus;
- }
-
- // 3. Check for errors that span service and client if client side
- // is visible.
- int clientValidationState = clientWidget_.getValidationState();
- if (validationState_ == ValidationUtils.VALIDATE_ALL
- || validationState_ == ValidationUtils.VALIDATE_PROJECT_CHANGES
- || clientValidationState == ValidationUtils.VALIDATE_ALL
- || clientValidationState == ValidationUtils.VALIDATE_PROJECT_CHANGES) {
- IWebServiceRuntimeChecker runtimeChecker = null;
-
- String serviceRuntimeId = WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(getServiceTypeRuntimeServer(), projectName, projectTypeId);
- runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId);
-
- if (runtimeChecker != null) {
- return runtimeChecker.checkServiceClientCompatibility(
- getServiceNeedEAR(), getServiceEarProjectName(), getServiceProjectName(),
- clientWidget_.getClientNeedEAR(), clientWidget_.getClientEarProjectName(),
- clientWidget_.getClientProjectName());
- }
- }
- }
-
- return Status.OK_STATUS;
- }
-
- private IStatus checkWarningStatus() {
- ValidationUtils valUtils = new ValidationUtils();
- // 1. Check for warnings on the service side
- int scaleSetting = getServiceGeneration();
- String serverId = getServiceTypeRuntimeServer().getServerId();
- IStatus serviceWarningStatus = valUtils.checkWarningStatus(validationState_, scaleSetting, serverId, getServiceTypeRuntimeServer().getServerInstanceId(), false);
- if (serviceWarningStatus.getSeverity() == IStatus.WARNING) {
- return serviceWarningStatus;
- }
-
- // 2. Check for warnings on the client side if it's enabled
- if (clientWidget_.getGenerateProxy()) {
- IStatus clientWarningStatus = clientWidget_.checkWarningStatus();
- if (clientWarningStatus.getSeverity() == IStatus.WARNING) {
- return clientWarningStatus;
- }
-
- }
-
- return Status.OK_STATUS;
- }
-
- protected void initImageRegistry()
- {
- imageReg_ = new ImageRegistry(Display.getCurrent());
-
- imageReg_.put(ICON_SCALE_BG_0, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_0));
- imageReg_.put(ICON_SCALE_BG_1, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_1));
- imageReg_.put(ICON_SCALE_BG_2, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_2));
- imageReg_.put(ICON_SCALE_BG_3, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_3));
- imageReg_.put(ICON_SCALE_BG_4, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_4));
- imageReg_.put(ICON_SCALE_BG_5, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_5));
- imageReg_.put(ICON_SCALE_BG_6, WebServiceConsumptionUIPlugin
- .getImageDescriptor(ICON_SCALE_BG_6));
-
- imageReg_.put(GRAPHIC_SERVICE_0, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_0));
- imageReg_.put(GRAPHIC_SERVICE_1, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_1));
- imageReg_.put(GRAPHIC_SERVICE_2, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_2));
- imageReg_.put(GRAPHIC_SERVICE_3, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_3));
- imageReg_.put(GRAPHIC_SERVICE_4, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_4));
- imageReg_.put(GRAPHIC_SERVICE_5, WebServiceCreationUIPlugin
- .getImageDescriptor(GRAPHIC_SERVICE_5));
- }
-
- private void setAdvancedOptions(boolean enabled)
- {
- monitorButton_.setEnabled(enabled);
- publishButton_.setEnabled(enabled);
- }
-
- public void setServiceProjectName(String name)
- {
- serviceProjectName_= name;
- hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX + " " + serviceProjectName_);
- hLinkServiceProject_.pack(true);
- packSelf();
- }
-
- public void setServiceEarProjectName(String name)
- {
- serviceEarProjectName_ = name;
- refreshEARLink();
- }
-
- public void refreshEARLink()
- {
- hLinkServiceEAR_.setVisible(needEar_);
- if (needEar_)
- {
- hLinkServiceEAR_.setText(SERVICE_EAR_PREFIX + " " + serviceEarProjectName_);
- hLinkServiceEAR_.pack(true);
- packSelf();
- }
- }
- public void setServiceComponentType( String type )
- {
- serviceComponentType_ = type;
- }
-
- public void setClientProjectName(String name)
- {
- clientWidget_.setClientProjectName(name);
- }
-
- public void setClientEarProjectName(String name)
- {
- clientWidget_.setClientEarProjectName(name);
- }
-
- IProject project_;
-
- public String getServiceComponentType()
- {
- return serviceComponentType_;
- }
-
- public void setClientComponentType(String type)
- {
- clientWidget_.setClientComponentType(type);
- }
-
- public String getClientComponentType()
- {
- return clientWidget_.getClientComponentType();
- }
-
- public String getServiceProjectName()
- {
- return serviceProjectName_;
- }
-
- public String getServiceEarProjectName()
- {
- return serviceEarProjectName_;
- }
-
- public void setClientProject(IProject project)
- {
- clientWidget_.setProject(project);
- }
-
- private IProject getClientProject()
- {
- return clientWidget_.getProject();
- }
-
- public void setProject(IProject project)
- {
- project_ = project;
- }
-
- public IProject getProject()
- {
- return project_;
- }
-
- public String getServiceRuntimeId()
- {
- // calculate the most appropriate serviceRuntimeId based on current settings.
- return WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(getServiceTypeRuntimeServer(), getServiceProjectName(), getServiceComponentType());
- }
-
- public String getClientRuntimeId()
- {
- return clientWidget_.getClientRuntimeId();
- }
-
- public void setServiceNeedEAR(boolean b)
- {
- needEar_ = b;
- refreshEARLink();
- }
-
- public boolean getServiceNeedEAR()
- {
- return needEar_;
- }
-
- public void setClientNeedEAR(boolean b)
- {
- clientWidget_.setClientNeedEAR(b);
- }
-
- public boolean getClientNeedEAR()
- {
- return clientWidget_.getClientNeedEAR();
- }
-
- // looks through extensions and returns the appropriate selection widget
- private Object getSelectionWidget()
- {
- String wst = getServiceTypeRuntimeServer().getTypeId();
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
- Object result = null;
-
-
- if (wsimpl != null)
- {
- String objectSelectionWidgetId = null;
- if (scenario == WebServiceScenario.TOPDOWN)
- {
- objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget";
- }
- else
- {
- objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
- }
-
- ObjectSelectionRegistry registry = ObjectSelectionRegistry.getInstance();
- boolean editable = registry.getExternalModify( objectSelectionWidgetId );
-
- serviceImpl_.setEditable( editable );
- result = registry.getSelectionWidget( objectSelectionWidgetId );
- }
-
- return result;
- }
-
- // for the purposes of disabling the service implementation controls from the preferences dialog
- public void disableNonPreferenceWidgets()
- {
- if (serviceImpl_ != null)
- serviceImpl_.setEnabled(false);
- if (browseButton_ != null)
- browseButton_.setEnabled(false);
- if (hCompService_ != null)
- {
- hCompService_.setVisible(false);
- }
- clientWidget_.disableNonPreferenceWidgets();
- }
-
- private void setGraphics(int value)
- {
- String iconImage = "";
- String toplogyImage = "";
- switch (value) {
- case 0:
- iconImage=ICON_SCALE_BG_0;
- toplogyImage=GRAPHIC_SERVICE_0;
- break;
- case 1:
- iconImage=ICON_SCALE_BG_1;
- toplogyImage=GRAPHIC_SERVICE_1;
- break;
- case 2:
- iconImage=ICON_SCALE_BG_2;
- toplogyImage=GRAPHIC_SERVICE_2;
- break;
- case 3:
- iconImage=ICON_SCALE_BG_3;
- toplogyImage=GRAPHIC_SERVICE_3;
- break;
- case 4:
- iconImage=ICON_SCALE_BG_4;
- toplogyImage=GRAPHIC_SERVICE_4;
- break;
- case 5:
- case 6:
- iconImage=ICON_SCALE_BG_5;
- toplogyImage=GRAPHIC_SERVICE_5;
- break;
- default:
- break;
- }
- serviceScale_.setBackgroundImage(imageReg_.get(iconImage));
- topologySpot_.setImage(imageReg_.get(toplogyImage));
- }
-
- private void refreshServerRuntimeSelection()
- {
- //new up ServerRuntimeSelectionWidgetDefaultingCommand
- ServerRuntimeSelectionWidgetDefaultingCommand serverRTDefaultCmd = new ServerRuntimeSelectionWidgetDefaultingCommand();
-
- //call setters of new defaulting command:
- serverRTDefaultCmd.setInitialSelection(getObjectSelection());
- serverRTDefaultCmd.setInitialProject(getProject());
- serverRTDefaultCmd.setGenerateProxy(clientWidget_.getGenerateProxy());
- serverRTDefaultCmd.setServiceTypeRuntimeServer(getServiceTypeRuntimeServer());
- serverRTDefaultCmd.setWebServicesParser(getWebServicesParser());
- serverRTDefaultCmd.setClientInitialSelection(getObjectSelection());
- serverRTDefaultCmd.setClientInitialProject(getClientProject());
- serverRTDefaultCmd.setClientEarProjectName(clientWidget_.getClientEarProjectName());
- serverRTDefaultCmd.setClientTypeRuntimeServer(getClientTypeRuntimeServer());
-
- serverRTDefaultCmd.execute(null, null);
-
- //perform mappings from the defaulting command to the project settings...
- setServiceProjectName(serverRTDefaultCmd.getServiceProjectName());
- setServiceEarProjectName(serverRTDefaultCmd.getServiceEarProjectName());
- setServiceComponentType(serverRTDefaultCmd.getServiceComponentType());
- setClientProjectName(serverRTDefaultCmd.getClientProjectName());
- setClientEarProjectName(serverRTDefaultCmd.getClientEarProjectName());
- setServiceTypeRuntimeServer(serverRTDefaultCmd.getServiceTypeRuntimeServer());
- setClientTypeRuntimeServer(serverRTDefaultCmd.getClientTypeRuntimeServer());
- setServiceNeedEAR(serverRTDefaultCmd.getServiceNeedEAR());
- setClientNeedEAR(serverRTDefaultCmd.getClientNeedEAR());
- setClientComponentType(serverRTDefaultCmd.getClientComponentType());
- }
-
- /**
- * Update client server and runtime based on service side
- */
- private void refreshClientServerRuntimeSelection()
- {
- TypeRuntimeServer clientTypeRuntimeserver = getClientTypeRuntimeServer();
- clientTypeRuntimeserver.setRuntimeId(getServiceTypeRuntimeServer().getRuntimeId());
- clientTypeRuntimeserver.setServerId(getServiceTypeRuntimeServer().getServerId());
- clientTypeRuntimeserver.setServerInstanceId(getServiceTypeRuntimeServer().getServerInstanceId());
- setClientTypeRuntimeServer(clientTypeRuntimeserver);
- }
-
-
- private void callObjectTransformation(IStructuredSelection objectSelection,
- IProject project, String componentName, boolean refreshRuntime)
- {
- ObjectSelectionOutputCommand objOutputCommand = new ObjectSelectionOutputCommand();
- objOutputCommand.setTypeRuntimeServer(getServiceTypeRuntimeServer());
- objOutputCommand.setObjectSelection(objectSelection);
- objOutputCommand.setProject(project);
- objOutputCommand.setComponentName(componentName);
-
- objOutputCommand.execute(null, null);
-
- setWebServicesParser(objOutputCommand.getWebServicesParser());
- setObjectSelection(objOutputCommand.getObjectSelection());
- setProject(objOutputCommand.getProject());
-
- if (refreshRuntime || forceRefreshRuntime)
- refreshServerRuntimeSelection();
-
- forceRefreshRuntime = false;
- }
-
- private class ScaleSelectionListener implements SelectionListener
- {
- public void widgetSelected(SelectionEvent e) {
-
- Scale scale = (Scale)e.widget;
- int selection = scale.getSelection();
-
- //TODO: change the hard coded integers here to the the ScenarioContext.WS_xxx when in less critical phase
- switch (selection) {
- case 0:
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST);
- break;
- case 1:
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN);
- break;
- case 2:
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL);
- break;
- case 3:
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY);
- break;
- case 4:
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE);
- break;
- case 5:
- case 6:
- serviceScale_.setSelection(ScenarioContext.WS_DEVELOP); //"no selection" is not allowed...must develop service @ minimum
- serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP);
- //reset local selection so that setters get correct value below
- selection = ScenarioContext.WS_DEVELOP;
- break;
- default:
- break;
- }
-
- setDevelopService(selection <= ScenarioContext.WS_DEVELOP);
- setAssembleService(selection <= ScenarioContext.WS_ASSEMBLE);
- setDeployService(selection <= ScenarioContext.WS_DEPLOY);
-
- setTestService(new Boolean(selection <= ScenarioContext.WS_TEST));
- setInstallService(new Boolean(selection <= ScenarioContext.WS_INSTALL));
- setStartService(new Boolean(selection <= ScenarioContext.WS_START));
- setAdvancedOptions(selection <= ScenarioContext.WS_INSTALL);
- clientWidget_.enableClientSlider(selection <= ScenarioContext.WS_START);
-
- setGraphics(selection);
-
- //Validate the page
- validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SCALE_CHANGES);
- statusListener_.handleEvent(null);
-
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- }
-
- private class ServiceImplBrowseListener implements SelectionListener
- {
- public void widgetDefaultSelected(SelectionEvent e) {
- // TODO Auto-generated method stub
- }
-
- public void widgetSelected(SelectionEvent e) {
-
- if (objectSelectionWidget_ == null)
- objectSelectionWidget_ = getSelectionWidget();
-
- IStructuredSelection objectSelection = null;
- IProject project = null;
- String componentName="";
- int result=Dialog.CANCEL;
-
- if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
- {
- IObjectSelectionLaunchable launchable = ((IObjectSelectionLaunchable)objectSelectionWidget_);
- launchable.setInitialSelection(getObjectSelection());
- IWorkbench workbench = PlatformUI.getWorkbench();
- result = launchable.launch(workbench.getActiveWorkbenchWindow().getShell());
- if (result == Dialog.OK)
- {
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText(launchable.getObjectSelectionDisplayableString());
- serviceImpl_.addModifyListener(objectModifyListener_);
- objectSelection = launchable.getObjectSelection();
- project = launchable.getProject();
- componentName= launchable.getComponentName();
- }
- }
- else
- {
- browseDialog_.setTypeRuntimeServer(getServiceTypeRuntimeServer());
- browseDialog_.setInitialSelection(getObjectSelection());
- result = browseDialog_.open();
- if (result == Dialog.OK)
- {
- serviceImpl_.removeModifyListener(objectModifyListener_);
- serviceImpl_.setText(browseDialog_.getDisplayableSelectionString());
- serviceImpl_.addModifyListener(objectModifyListener_);
- objectSelection = browseDialog_.getObjectSelection();
- project = browseDialog_.getProject();
- componentName= browseDialog_.getComponentName();
- }
- }
-
- // call ObjectSelectionOutputCommand to carry out any transformation on the objectSelection
- if (result == Dialog.OK)
- {
- callObjectTransformation(objectSelection, project, componentName, getWebServiceScenario() != WebServiceScenario.TOPDOWN);
- validationState_ = ValidationUtils.VALIDATE_ALL;
- statusListener_.handleEvent(null); // validate the page
- }
- }
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
deleted file mode 100644
index 3fc863a26..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20070327 172339 kathy@ca.ibm.com - Kathy Chan
- * 20080220 219537 makandre@ca.ibm.com - Andrew Mak
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefaultingCommand
-{
- private TypeRuntimeServer typeRuntimeServer_;
- private IStructuredSelection initialSelection_;
- private int serviceGeneration_;
- private boolean developService_;
- private boolean assembleService_;
- private boolean deployService_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
-
- String type = getScenarioContext().getWebServiceType();
- String runtime = WebServiceRuntimeExtensionUtils2.getDefaultRuntimeValueFor( type );
-
- String factoryID = WebServiceRuntimeExtensionUtils2.getDefaultServerValueFor(type);
- typeRuntimeServer_ = new TypeRuntimeServer();
-
- typeRuntimeServer_.setTypeId( type );
- typeRuntimeServer_.setRuntimeId( runtime );
- typeRuntimeServer_.setServerId( factoryID );
-
- //Default the typeId from the initial selection
- String[] typeIds = WebServiceRuntimeExtensionUtils2.getWebServiceTypeBySelection(initialSelection_);
-
- if (typeIds!=null && typeIds.length>0)
- {
- typeRuntimeServer_.setTypeId(typeIds[0]);
- } else {
- if (initialSelection_ != null && !initialSelection_.isEmpty())
- {
- Object initialObject = initialSelection_.getFirstElement();
- // initialObject would not be null since !initialSelection_.isEmpty()
- boolean hasAdapter = AdapterUtils.hasAdapter(initialObject);
- if (hasAdapter) {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
- entrybuff.append("/");
- entrybuff.append("org.eclipse.jst.ws.wsImpl.java");
- String entry = entrybuff.toString();
- typeRuntimeServer_.setTypeId(entry);
- }
- }
- }
-
- serviceGeneration_ = getScenarioContext().getGenerateWebService();
-
- developService_ = serviceGeneration_ <= ScenarioContext.WS_DEVELOP;
- assembleService_ = serviceGeneration_ <= ScenarioContext.WS_ASSEMBLE;
- deployService_ = serviceGeneration_ <= ScenarioContext.WS_DEPLOY;
-
- defaultClientScale();
-
- return Status.OK_STATUS;
- }
-
- public void setInitialSelection(IStructuredSelection selection)
- {
- initialSelection_ = selection;
- }
-
- public IStructuredSelection getInitialSelection()
- {
- return initialSelection_ ;
- }
-
- IProject project_;
-
- public IProject getInitialProject()
- {
- if (project_==null)
- {
- project_ = getProjectFromObjectSelection(initialSelection_);
- }
-
- return project_;
- }
-
- private IProject getProjectFromObjectSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null)
- return null;
- IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
- return p;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return typeRuntimeServer_;
- }
-
- public Boolean getInstallService()
- {
- return new Boolean( getScenarioContext().getInstallWebService() );
- }
-
- public Boolean getStartService()
- {
- return new Boolean( getScenarioContext().getStartWebService() );
- }
-
- public Boolean getTestService()
- {
- return new Boolean( getScenarioContext().getTestWebService() );
- }
-
- public Boolean getPublishService()
- {
- return new Boolean( getScenarioContext().getLaunchWebServiceExplorer() );
- }
-
- public Boolean getGenerateProxy()
- {
- return new Boolean( getScenarioContext().getGenerateProxy() );
- }
-
- public boolean getRunTestClient()
- {
- return getScenarioContext().isLaunchSampleEnabled();
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean(getScenarioContext().getMonitorWebService());
- }
-
- public int getServiceGeneration()
- {
- return serviceGeneration_;
- }
-
- public int getClientGeneration()
- {
- return getScenarioContext().getGenerateClient();
- }
-
- public boolean getDevelopService() {
- return developService_;
- }
-
- public boolean getAssembleService() {
- return assembleService_;
- }
-
- public boolean getDeployService() {
- return deployService_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
deleted file mode 100644
index 6252ca65e..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060727 144354 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-
-
-public class ServerWizardWidgetOutputCommand extends ClientWizardWidgetOutputCommand
-{
- private TypeRuntimeServer typeRuntimeServer_;
- private boolean installService_;
- private boolean startService_;
- private boolean testService_;
- private boolean testClient_;
- private boolean runTestClient_;
- private boolean publishService_;
- private boolean generateProxy_;
- private boolean developService_;
- private boolean assembleService_;
- private boolean deployService_;
-
- private ResourceContext resourceContext_;
- private IStructuredSelection selection_;
-
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return typeRuntimeServer_;
- }
-
- public boolean getInstallService()
- {
- return installService_;
- }
-
- public boolean getStartService()
- {
- return startService_;
- }
-
- public boolean getTestService()
- {
- return testService_;
- }
-
- public boolean getRunTestClient()
- {
- return runTestClient_;
- }
-
- public boolean getPublishService()
- {
- return publishService_;
- }
-
- public boolean getGenerateProxy()
- {
- return generateProxy_;
- }
-
- public ResourceContext getResourceContext()
- {
- return resourceContext_;
- }
-
- /**
- * @param generateProxy_ The generateProxy_ to set.
- */
- public void setGenerateProxy(boolean generateProxy_)
- {
- this.generateProxy_ = generateProxy_;
- }
- /**
- * @param publishService_ The publishService_ to set.
- */
- public void setPublishService(boolean publishService_)
- {
- this.publishService_ = publishService_;
- }
- /**
- * @param installService_ The installService_ to set.
- */
- public void setInstallService(boolean installService_)
- {
- this.installService_ = installService_;
- }
- /**
- * @param startService_ The startService_ to set.
- */
- public void setStartService(boolean startService_)
- {
- this.startService_ = startService_;
- }
- /**
- * @param testService_ The testService_ to set.
- */
- public void setTestService(boolean testService_)
- {
- this.testService_ = testService_;
- }
-
- /**
- * @param testService_ The testService_ to set.
- */
- public void setRunTestClient(boolean runTestClient_)
- {
- this.runTestClient_ = runTestClient_;
- }
-
- /**
- * @param typeRuntimeServer_ The typeRuntimeServer_ to set.
- */
- public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer_)
- {
- this.typeRuntimeServer_ = typeRuntimeServer_;
- }
-
- public void setResourceContext(ResourceContext rc)
- {
- resourceContext_ = rc;
- }
-
- public void setObjectSelection(IStructuredSelection selection)
- {
- selection_ = selection;
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return selection_;
- }
-
- public boolean getDevelopService() {
- return developService_;
- }
-
- public void setDevelopService(boolean developService) {
- this.developService_ = developService;
- }
-
- public boolean getAssembleService() {
- return assembleService_;
- }
-
- public void setAssembleService(boolean assembleService) {
- this.assembleService_ = assembleService;
- }
-
- public boolean getDeployService() {
- return deployService_;
- }
-
- public void setDeployService(boolean deployService) {
- this.deployService_ = deployService;
- }
-
- public boolean getTestClient() {
- return testClient_;
- }
-
- public void setTestClient(boolean testClient_) {
- this.testClient_ = testClient_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java
deleted file mode 100644
index fd210a0d9..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060410 135441 joan@ca.ibm.com - Joan Haggarty
- * 20060418 136335 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.ui.widgets.AbstractSelectionDialog;
-import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServiceImplSelectionDialog extends AbstractSelectionDialog {
-
- TypeRuntimeServer trs_;
- String titleText_;
- IStructuredSelection selection_;
-
- public ServiceImplSelectionDialog(Shell parent, PageInfo pageInfo) {
- super(parent, pageInfo);
- titleText_ = pageInfo.getPageName();
- }
-
- protected void callSetters()
- {
- ((ObjectSelectionWidget)getWidget()).setTypeRuntimeServer(trs_);
- ((ObjectSelectionWidget)getWidget()).setInitialSelection(selection_);
- }
-
- public void setTypeRuntimeServer(TypeRuntimeServer trs)
- {
- trs_ = trs;
-
- // set dialog title text based on the web service scenario
- if (trs != null)
- {
- String typeId = trs.getTypeId();
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId);
-
- if (scenario == WebServiceScenario.BOTTOMUP)
- {
- titleText_ = ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION;
- }
- else if (scenario == WebServiceScenario.TOPDOWN)
- {
- titleText_ = ConsumptionUIMessages.DIALOG_TITILE_SERVICE_DEF_SELECTION;
- }
- }
- }
-
- protected void setShellStyle(int newShellStyle)
- {
- super.setShellStyle( newShellStyle | SWT.RESIZE );
- }
-
- protected void configureShell(Shell newShell)
- {
- newShell.setText(titleText_);
- super.configureShell(newShell);
- }
-
- public String getDisplayableSelectionString() {
-
- return ((ObjectSelectionWidget)getWidget()).getObjectSelectionDisplayableString();
- }
-
- public IStructuredSelection getObjectSelection() {
- return ((ObjectSelectionWidget)getWidget()).getObjectSelection();
- }
-
- public IProject getProject(){
- return ((ObjectSelectionWidget)getWidget()).getProject();
- }
-
- public String getComponentName(){
- return ((ObjectSelectionWidget)getWidget()).getComponentName();
- }
-
- public void setInitialSelection(IStructuredSelection selection)
- {
- selection_ = selection;
- }
-
- protected Point getInitialSize()
- {
- return ((ObjectSelectionWidget)getWidget()).getWidgetSize();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
deleted file mode 100644
index d0067a5d8..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class ExportWSWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private DataMappingRegistry dataMappingRegistry;
- private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
- public ExportWSWidgetBinding()
- {
- publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- SequenceFragment root = new SequenceFragment();
- root.add(new SimpleFragment("WSExport"));
- root.add(publishToPrivateUDDICmdFrag);
- root.add(new SimpleFragment(new WSExplorerLauncherCommand(), ""));
- return root;
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- publishToPrivateUDDICmdFrag.registerCanFinish(this.canFinishRegistry);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- this.dataMappingRegistry = dataRegistry;
- publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry);
-
- // PublishToPrivateUDDICommandFragment
- dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-
- // LaunchWebServicesExplorerCommand
- dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
- dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- this.widgetRegistry = widgetRegistry;
- publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry);
-
- widgetRegistry.add("WSExport",
- ConsumptionUIMessages.PAGE_TITLE_WS_PUBLISH,
- ConsumptionUIMessages.PAGE_DESC_WS_PUBLISH,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PublishWSWidget(true);
- }
- }
- );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
deleted file mode 100644
index 6d0f38e70..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PublishWSDLWidgetBinding implements CommandWidgetBinding
-{
- public PublishWSDLWidgetBinding()
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new SimpleFragment();
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
-
- /* (non-Javadoc),
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
deleted file mode 100644
index 3d2c1d28e..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
+++ /dev/null
@@ -1,645 +0,0 @@
-/*******************************************************************************
- * 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060204 121605 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060407 135415 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060410 135562 joan@ca.ibm.com - Joan Haggarty
- * 20060417 136391 joan@ca.ibm.com - Joan Haggarty
- * 20060425 138052 kathy@ca.ibm.com - Kathy Chan
- * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529 141422 kathy@ca.ibm.com - Kathy Chan
- * 20060530 144358 kathy@ca.ibm.com - Kathy Chan
- * 20060608 145529 kathy@ca.ibm.com - Kathy Chan
- * 20060609 86421 kathy@ca.ibm.com - Kathy Chan
- * 20060727 144354 kathy@ca.ibm.com - Kathy Chan
- * 20060728 145426 kathy@ca.ibm.com - Kathy Chan
- * 20060810 135395 makandre@ca.ibm.com - Andrew Mak, Enable WTP Web service framework opening Java editor
- * 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20070502 180304 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071031 140518 joan@ca.ibm.com - Joan Haggarty
- * 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ComputeProxyEndpointCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ManageServerStartUpCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerInstToIServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.LaunchFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.WebServiceTestDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.ui.command.OpenEditorCommand;
-
-public class ServerWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry_;
- private WidgetRegistry widgetRegistry_;
- private DataMappingRegistry dataMappingRegistry_;
- private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
- public ServerWidgetBinding()
- {
- publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new ServiceRootCommandFragment();
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- canFinishRegistry_ = canFinishRegistry;
- publishToPrivateUDDICmdFrag.registerCanFinish(canFinishRegistry_);
- }
-
- /* (non-Javadoc),
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataMappingRegistry_ = dataRegistry;
-
- // Before ServerWizardWidget
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceGeneration", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", CreateMonitorCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ComputeEndpointCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ComputeProxyEndpointCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientGeneration", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", ServerWizardWidget.class);
-
-
- // After ServerWizardWidget
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class );
- dataRegistry.addMapping(ServerWizardWidget.class, "InstallService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "InstallClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "StartService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "TestService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", CreateMonitorCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", ComputeEndpointCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", ComputeProxyEndpointCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "PublishService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ObjectSelection", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "DevelopService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "AssembleService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "DeployService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "DevelopClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "AssembleClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "DeployClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "StartClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "TestClient", ServerWizardWidgetOutputCommand.class);
-
- // Before ObjectSelectionWidget
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ClientFragment.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ServerWizardWidget.class); //jvh
-
- // After ServerWizardWidget
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "WebServicesParser", ServerExtensionDefaultingCommand.class );
-
- // Map fragments that depend on data.
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-
- // CreateMonitorCommand
- dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeEndpointCommand.class);
- dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeProxyEndpointCommand.class);
-
- // ComputeEndpointCommand
- dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ServiceTestWidget.class);
- dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ComputeProxyEndpointCommand.class);
-
- // ComputeProxyEndpointCommand
- dataRegistry.addMapping(ComputeProxyEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class);
-
- // 145426
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyEndpoint", ComputeProxyEndpointCommand.class);
-
- //ServiceTestWidget mappings
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", CreateMonitorCommand.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ComputeEndpointCommand.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WebServicesParser", ComputeEndpointCommand.class);
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ServiceTestFacilities", ServiceTestWidget.class);
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "Environment", ServiceTestWidget.class);
- dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", FinishTestFragment.class);
- dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", TestDefaultingFragment.class);
-
- // Before Client Test widget.
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
-
- // Before ClientTestWidget
-
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunTestClient",ClientTestWidget.class);
-
- // After ClientTestWidget
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "RunTestClient",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "Methods",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class);
- // PublishWSWidget
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
-
- // PublishToPrivateUDDICommandFragment
- dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-
- // LaunchWebServicesExplorerCommand
- dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", LaunchFragment.class);
- dataRegistry.addMapping(PublishWSWidget.class, "PublishToPublicUDDI", LaunchFragment.class);
- // TODO Need defaults for these properties.
- dataRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
- dataRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
-
- widgetRegistry_ = widgetRegistry;
- publishToPrivateUDDICmdFrag.registerWidgetMappings(widgetRegistry_);
-
- widgetRegistry.add( "ServerWizardWidget",
- ConsumptionUIMessages.PAGE_TITLE_WS_PROJECT,
- ConsumptionUIMessages.PAGE_DESC_WS_SERVICE,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ServerWizardWidget( true, false );
- }
- } );
-
- widgetRegistry.add( "TestService",
- ConsumptionUIMessages.PAGE_TITLE_WSTEST,
- ConsumptionUIMessages.PAGE_DESC_WSTEST,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ServiceTestWidget();
- }
- } );
-
- widgetRegistry.add( "ClientTestWidget",
- ConsumptionUIMessages.PAGE_TITLE_WS_SAMPLE,
- ConsumptionUIMessages.PAGE_DESC_WS_SAMPLE,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientTestWidget();
- }
- });
-
- widgetRegistry.add( "Publish",
- ConsumptionUIMessages.PAGE_TITLE_WS_PUBLISH,
- ConsumptionUIMessages.PAGE_DESC_WS_PUBLISH,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PublishWSWidget(true);
- }
- } );
- }
-
- private class ClientFragment extends BooleanFragment
- {
- boolean genProxy_ = false;
-
- public ClientFragment()
- {
- setCondition( new Condition()
- {
- public boolean evaluate()
- {
- return genProxy_;
- }
- });
-
- SequenceFragment clientRoot = new SequenceFragment();
-
- clientRoot.add( new SimpleFragment( new ClientExtensionDefaultingCommand( false ), ""));
- //clientRoot.add(new SimpleFragment(new ClientServerDeployableConfigCommand(), "")); //Note: added here for client
- //clientRoot.add( new ClientExtensionFragment() );
- clientRoot.add( new ClientRootFragment() );
- clientRoot.add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ));
-
- setTrueFragment( clientRoot );
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- genProxy_ = genProxy;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // Map the output of the service scenario to the client scenario.
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class );
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerFactoryId", ClientExtensionDefaultingCommand.class );
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ClientExtensionDefaultingCommand.class );
-
-
- // Setup the PreClientDevelopCommand.
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "TestService", PreClientDevelopCommand.class);
-
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DevelopClient", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "AssembleClient", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DeployClient", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "StartClient", PreClientDevelopCommand.class, "StartService", null);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", PreClientDevelopCommand.class, "Module", null );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", PreClientDevelopCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", PreClientDevelopCommand.class, "Ear", null );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class);
- dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );
- }
- }
-
- private class ServiceRootCommandFragment extends SequenceFragment
- {
- public ServiceRootCommandFragment()
- {
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-
- add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), ""));
- add (new SimpleFragment( new ObjectSelectionOutputCommand(), ""));
- add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( "ServerWizardWidget" ) );
- add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));
- add( new ServiceRootFragment() );
- add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
- add(new SimpleFragment(new CreateMonitorCommand(), ""));
- add(new SimpleFragment(new ComputeEndpointCommand(), ""));
- add( new ServiceTestFragment( "TestService") );
- add( new ClientFragment() );
- add( new SimpleFragment(new TestDefaultingFragment(),""));
- add( new SimpleFragment(new ComputeProxyEndpointCommand(), ""));
- add( new ClientTestFragment( "ClientTestWidget") );
- add( new SimpleFragment( "Publish") );
- add(publishToPrivateUDDICmdFrag);
- add( new SimpleFragment( new OpenEditorCommand(), "") );
- add(new LaunchFragment());
- add(new FinishFragment());
-
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- publishToPrivateUDDICmdFrag.registerDataMappings(dataMappingRegistry_);
-
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerWizardWidgetDefaultingCommand.class );
-
- // Map ServerWizardWidgetDefaultingCommand to ObjectSelectionOutputCommand
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialSelection", ObjectSelectionOutputCommand.class, "ObjectSelection", null);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ObjectSelectionOutputCommand.class, "TypeRuntimeServer", null);
-
- // Map ServerWizardWidgetDefaultingCommand to ServerWizardWidgetOutputCommand
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "RunTestClient", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
-
- // Map ServerWizardWidgetOutputCommand.
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "RunTestClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class); // KSC
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployService", ServerExtensionDefaultingCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleClient", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployClient", ClientExtensionDefaultingCommand.class);
-
-
- //Map ObjectSelectionOutputCommand to ServerRuntimeSelectionWidgetDefaultingCommand
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-
- //Map ObjectSelectionOutputCommand to ServerWizardWidgetOutputCommand
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerWizardWidgetOutputCommand.class);
-
- //to the test wizard
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServiceTestFragment.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", WSDLTestLaunchCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSDLTestLaunchCommand.class);
-
- // Map ServerRuntimeSelectionWidgetDefaultingCommand
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientFragment.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.class );
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "InstallService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "MonitorService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "PublishService", ServerExtensionDefaultingCommand.class);
-
-
- // Map ServerExtensionDefaultingCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ServiceTestFragment.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "Publish", PublishToPrivateUDDICommandFragment.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer",WSDLTestLaunchCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ClientTestDelegateCommand.class);
-
- // Setup the PreServiceDevelopCommand.
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DevelopService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "AssembleService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DeployService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "InstallService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "StartService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "TestService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "PublishService", PreServiceDevelopCommand.class);
-
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() );
-
- //dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null );
-
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
-
- // Map ClientExtensionDefaultingCommand
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "CanRunTestClient", ClientTestWidget.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient", ClientTestWidget.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarComponentName", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "LaunchedServiceTestName", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient",ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "RunTestClient", ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestClient", ClientExtensionDefaultingCommand.class, "TestService", null);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestClient", TestDefaultingFragment.class, "GenerateProxy", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", TestDefaultingFragment.class, "GenerateProxy", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntimeId", TestDefaultingFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class, "GenerateProxy", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", FinishTestFragment.class, "GenerateProxy", null);
-
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", CreateMonitorCommand.class);
-
- // Map ServerExtensionOutputCommand for ServerStart()
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null);
-
- // MAP post server config call
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-
- // Map ClientExtensionOutputCommand
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "CanGenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
- // Map ManageServerStartUpCommand
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "IsWebProjectStartupRequested", ManageServerStartUpCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ManageServerStartUpCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ManageServerStartUpCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ManageServerStartUpCommand.class, "ServiceProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", ManageServerStartUpCommand.class,"ServiceServerTypeId", null);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ManageServerStartUpCommand.class, "SampleProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ManageServerStartUpCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer());
-
- // Map WebServiceClientTestArrivalCommand
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
-
- // Map OpenEditorCommand
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", OpenEditorCommand.class );
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "Context", OpenEditorCommand.class );
-
- //Map Finish Command
-
-
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index e350b3605..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,648 +0,0 @@
-/*******************************************************************************
- * 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060315 131963 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060418 129688 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 138058 joan@ca.ibm.com - Joan Haggarty
- * 20060523 133714 joan@ca.ibm.com - Joan Haggarty
- * 20060525 143843 joan@ca.ibm.com - Joan Haggarty
- * 20060905 156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime
- * 20070319 159458 mahutch@ca.ibm.com - Mark Hutchinson added in some null checks
- * 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
- * 20080326 221364 kathy@ca.ibm.com - Kathy Chan
- * 20080402 225032 makandre@ca.ibm.com - Andrew Mak
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.DefaultingUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.FacetMatchCache;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand
-{
- private boolean generateProxy_=true; //jvh
-
- private TypeRuntimeServer serviceIds_;
- private boolean serviceIdsFixed_ = false;
- private String serviceRuntimeId_;
- private String serviceProjectName_;
- private String serviceEarProjectName_;
- private String serviceComponentType_;
- private IProject initialProject_;
- private boolean serviceNeedEAR_ = true;
- private FacetMatcher serviceFacetMatcher_;
-
- public ServerRuntimeSelectionWidgetDefaultingCommand()
- {
- super();
- }
-
-
- /**
- * Defaults the following bits of information in the following order:
- * serviceRuntimeId_ : the serviceRuntimeId. Must be defaulted to non-empty String.
- * serviceIds_.runtimeId_: the Web service runtime id. Must be defaulted to non-empty String.
- * serviceProjectName_ : the name of the service project. Must be non-empty. May or may not exist.
- * serviceComponentType_: the id of the service project template. Must be empty if the service
- * project exists. Must be non-empty of the service project does not exist.
- * serviceIds_.serverId_: the server type id. May be an empty String if the defaulted Web service runtime
- * does not require a server.
- * serviceIds_.serverInstanceId_: the server id. May be null or an empty String.
- * serviceNeedEAR_: true if an EAR is needed. False otherwise.
- * serviceEarProjectName_: the service EAR project. Must be empty if the serviceNeedEAR_ is false.
- * Must be non-empty if the serviceNeedEAR_ is true.
- * Defaults the parallel information on the client-side if needed
- * (@see ClientRuntimeSelectionWidgetDefaultingCommand#execute).
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- try
- {
-
- //**Step 1** Default the serviceRuntime and the Web service runtime.
- //serviceIdsFixed_ is set to true for the Ant scenario. It's always false for the wizard
- //scenarios.
- if (serviceIdsFixed_)
- {
- //Set the serviceRuntime based on the runtime and server.
- //If user set a service project use that as initial project otherwise default from initial selection.
- if (serviceProjectName_ != null)
- {
- initialProject_ = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
-
- DefaultRuntimeTriplet drt = getDefaultRuntime(initialProject_, serviceIds_.getTypeId(), false, serviceIds_.getServerId());
- serviceFacetMatcher_ = drt.getFacetMatcher();
- serviceProjectName_ = drt.getProjectName();
- serviceRuntimeId_ = drt.getRuntimeId();
-
- if (serviceRuntimeId_ != null)
- {
- serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime()
- .getId());
- }
- }
- else
- {
- DefaultRuntimeTriplet drt = getDefaultServiceRuntimeForFixedRuntimeAndServer(initialProject_);
- serviceFacetMatcher_ = drt.getFacetMatcher();
- serviceProjectName_ = drt.getProjectName();
- serviceRuntimeId_ = drt.getRuntimeId();
- }
- }
- else
- {
- // Set the runtime based on the initial selection
- DefaultRuntimeTriplet drt = getDefaultRuntime(initialProject_, serviceIds_.getTypeId(), false, serviceIds_.getServerId());
- serviceFacetMatcher_ = drt.getFacetMatcher();
- serviceProjectName_ = drt.getProjectName();
- serviceRuntimeId_ = drt.getRuntimeId();
-
- if (serviceRuntimeId_ != null)
- {
- serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime()
- .getId());
- }
- }
-
- //**Step 2** Default the service project if it was not already defaulted
- //as part of defaulting the Web service runtime.
- if (serviceProjectName_ == null)
- {
- // Project name did not get set when the runtime was set, so set it now
- serviceProjectName_ = getDefaultServiceProjectName();
- }
-
- //**Step 3** Default the service project type.
- IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
- if (!serviceProject.exists())
- {
- // Set the project template
- serviceComponentType_ = getDefaultServiceProjectTemplate();
- }
- else
- {
- //Set it to an empty String
- serviceComponentType_ = "";
- }
- //**Step 4** Default the server if this is not an Ant scenario.
- if (!serviceIdsFixed_)
- {
- // Set the server
- IStatus serverStatus = setServiceDefaultServer();
- if (serverStatus.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(serverStatus);
- return serverStatus;
- }
- }
-
- //**Step 5** Default clientNeedEAR and client EAR if an EAR is needed
- setDefaultServiceEarProject();
-
- // jvh - for now comment out generate proxy
- // need to look at defaulting based on an event
- // on page 1 - when client generation goes from none
- // to develop...
- /*if (generateProxy_)
- {*/
- //Default the client-side.
- IStatus clientSideStatus = defaultClientSide(monitor);
- if (clientSideStatus.getSeverity() == Status.ERROR)
- {
- return clientSideStatus;
- }
- // }
-
- return Status.OK_STATUS;
-
- } catch (Exception e)
- {
- // Catch all Exceptions in order to give some feedback to the user
- IStatus errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED,
- new String[] { e.getMessage() }), e);
-
- // If the exception has no error msg, it's kind of useless to the user so let's log it
- if ( e.getMessage() == null){
- ILog pluginlog = WebServiceConsumptionUIPlugin.getInstance().getLog();
- pluginlog.log(errorStatus);
-
- // create a new IStatus which has a non-null msg, this is to be thrown to the user.
- errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED,
- new String[] { WSUIPluginMessages.MSG_SEE_ERROR_LOG }), e);
- }
-
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- }
-
- private IStatus defaultClientSide(IProgressMonitor monitor)
- {
- IStatus clientDefaultFromServiceStatus = defaultClientSideFromServiceSide(serviceProjectName_, serviceIds_, serviceNeedEAR_, serviceEarProjectName_);
-
- // If an error status is returned, the only property that was set on
- // ClientRuntimeSelectionWidgetDefaultingCommand is clientProjectName_.
- // The rest of the properties including clientRuntimeId_, clientComponentType_,
- // all the values in clientIds_, clientNeedEAR_, and clientEarProjectName_
- // have not been set because the service side server and
- // web service runtime could not be used on the client side. Run the entire
- // client-side defaulting algorithm using clientProjectName_ as the
- // clientInitialProject_. Then update the clientEarProjectName_ based on the
- // service side EAR.
- if (clientDefaultFromServiceStatus.getSeverity() == IStatus.ERROR)
- {
- // 1. Run client side defaulting from scratch with clientInitialProject_
- // set to the new clientProjectName_.
- IProject clientProject = ResourcesPlugin.getWorkspace().getRoot().getProject(getClientProjectName());
- setClientInitialProject(clientProject);
- IStatus clientExecuteStatus = super.execute(monitor, null);
- if (clientExecuteStatus.getSeverity() == Status.ERROR)
- {
- return clientExecuteStatus;
- }
-
- // 2. Update the client-side EAR if serviceNeedEAR_ is true;
- if (serviceNeedEAR_)
- {
- defaultClientEarFromServiceEar(serviceProjectName_, serviceEarProjectName_);
- }
- }
-
- return Status.OK_STATUS;
-
- }
-
- private void setDefaultServiceEarProject()
- {
- //Don't need an ear if this is a Java project, or if the selected template is jst.utility
- IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
- if (serviceProject.exists())
- {
- serviceNeedEAR_ = !(FacetUtils.isJavaProject(serviceProject));
- }
- else
- {
- serviceNeedEAR_ = !(FacetUtils.isUtilityTemplate(serviceComponentType_));
- }
-
- //If serviceNeedEAR_ is still true, it means that we're not dealing with a Java project
- //or Java project type. Check the server.
-
-
- if (serviceNeedEAR_)
- {
-
- // Determine if an ear selection is needed based on the server type.
- String serverId = serviceIds_.getServerId();
- if (serverId != null)
- {
- // Use the server type
- String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId);
- if (serverTargetId != null && serverTargetId.length() > 0)
- {
- if (!ServerUtils.isTargetValidForEAR(serverTargetId, "13"))
- {
- // Default the EAR selection to be empty
- serviceNeedEAR_ = false;
- }
- }
- } else { // serverId == null, assume that it does not need EAR
- serviceNeedEAR_ = false;
- }
- }
-
- if (serviceNeedEAR_)
- {
- serviceEarProjectName_ = DefaultingUtils.getDefaultEARProjectName(serviceProjectName_);
- }
- else
- {
- serviceEarProjectName_ = "";
- }
- }
-
- private IStatus setServiceDefaultServer()
- {
- //Choose an existing server the module is already associated with if possible
- IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
- IServer[] configuredServers = null;
- if(serviceProject.exists())
- configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null);
-
- if (configuredServers!=null && configuredServers.length>0)
- {
- serviceIds_.setServerId(configuredServers[0].getServerType().getId());
- serviceIds_.setServerInstanceId(configuredServers[0].getId());
- return Status.OK_STATUS;
- }
-
- //If the project exists, choose a suitable server or server type based on the existing project's runtime or facets
- if (serviceProject.exists())
- {
- IServer server = getServerFromProject(serviceProjectName_, serviceFacetMatcher_);
- if (server != null)
- {
- serviceIds_.setServerId(server.getServerType().getId());
- serviceIds_.setServerInstanceId(server.getId());
- return Status.OK_STATUS;
- }
- else
- {
- IServerType serverType = getServerTypeFromProject(serviceProjectName_, serviceFacetMatcher_);
- if (serverType != null)
- {
- serviceIds_.setServerId(serverType.getId());
- return Status.OK_STATUS;
- }
- }
- }
-
- //Haven't picked a server/server type on the basis of the project. Pick a server/server type
- //that is compatible with the serviceRuntimeId.
- IServer server = getServerFromServiceRuntimeId();
- if (server!=null)
- {
- serviceIds_.setServerId(server.getServerType().getId());
- serviceIds_.setServerInstanceId(server.getId());
- return Status.OK_STATUS;
- }
-
- IServerType serverType = getServerTypeFromServiceRuntimeId();
- if (serverType != null)
- {
- serviceIds_.setServerId(serverType.getId());
- return Status.OK_STATUS;
- }
-
- //No suitable server was found. Popup an error.
- RuntimeDescriptor runtimeDescriptor = WebServiceRuntimeExtensionUtils2.getRuntimeById(serviceIds_.getRuntimeId());
- if (runtimeDescriptor.getServerRequired())
- {
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(serviceIds_.getRuntimeId());
- IStatus status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME, new String[]{runtimeLabel}) );
- return status;
- }
-
- return Status.OK_STATUS;
- }
-
- private IServer getServerFromServiceRuntimeId()
- {
- IServer[] servers = ServerCore.getServers();
- if (servers != null && servers.length > 0)
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
-
- //If a server of the preferred server type is present, check that one first
- for (int j = 0; j < servers.length; j++)
- {
- if (servers[j] != null && servers[j].getServerType() != null)
- {
- String serverFactoryId = servers[j].getServerType().getId();
- if (serverFactoryId.equals(preferredServerFactoryId))
- {
- if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(serviceRuntimeId_, serverFactoryId))
- {
- return servers[j];
- }
- }
- }
- }
-
- //A server of the preferred server type could not be found or did not match. Check all the existing servers.
- for (int i = 0; i < servers.length; i++)
- {
- if (servers[i] != null && servers[i].getServerType() != null)
- {
- String serverFactoryId = servers[i].getServerType().getId();
- if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(serviceRuntimeId_, serverFactoryId))
- {
- return servers[i];
- }
- }
- }
- }
- return null;
- }
-
- private IServerType getServerTypeFromServiceRuntimeId()
- {
- String[] serverTypes = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByServiceRuntime(serviceRuntimeId_);
- if (serverTypes!=null && serverTypes.length>0)
- {
- //Return the preferred one if it is in the list
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String preferredServerFactoryId = context.getServerFactoryId();
- for (int i=0; i<serverTypes.length; i++)
- {
- if (serverTypes[i].equals(preferredServerFactoryId))
- {
- return ServerCore.findServerType(serverTypes[i]);
- }
- }
-
- return ServerCore.findServerType(serverTypes[0]);
- }
-
- return null;
- }
-
-
- private String getDefaultServiceProjectTemplate()
- {
- String[] templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(serviceIds_.getTypeId(), serviceIds_.getRuntimeId());
-
- //Walk the list of service project types in the project topology preference
- ProjectTopologyContext ptc= WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
- String[] preferredTemplateIds = ptc.getServiceTypes();
- for (int j = 0; j < preferredTemplateIds.length; j++)
- {
- for (int i = 0; i < templates.length; i++)
- {
- String templateId = templates[i];
- if (templateId.equals(preferredTemplateIds[j]))
- {
- boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, templateId);
- if (matches)
- {
- return templates[i];
- }
- }
- }
- }
-
- //Since the preferredTemplateIds contains the union of all project types for all service runtimes, we are
- //guaranteed to have returned by now, so the code below will never be executed under normal
- //circumstances. Just return something to satisfy the compiler.
- if (templates.length > 0)
- return templates[0];
-
- return "";
-
- }
-
- private String getDefaultServiceProjectName()
- {
- IProject[] projects = FacetUtils.getAllProjects();
- ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_);
- RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
-
- //Check each project for compatibility with the serviceRuntime
- for (int i=0; i<projects.length; i++)
- {
- Set facetVersions = FacetUtils.getFacetsForProject(projects[i].getName());
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null;
- String fRuntimeName = null;
- fRuntime = FacetUtils.getFacetRuntimeForProject(projects[i].getName());
- if (fRuntime != null)
- {
- fRuntimeName = fRuntime.getName();
- }
-
- if (facetVersions != null)
- {
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimeId_, projects[i].getName());
- boolean facetRuntimeMatches = true;
- if (fRuntimeName != null)
- {
- facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(rfvs, fRuntimeName);
- }
-
- if (fm.isMatch() && facetRuntimeMatches)
- {
- serviceFacetMatcher_ = fm;
- return projects[i].getName();
- }
- }
- }
-
- //No project was suitable, return a new project name
- return ResourceUtils.getDefaultWebProjectName();
-
- }
-
- private DefaultRuntimeTriplet getDefaultServiceRuntimeForFixedRuntimeAndServer(IProject project)
- {
- String[] serviceRuntimes = WebServiceRuntimeExtensionUtils2.getServiceRuntimesByServiceType(serviceIds_.getTypeId());
- ArrayList<String> validServiceRuntimes = new ArrayList<String>();
- for (int i=0; i<serviceRuntimes.length; i++ )
- {
- ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimes[i]);
- if (desc.getRuntime().getId().equals(serviceIds_.getRuntimeId()))
- {
- //Check if this service runtime supports the server
- if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(desc.getId(), serviceIds_.getServerId()))
- {
- validServiceRuntimes.add(desc.getId());
- if (project != null && project.exists())
- {
- Set facetVersions = FacetUtils.getFacetsForProject(project.getName());
- if (facetVersions != null)
- {
- FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimes[i], project.getName());
- if (fm.isMatch())
- {
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(fm);
- drt.setProjectName(project.getName());
- drt.setRuntimeId(desc.getId());
- return drt;
- }
- }
- }
-
- }
- }
-
- }
-
- if (validServiceRuntimes.size() > 0)
- {
- //We couldn't match to the initially selected project so return the first valid runtime.
- DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
- drt.setFacetMatcher(null);
- drt.setProjectName(null);
- drt.setRuntimeId(((String[])validServiceRuntimes.toArray(new String[0]))[0]);
- return drt;
- }
- else
- {
- //There are no service runtimes that match the fixed runtime and server. Fall back to original algorithm.
- serviceIdsFixed_ = false;
- return getDefaultRuntime(project, serviceIds_.getTypeId(), false, serviceIds_.getServerId());
- }
- }
-
-
-
- public void setInitialSelection(IStructuredSelection selection)
- {
- }
-
- public void setInitialProject(IProject initialProject)
- {
- initialProject_ = initialProject;
- }
-
- public IProject getInitialProject()
- {
- return initialProject_;
- }
-
- public void setInitialComponentName(String name)
- {
- //TODO This method and any mappings to it
- // should be removed if no longer needed.
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
- {
- serviceIds_ = ids;
- }
-
- public void setServiceIdsFixed(boolean b)
- {
- serviceIdsFixed_ = b;
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return serviceIds_;
- }
-
- public String getServiceRuntimeId()
- {
- return serviceRuntimeId_;
- }
- /**
- * @return Returns the generateProxy_.
- */
- public boolean getGenerateProxy()
- {
- return generateProxy_;
- }
- /**
- * @param generateProxy_ The generateProxy_ to set.
- */
- public void setGenerateProxy(boolean generateProxy_)
- {
- this.generateProxy_ = generateProxy_;
- }
-
- public String getServiceProjectName()
- {
- return serviceProjectName_;
- }
-
- public String getServiceEarProjectName()
- {
- return serviceEarProjectName_;
- }
-
- public String getServiceComponentType()
- {
- return serviceComponentType_;
- }
-
- public boolean getServiceNeedEAR()
- {
- return serviceNeedEAR_;
- }
-
- // This is for the Ant scenario where the service project name can be set in the property file.
- // If the user has set the ServiceProjectName use it for defaulting purposes
- public void setServiceProjectName(String name)
- {
- serviceProjectName_ = name;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
deleted file mode 100644
index 9b6df88ab..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class LaunchFragment extends BooleanFragment
-{
- private boolean publishToPublicUDDI_;
- private boolean publishToPrivateUDDI_;
-
- public LaunchFragment()
- {
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return (publishToPublicUDDI_ || publishToPrivateUDDI_);
- }
- };
- setCondition( condition );
- setTrueFragment( new SimpleFragment( new WSExplorerLauncherCommand(), "" ) );
- }
-
- public void setPublishToPublicUDDI(boolean publishToPublicUDDI)
- {
- publishToPublicUDDI_ = publishToPublicUDDI;
- }
-
- public void setPublishToPrivateUDDI(boolean publishToPrivateUDDI)
- {
- publishToPrivateUDDI_ = publishToPrivateUDDI;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
deleted file mode 100644
index 730e1539c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-public class ServiceTestFragment extends BooleanFragment
-{
- private boolean testService;
- private boolean generateProxy;
-
-
- public ServiceTestFragment( String id )
- {
- SequenceFragment testRoot = new SequenceFragment();
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return testService;
- }
- };
- setCondition( condition );
-
- testRoot.add( new SimpleFragment( new WebServiceTestDefaultingCommand(), "" ) );
- testRoot.add( new SimpleFragment( id ) );
- setTrueFragment( testRoot );
-
- }
-
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
-
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "TestID",WSDLTestLaunchCommand.class);
-
- //from the wizard
- dataRegistry.addMapping(ServiceTestWidget.class, "TestID",WSDLTestLaunchCommand.class);
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ExternalBrowser",WSDLTestLaunchCommand.class);
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- public boolean getGenerateProxy()
- {
- return generateProxy;
- }
-
- /**
- * @return Returns the testService.
- */
- public void setTestService( boolean testService )
- {
- this.testService = testService;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
deleted file mode 100644
index 4f186f1bf..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-public class ServiceTestWidget extends SimpleWidgetDataContributor
-{
- private String createPluginId_ = "org.eclipse.jst.ws.creation.ui";
-
- private Combo testTypeCombo_;
- /*CONTEXT_ID PSTP0001 for the Test Type Combo box of the Service Test Page*/
- private final String INFOPOP_PSTP_COMBOBOX_TEST = "PSTP0001";
-
- private Button launchButton_;
- /*CONTEXT_ID PSTP0002 for the launch button of the Service Test Page*/
- private final String INFOPOP_PSTP_LAUNCH_BUTTON = "PSTP0002";
-
-
- private SelectionList facilities_;
-
- private String serviceServerInstanceId = null;
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- UIUtils uiUtils = new UIUtils(createPluginId_ );
-
- Composite testComposite = uiUtils.createComposite( parent, 3, 0, 0 );
-
- testTypeCombo_ = uiUtils.createCombo( testComposite, ConsumptionUIMessages.LABEL_TEST_TYPES,
- ConsumptionUIMessages.TOOLTIP_PSTP_COMBOBOX_TEST,
- INFOPOP_PSTP_COMBOBOX_TEST,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- launchButton_ = uiUtils.createPushButton( testComposite, ConsumptionUIMessages.BUTTON_LAUNCH_SERVICE_TEST,
- ConsumptionUIMessages.TOOLTIP_PSTP_LAUNCH_BUTTON,
- INFOPOP_PSTP_LAUNCH_BUTTON );
- launchButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent event )
- {
- handleLaunchButton();
- }
- });
-
-
- return this;
- }
-
- private TypeRuntimeServer serviceids;
- private String serverProject;
- private String module;
- private String wsdlURI;
- private String launchedServiceTestName = "";
- private IEnvironment env;
- private List endpoints;
-
- private void handleLaunchButton()
- {
- // Split up the project and module
- int p = serverProject.indexOf("/");
- if (p != -1){
- module = serverProject.substring(p+1);
- serverProject = serverProject.substring(0,p);
- }
-
- String testID = testTypeCombo_.getText();
- launchedServiceTestName = testID;
- WSDLTestLaunchCommand wtlc = new WSDLTestLaunchCommand();
- wtlc.setTestID(testID);
- wtlc.setServiceTypeRuntimeServer(serviceids);
- wtlc.setServiceServerInstanceId(serviceServerInstanceId);
- wtlc.setServerProject(serverProject);
- wtlc.setServerModule(module);
- wtlc.setWsdlURI(wsdlURI);
- wtlc.setExternalBrowser(true);
- wtlc.setEndpoint(endpoints);
- wtlc.setEnvironment( env );
- wtlc.execute( null, null );
- }
-
- public void setServiceTestFacilities( SelectionList facilities )
- {
- facilities_ = facilities;
- testTypeCombo_.setItems( facilities.getList() );
- testTypeCombo_.select( facilities.getIndex() );
- }
-
- public SelectionList getServiceTestFacilities()
- {
- facilities_.setIndex( testTypeCombo_.getSelectionIndex() );
- return facilities_;
- }
-
- public String getTestID()
- {
- return testTypeCombo_.getText();
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setServerProject(String serverProject)
- {
- this.serverProject = serverProject;
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer serviceids)
- {
- this.serviceids = serviceids;
- }
-
- public String getLaunchedServiceTestName()
- {
- return launchedServiceTestName;
- }
-
- public void setEnvironment(IEnvironment env)
- {
- this.env = env;
- }
-
- public void setEndpoint(String endpoint)
- {
- if (endpoint != null && endpoint.length() > 0)
- {
- Vector v = new Vector();
- v.add(endpoint);
- setEndpoints(v);
- }
- }
-
- public void setEndpoints(List endpoints)
- {
- this.endpoints = endpoints;
- }
-
- public void setServiceServerInstanceId(String ssInstanceId){
- this.serviceServerInstanceId = ssInstanceId;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
deleted file mode 100644
index 9d1d6af93..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-/*
- * Created on Apr 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestDefaultingCommand extends AbstractDataModelOperation
-{
-
- private SelectionList serviceTestFacilities;
- private String[] testID;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- testID = scenarioContext.getNonJavaTestService();
- String[] testTypes = scenarioContext.getWebServiceTestTypes();
-
- IStatus status = Status.OK_STATUS;
- WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-
-
- Vector wsdlNames = new Vector();
- for(int i =0 ;i<testTypes.length;i++){
- WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[i]);
- if(wscte.testWSDL()){
- wsdlNames.addElement(testTypes[i]);
- }
- }
-
- String javaNamesArray[] = new String[wsdlNames.size()];
- Enumeration e = wsdlNames.elements();
- int i = 0;
- while(e.hasMoreElements()){
- javaNamesArray[i] = (String)e.nextElement();
- i++;
- }
-
-
- serviceTestFacilities = new SelectionList(javaNamesArray,0);
-
- return status;
- }
-
- public SelectionList getServiceTestFacilities()
- {
- return serviceTestFacilities;
- }
-
- public String[] getTestID()
- {
- return testID;
- }
-
- public boolean getExternalBrowser()
- {
- return false;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.classpath b/bundles/org.eclipse.jst.ws.uddiregistry/.classpath
deleted file mode 100644
index 52165ecfb..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore b/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
deleted file mode 100644
index b7853eaff..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-uddiregistry.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.project b/bundles/org.eclipse.jst.ws.uddiregistry/.project
deleted file mode 100644
index 662562dfb..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.uddiregistry</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f2b029a29..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:36:58 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 9269b4dcf..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:49 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
deleted file mode 100644
index 491a9ab7b..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.uddiregistry; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.uddiregistry;x-internal:=true,
- org.eclipse.jst.ws.internal.uddiregistry.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.uddiregistry.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.uddiregistry.widgets.binding;x-internal:=true,
- org.eclipse.jst.ws.internal.uddiregistry.wizard;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/about.html b/bundles/org.eclipse.jst.ws.uddiregistry/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties b/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif b/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
deleted file mode 100644
index 5b43cae7b..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/icons/wizban/uddiprivateconfig_wiz.png b/bundles/org.eclipse.jst.ws.uddiregistry/icons/wizban/uddiprivateconfig_wiz.png
deleted file mode 100644
index f2d155eed..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/wizban/uddiprivateconfig_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
deleted file mode 100644
index b50afb75c..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070516 163266 gilberta@ca.ibm.com - Gilbert Andrews
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Universal Description Discovery and Integration Registry
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI=Unit Test UDDI
-
-XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
-PRIVATE_UDDI_REGISTRY_DESC=Create and configure a unit test UDDI registry
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
deleted file mode 100644
index 96ac750e0..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point id="privateUDDIRegistryType" name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.privateUDDIRegistryType">
- <privateUDDIRegistryType
- name="%PRIVATE_UDDI_REGISTRY_TYPE_IMPL"
- class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl"
- id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl">
- </privateUDDIRegistryType>
- </extension>
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
- icon="icons/registry.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
- <description>
- %PRIVATE_UDDI_REGISTRY_DESC
- </description>
- </wizard>
- </extension>
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
- class="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding"
- iconbanner="icons/wizban/uddiprivateconfig_wiz.png"
- id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
- </dynamicWizard>
- </extension>
- <!--
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
- icon="icons/registry.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard"
- id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard">
- <description>
- %PLUGIN_NEW_WIZARD_DESC_WS_UNIT_TEST_UDDI
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
- -->
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistry.properties b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistry.properties
deleted file mode 100644
index b0d26bc34..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistry.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 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
-###############################################################################
-
-#
-# PrivateUDDIConfigPage
-#
-PAGE_TITLE_PRIVATE_UDDI_CONFIG=Unit Test UDDI Registry Configuration
-PAGE_DESC_PRIVATE_UDDI_CONFIG=Configure the unit test UDDI registry.
-
-#
-# Tooltip for PrivateUDDIConfigPage
-#
-TOOLTIP_PUPR_PRIVATE_UDDI_PAGE=Deploy or remove a Unit Test UDDI Registry
-TOOLTIP_PUPR_PRIVATE_UDDI_TYPE=Choose the type of Unit Test UDDI Registry you want to deploy
-TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI=Deploy a Unit Test UDDI Registry
-TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI=Update the existing Unit Test UDDI Registry
-TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI=Remove the existing Unit Test UDDI Registry
-
-#
-# Common wizard strings.
-#
-LABEL_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry type:
-BUTTON_DEPLOY_UDDI_REGISTRY=Deploy the Unit Test UDDI Registry
-BUTTON_UPDATE_UDDI_REGISTRY=Update the previously deployed UDDI registry
-BUTTON_REMOVE_UDDI_REGISTRY=Remove the previously deployed UDDI registry
-
-#
-# Wizard page task labels and descriptions
-# (used only for progress indication).
-#
-
-#
-# Dialog messages
-#
-
-#
-# Progress messages
-#
-
-#
-# Warning messages
-#
-
-#
-# Error messages
-#
-MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE=IWAB0363E No UDDI registry available.
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistryMessages.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistryMessages.java
deleted file mode 100644
index ea29e8828..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/UDDIRegistryMessages.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class UDDIRegistryMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.uddiregistry.UDDIRegistry";//$NON-NLS-1$
-
- private UDDIRegistryMessages() {
- // Do not instantiate
- }
-
- public static String PAGE_TITLE_PRIVATE_UDDI_CONFIG;
- public static String PAGE_DESC_PRIVATE_UDDI_CONFIG;
- public static String TOOLTIP_PUPR_PRIVATE_UDDI_PAGE;
- public static String TOOLTIP_PUPR_PRIVATE_UDDI_TYPE;
- public static String TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI;
- public static String TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI;
- public static String TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI;
- public static String LABEL_PRIVATE_UDDI_REGISTRY_TYPES;
- public static String BUTTON_DEPLOY_UDDI_REGISTRY;
- public static String BUTTON_UPDATE_UDDI_REGISTRY;
- public static String BUTTON_REMOVE_UDDI_REGISTRY;
- public static String MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, UDDIRegistryMessages.class);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
deleted file mode 100644
index b687a1553..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
-* This is the plugin class for the Web Services UDDI Registry plugin.
-* <p>
-* The Web Services UDDI Registry plugin's is to add the
-* option to create a unit test UDDI registry
-*/
-public class WebServiceUDDIRegistryPlugin extends Plugin
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.uddiregistry";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceUDDIRegistryPlugin instance_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceUDDIRegistryPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceUDDIRegistryPlugin)Platform.getPlugin("org.eclipse.jst.ws.uddiregistry");
- * @return The WebServiceUDDIRegistryPlugin singleton.
- */
- public static WebServiceUDDIRegistryPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor ( String name )
- {
- try
- {
- URL installURL = instance_.getBundle().getEntry("/");
- URL imageURL = new URL(installURL,name);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public static String getMessage ( String key )
- {
- return Platform.getResourceString(instance_.getBundle(),key);
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties. Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See the JDK's
- * {@link java.text.MessageFormat java.text.MessageFormat}
- * class for further details on substitution.
- * @return The String message.
- */
- public static String getMessage ( String key, Object[] args )
- {
- return MessageFormat.format(getMessage(key),args);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
deleted file mode 100644
index dc4f94988..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-/*
-import org.eclipse.wst.command.internal.env.core.common.Environment;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.env.core.common.Status;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-*/
-
-public class PrivateUDDISelectionCommand extends AbstractDataModelOperation
-{
- private byte operationType;
- private PrivateUDDIRegistryType registryType;
-
- /*
- public Status execute(Environment env)
- {
- MessageUtils msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this);
- if (registryType != null)
- {
- switch (operationType)
- {
- case PrivateUDDIRegistryType.OP_DEPLOY:
- return registryType.deploy(env);
- case PrivateUDDIRegistryType.OP_UPDATE:
- return registryType.update(env);
- case PrivateUDDIRegistryType.OP_REMOVE:
- return registryType.remove(env);
- default:
- }
- }
- return new SimpleStatus("");
- }
- */
-
- public PrivateUDDIRegistryType getRegistryType()
- {
- return getPrivateUDDIRegistryType();
- }
-
- public byte getOperationType()
- {
- return operationType;
- }
-
- public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
- {
- return registryType;
- }
-
- public void setRegistryType(PrivateUDDIRegistryType regType)
- {
- setPrivateUDDIRegistryType(regType);
- }
-
- public void setOperationType(byte type)
- {
- operationType = type;
- }
-
- public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType regType)
- {
- registryType = regType;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
deleted file mode 100644
index bbfafa73b..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PrivateUDDISelectionCommandFragment extends AbstractCommandFragment
-{
- private PrivateUDDIRegistryType registryType;
- private DataMappingRegistry dataMappingRegistry;
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
-
- public PrivateUDDISelectionCommandFragment()
- {
- super(null, "");
- }
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment()
- {
- if (registryType != null)
- {
- registryType.registerCanFinish(canFinishRegistry);
- registryType.registerDataMappings(dataMappingRegistry);
- registryType.registerWidgetMappings(widgetRegistry);
- return registryType.create().create();
- }
- else
- return null;
- }
-
- /**
- * Gets the next child fragment for this fragment.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment(CommandFragment fragment)
- {
- return null;
- }
-
- /*
- * This method is called to retrieve the data mappings for this command fragment.
- */
- public void registerDataMappings(DataMappingRegistry registry)
- {
- dataMappingRegistry = registry;
- }
-
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- }
-
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- this.widgetRegistry = widgetRegistry;
- }
-
- /**
- * All wizard fragments need to be cloneable.
- **/
- public Object clone()
- {
- PrivateUDDISelectionCommandFragment fragment = new PrivateUDDISelectionCommandFragment();
- fragment.registerDataMappings(dataMappingRegistry);
- fragment.registerCanFinish(canFinishRegistry);
- fragment.registerWidgetMappings(widgetRegistry);
- fragment.setPrivateUDDIRegistryType(registryType);
- return fragment;
- }
-
- public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType registryType)
- {
- this.registryType = registryType;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
deleted file mode 100644
index 1ea3d6aa3..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.uddiregistry.UDDIRegistryMessages;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-/**
-* This UDDI configuration page prompts the user
-* for the information required to configure the
-* unit test UDDI registry.
-*/
-public class PrivateUDDISelectionWidget extends SimpleWidgetDataContributor
-{
- private Listener statusListener;
-
- private Button deployRadio_;
- private Label typesLabel_;
- private Combo typesCombo_;
- private Button updateRadio_;
- private Button removeRadio_;
- private PrivateUDDIRegistryType[] types_;
- private PrivateUDDIRegistryType installedType_;
-
- // Infopop
- private final String INFOPOP_PUPR_PRIVATE_UDDI_PAGE = WebServiceUDDIRegistryPlugin.ID + ".pupr0001";
- private final String INFOPOP_PUPR_PRIVATE_UDDI_TYPE = WebServiceUDDIRegistryPlugin.ID + ".pupr0002";
- private final String INFOPOP_PUPR_DEPLOY_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0003";
- private final String INFOPOP_PUPR_UPDATE_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0005";
- private final String INFOPOP_PUPR_REMOVE_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0004";
-
- public PrivateUDDISelectionWidget()
- {
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- this.statusListener = statusListener;
- parent.setToolTipText(UDDIRegistryMessages.TOOLTIP_PUPR_PRIVATE_UDDI_PAGE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, INFOPOP_PUPR_PRIVATE_UDDI_PAGE);
-
- GridLayout gl;
- GridData gd;
-
- Listener listener = new Listener()
- {
- public void handleEvent(Event event)
- {
- handleWidgetEvent(event);
- }
- };
-
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- deployRadio_ = new Button(parent, SWT.RADIO);
- deployRadio_.setText(UDDIRegistryMessages.BUTTON_DEPLOY_UDDI_REGISTRY);
- deployRadio_.setSelection(true);
- deployRadio_.addListener(SWT.Selection, listener);
- deployRadio_.setToolTipText(UDDIRegistryMessages.TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI);
- helpSystem.setHelp(deployRadio_, INFOPOP_PUPR_DEPLOY_PRIVATE_UDDI);
-
- Composite typeComposite = new Composite(parent,SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 5;
- gl.verticalSpacing = 15;
- gl.marginWidth = 20;
- typeComposite.setLayout(gl);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- typeComposite.setLayoutData(gd);
-
- typesLabel_ = new Label(typeComposite, SWT.WRAP);
- typesLabel_.setText(UDDIRegistryMessages.LABEL_PRIVATE_UDDI_REGISTRY_TYPES);
- typesLabel_.setToolTipText(UDDIRegistryMessages.TOOLTIP_PUPR_PRIVATE_UDDI_TYPE);
- helpSystem.setHelp(typesLabel_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
- typesCombo_ = new Combo(typeComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- typesCombo_.setLayoutData(gd);
- typesCombo_.addListener(SWT.Selection, listener);
- typesCombo_.setToolTipText(UDDIRegistryMessages.TOOLTIP_PUPR_PRIVATE_UDDI_TYPE);
- helpSystem.setHelp(typesCombo_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
- updateRadio_ = new Button(parent,SWT.RADIO);
- updateRadio_.setText(UDDIRegistryMessages.BUTTON_UPDATE_UDDI_REGISTRY);
- updateRadio_.setSelection(false);
- updateRadio_.addListener(SWT.Selection,listener);
- updateRadio_.setToolTipText(UDDIRegistryMessages.TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI);
- helpSystem.setHelp(updateRadio_, INFOPOP_PUPR_UPDATE_PRIVATE_UDDI);
-
- removeRadio_ = new Button(parent, SWT.RADIO);
- removeRadio_.setText(UDDIRegistryMessages.BUTTON_REMOVE_UDDI_REGISTRY);
- removeRadio_.setSelection(false);
- removeRadio_.addListener(SWT.Selection, listener);
- removeRadio_.setToolTipText(UDDIRegistryMessages.TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI);
- helpSystem.setHelp(removeRadio_, INFOPOP_PUPR_REMOVE_PRIVATE_UDDI);
-
- loadTypes();
- init();
- return this;
- }
-
- private final void loadTypes()
- {
- types_ = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- }
-
- private final void init()
- {
- for (int i = 0; i < types_.length; i++)
- {
- if (types_[i] != null)
- {
- typesCombo_.add(types_[i].getName());
- if (types_[i].isPrivateUDDIRegistryInstalled())
- installedType_ = types_[i];
- }
- }
- if (typesCombo_.getItemCount() > 0)
- typesCombo_.setText(typesCombo_.getItem(0));
- if (installedType_ != null)
- {
- updateRadio_.setEnabled(true);
- removeRadio_.setEnabled(true);
- }
- else
- {
- updateRadio_.setEnabled(false);
- removeRadio_.setEnabled(false);
- }
- }
-
- private void handleWidgetEvent(Event event)
- {
- if (event.widget == removeRadio_ || event.widget == updateRadio_)
- {
- boolean isUpdateOrRemoveSelected = ((Button)event.widget).getSelection();
- typesLabel_.setEnabled(!isUpdateOrRemoveSelected);
- typesCombo_.setEnabled(!isUpdateOrRemoveSelected);
- }
- else if (event.widget == deployRadio_)
- {
- boolean isDeploySelected = ((Button)event.widget).getSelection();
- typesLabel_.setEnabled(isDeploySelected);
- typesCombo_.setEnabled(isDeploySelected);
- }
- statusListener.handleEvent(event);
- }
-
- public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
- {
- if (deployRadio_.getSelection())
- {
- String selectedRegistryName = typesCombo_.getText();
- for (int i = 0; i < types_.length; i++)
- if (selectedRegistryName.equals(types_[i].getName()))
- return types_[i];
- return null;
- }
- else
- return installedType_;
- }
-
- public byte getOperationType()
- {
- if (deployRadio_.getSelection())
- return PrivateUDDIRegistryType.OP_DEPLOY;
- else if (updateRadio_.getSelection())
- return PrivateUDDIRegistryType.OP_UPDATE;
- else if (removeRadio_.getSelection())
- return PrivateUDDIRegistryType.OP_REMOVE;
- else
- return PrivateUDDIRegistryType.OP_DEPLOY;
- }
-
- public IStatus getStatus()
- {
- PrivateUDDIRegistryType privateUDDIRegistryType = getPrivateUDDIRegistryType();
- if (privateUDDIRegistryType != null)
- return privateUDDIRegistryType.getOperationStatus(getOperationType());
- else
- return StatusUtils.errorStatus( UDDIRegistryMessages.MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
deleted file mode 100644
index 28eaa9d16..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class PrivateUDDISelectionWidgetConditionCommand extends AbstractDataModelOperation implements Condition
-{
- private boolean condition;
-
- public PrivateUDDISelectionWidgetConditionCommand()
- {
- condition = true;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- condition = !condition;
- return Status.OK_STATUS;
- }
-
- public IStatus undo( IProgressMonitor monitor, IAdaptable adaptable )
- {
- condition = !condition;
- return Status.OK_STATUS;
- }
-
- public boolean evaluate()
- {
- return condition;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
deleted file mode 100644
index a444a4639..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets.binding;
-
-import org.eclipse.jst.ws.internal.uddiregistry.UDDIRegistryMessages;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommand;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommandFragment;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidget;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidgetConditionCommand;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PrivateUDDIWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private DataMappingRegistry dataMappingRegistry;
- private PrivateUDDISelectionCommandFragment privateUDDISelFragment;
- private PrivateUDDISelectionWidgetConditionCommand conditionCommand;
-
- public PrivateUDDIWidgetBinding()
- {
- privateUDDISelFragment = new PrivateUDDISelectionCommandFragment();
- conditionCommand = new PrivateUDDISelectionWidgetConditionCommand();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- SequenceFragment root = new SequenceFragment();
- root.add(new SimpleFragment(conditionCommand, ""));
- root.add(new SimpleFragment("PrivateUDDISelectionWidget"));
- root.add(new SimpleFragment(conditionCommand, ""));
- root.add(new SimpleFragment(new PrivateUDDISelectionCommand(), ""));
- root.add(privateUDDISelFragment);
- return root;
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- privateUDDISelFragment.registerCanFinish(this.canFinishRegistry);
-
- canFinishRegistry.addCondition(conditionCommand);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataMappingRegistry = dataRegistry;
- privateUDDISelFragment.registerDataMappings(dataMappingRegistry);
-
- // PrivateUDDISelectionCommand
- dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommand.class);
- dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "OperationType", PrivateUDDISelectionCommand.class);
-
- // PrivateUDDISelectionCommandFragment
- dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommandFragment.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- this.widgetRegistry = widgetRegistry;
- privateUDDISelFragment.registerWidgetMappings(this.widgetRegistry);
-
- widgetRegistry.add("PrivateUDDISelectionWidget",
- UDDIRegistryMessages.PAGE_TITLE_PRIVATE_UDDI_CONFIG,
- UDDIRegistryMessages.PAGE_DESC_PRIVATE_UDDI_CONFIG,
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PrivateUDDISelectionWidget();
- }
- }
- );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java
deleted file mode 100644
index 1663d6825..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public interface PrivateUDDIRegistryType extends CommandWidgetBinding
-{
- // operation types
- public static byte OP_DEPLOY = 0x0;
- public static byte OP_UPDATE = 0x1;
- public static byte OP_REMOVE = 0x2;
-
- // general information
- public String getID();
- public String getName();
- public boolean isPrivateUDDIRegistryInstalled();
- public IStatus getOperationStatus(byte operation);
-
- // registry URLs
- public String getInquiryAPI();
- public String getPublishAPI();
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
deleted file mode 100644
index 412dbffd5..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public class PrivateUDDIRegistryTypeImpl implements org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType
-{
- public PrivateUDDIRegistryTypeImpl() {
- }
-
- public boolean isPrivateUDDIRegistryInstalled() {
- PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- for (int i = 0; i < types.length; i++) {
- if (types[i].isPrivateUDDIRegistryInstalled())
- return true;
- }
- return false;
- }
-
- public String[] getPrivateUDDIRegistryInquiryAPI() {
- Vector inquiryAPIVector = new Vector();
- PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- for (int i = 0; i < types.length; i++) {
- if (types[i].isPrivateUDDIRegistryInstalled()) {
- String inquiryAPI = types[i].getInquiryAPI();
- if (inquiryAPI != null && inquiryAPI.startsWith("http"))
- inquiryAPIVector.add(inquiryAPI);
- }
- }
-
- String[] inquiryAPIArray = new String[inquiryAPIVector.size()];
- Enumeration e = inquiryAPIVector.elements();
- int j = 0;
- while(e.hasMoreElements()) {
- inquiryAPIArray[j] = (String)e.nextElement();
- j++;
- }
- return inquiryAPIArray;
- }
-
- public String[] getPrivateUDDIRegistryPublishAPI() {
- Vector publishAPIVector = new Vector();
- PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- for (int i = 0; i < types.length; i++) {
- if (types[i].isPrivateUDDIRegistryInstalled()) {
- String publishAPI = types[i].getPublishAPI();
- if (publishAPI != null && publishAPI.startsWith("http"))
- publishAPIVector.add(publishAPI);
- }
- }
-
- String[] publishAPIArray = new String[publishAPIVector.size()];
- Enumeration e = publishAPIVector.elements();
- int j = 0;
- while(e.hasMoreElements()) {
- publishAPIArray[j] = (String)e.nextElement();
- j++;
- }
- return publishAPIArray;
- }
-
- public CommandWidgetBinding getBinding()
- {
- return new PrivateUDDIWidgetBinding();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 375510e49..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import com.ibm.icu.util.StringTokenizer;
-
-public class PrivateUDDIRegistryTypeRegistry {
-
- private static PrivateUDDIRegistryTypeRegistry instance_;
- private IConfigurationElement[] configElements_;
-
- private PrivateUDDIRegistryTypeRegistry() {
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceClientTypeRegistry object.
- */
- public static PrivateUDDIRegistryTypeRegistry getInstance() {
- if (instance_ == null) {
- instance_ = new PrivateUDDIRegistryTypeRegistry();
- instance_.getConfigElements();
- }
- return instance_;
- }
-
- public IConfigurationElement[] getConfigElements() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- configElements_ = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.uddiregistry",
- "privateUDDIRegistryType");
- Vector v = new Vector();
- for (int i = 0; i < configElements_.length; i++)
- {
- int weight = getWeight(configElements_[i]);
- int index = -1;
- for (int j = v.size()-1; j >= 0; j--)
- {
- if (weight > getWeight((IConfigurationElement)v.get(j)))
- index = j;
- else
- break;
- }
- if (index != -1)
- v.add(index, configElements_[i]);
- else
- v.add(configElements_[i]);
- }
- v.copyInto(configElements_);
- return configElements_;
- }
-
- private int getWeight(IConfigurationElement e)
- {
- try
- {
- return Integer.parseInt(e.getAttribute("weight"));
- }
- catch (NumberFormatException nfe)
- {
- return -1;
- }
- }
-
- private IConfigurationElement getConfigElementByID(String id) {
- for (int i = 0; i <configElements_.length; i++) {
- if (configElements_[i].getAttribute("id").equals(id))
- return configElements_[i];
- }
- return null;
- }
-
- public PrivateUDDIRegistryType[] getTypes() {
- Vector types = new Vector();
- for (int i = 0; i < configElements_.length; i++) {
- try {
- Object typeObj = configElements_[i].createExecutableExtension("class");
- if (typeObj instanceof PrivateUDDIRegistryType)
- types.add(typeObj);
- }
- catch (Exception e) {}
- }
-
- PrivateUDDIRegistryType[] typesArray = new PrivateUDDIRegistryType[types.size()];
- for (int j = 0; j < types.size(); j++) {
- typesArray[j] = (PrivateUDDIRegistryType)types.elementAt(j);
- }
- return typesArray;
- }
-
- public PrivateUDDIRegistryType getTypeByID(String id) {
- try {
- Object typeObj = getConfigElementByID(id).createExecutableExtension("class");
- if (typeObj instanceof PrivateUDDIRegistryType)
- return (PrivateUDDIRegistryType)typeObj;
- }
- catch (Exception e) {}
- return null;
- }
-
- public String[] getSupportedServerFactoryIDByID(String id) {
- IConfigurationElement configElement = getConfigElementByID(id);
- if (configElement == null)
- return new String[0];
- Vector idVector = new Vector();
- StringTokenizer st = new StringTokenizer(configElement.getAttribute("serverFactoryID"), ",");
- while (st.hasMoreTokens()) {
- idVector.add(st.nextToken());
- }
- String[] ids = new String[idVector.size()];
- for (int i = 0; i < idVector.size(); i++) {
- ids[i] = (String)idVector.elementAt(i);
- }
- return ids;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/.classpath b/bundles/org.eclipse.jst.ws.ui/.classpath
deleted file mode 100644
index 52165ecfb..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.ui/.cvsignore b/bundles/org.eclipse.jst.ws.ui/.cvsignore
deleted file mode 100644
index 5deffe563..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-ws-ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.ui/.project b/bundles/org.eclipse.jst.ws.ui/.project
deleted file mode 100644
index d401669e3..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index af2a5be27..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:37:07 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index df6fea3cc..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:45 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 5d0b596fe..000000000
--- a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.ui; singleton:=true
-Bundle-Version: 1.0.302.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.ui.action;x-internal:=true,
- org.eclipse.jst.ws.internal.ui.common;x-internal:=true,
- org.eclipse.jst.ws.internal.ui.dialog;x-internal:=true,
- org.eclipse.jst.ws.internal.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.ui.preferences;x-internal:=true,
- org.eclipse.jst.ws.internal.ui.uddi;x-internal:=true
-Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.ws.explorer;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.jst.ws.ui/about.html b/bundles/org.eclipse.jst.ws.ui/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.jst.ws.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.ui/build.properties b/bundles/org.eclipse.jst.ws.ui/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif b/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
deleted file mode 100644
index 152f4f2b3..000000000
--- a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.properties b/bundles/org.eclipse.jst.ws.ui/plugin.properties
deleted file mode 100644
index 41d02a2ff..000000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-
-#
-# WS-I Preference pages
-#
-# WS-I Compliance Page
-#
-PREFERENCE_CATEGORY_WSI=WS-I Compliance
-
-#
-# Popup action Category
-#
-LABEL_POPUP_CATEGORY_WEB_SERVICES=Web Services
-
-#
-# Messages for popup action (Test with Web Services Explorer)
-#
-POPUP_TEST_WSDL=Test with Web Services Explorer
-
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.xml b/bundles/org.eclipse.jst.ws.ui/plugin.xml
deleted file mode 100644
index bfab0b34a..000000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- name="%PLUGIN_NEW_CATEGORY_NAME_WS"
- id="org.eclipse.jst.ws.ui.new">
- </category>
- </extension>
-
- <extension
- point="org.eclipse.ui.preferencePages">
-
- <page
- name="%PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage"
- id="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage">
- </page>
-
- </extension>
-
- <extension
- point="org.eclipse.ui.propertyPages">
-
-
-
- </extension>
-
- <extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
- adaptable="true"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
- <menu
- label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
- path="additions"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
- <separator
- name="popupActions">
- </separator>
- </menu>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.jst.javaee.ejb.EnterpriseBeans"
- adaptable="true"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb3.popupMenu">
- <menu
- label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
- path="additions"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
- <separator
- name="popupActions">
- </separator>
- </menu>
- </objectContribution>
-
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu"
- adaptable="true">
- <action
- label="%POPUP_TEST_WSDL"
- class="org.eclipse.jst.ws.internal.ui.popup.PopupTestService"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.ui.popup.PopupTestService">
- </action>
- </objectContribution>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPlugin.properties b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPlugin.properties
deleted file mode 100644
index 6511f254f..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPlugin.properties
+++ /dev/null
@@ -1,120 +0,0 @@
-###############################################################################
-# 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060329 128827 kathy@ca.ibm.com - Kathy Chan
-# 20060329 124667 kathy@ca.ibm.com - Kathy Chan
-# 20060331 128827 kathy@ca.ibm.com - Kathy Chan
-# 20080324 220983 trungha@ca.ibm.com - Trung Ha
-# 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_VENDOR=Eclipse.org
-PLUGIN_DESC=\
-The Web services GUI plugin delivers the graphical \
-user interface to the Web services function of the \
-Web services plugin.
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-PREFERENCE_CATEGORY_CODE_GENERATION=Code Generation
-PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults
-PREFERENCE_CATEGORY_PROJECT_TOPOLOGY=Project Topology
-PREFERENCE_CATEGORY_DRIVER_JARS=JDBC drivers
-
-#
-#Scenario Defaults
-BUTTON_LAUNCH_SAMPLE=&Launch the sample when generated
-LABEL_MOVE_UP=&Up
-LABEL_MOVE_DOWN=&Down
-LABEL_MOVE_UP_2=U&p
-LABEL_MOVE_DOWN_2=Dow&n
-
-#
-# Preferences Tooltips
-#
-
-#Scenario Defaults
-TOOLTIP_PPSD_PAGE=Set the defaults for the Web service scenarios.
-TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE=Launch the sample application after generation.
-TOOLTIP_SERVICE_TYPE_TABLE_VIEWER=Preferred order of the list of service project types
-TOOLTIP_CLIENT_TYPE_TABLE_VIEWER=Preferred order of the list of client project types
-TOOLTIP_MOVE_UP=Move the selected project type up the list
-TOOLTIP_MOVE_DOWN=Move the selected project type down the list
-
-#
-# Resource Managment
-TOOLTIP_PPRM_PAGE=Set preferences that control resources used/generated by the Web service.
-TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES=Overwrite files without warning.
-TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS=Create folders when necessary.
-TOOLTIP_PPRM_CHECKBOX_CHECK_OUT=Check out files without warning.
-TOOLTIP_PPRM_CHECKBOX_SKELETON_MERGE=Enable merging of generated skeleton file.
-BUTTON_CREATE_FOLDERS=&Create folders when necessary
-BUTTON_OVERWRITE_FILES=&Overwrite files without warning
-BUTTON_CHECKOUT_FILES=C&heck out files without warning
-BUTTON_SKELETON_MERGE=&Merge generated skeleton file
-
-#
-# General messages.
-#
-ISTATUS_WITHOUT_EXCEPTION={0}
-ISTATUS_WITH_EXCEPTION={0}\nException: {1}
-MSG_INFO_SAVED_STATUS=IWAB0297I Press the Details button to see informational messages.
-MSG_SEE_ERROR_LOG=See the Platform's error log for detail
-
-#
-# TypeSelectionDialog
-#
-DIALOG_TITLE_CLASS_BROWSE=Browse Classes
-LABEL_CLASS_BROWSE=Class name: (? = any character, * = any string)
-DIALOG_TITLE_INTERFACE_BROWSE=Browse Interfaces
-
-#
-# Common wizard strings.
-#
-LABEL_SAMPLE_TYPES=Java proxy sample:
-
-#
-# ResourceSelectionDialog
-#
-DIALOG_TITLE_RESOURCE_BROWSE=Browse Files
-LABEL_RESOURCE_FILTER=Filter:
-
-#
-# Tooltips for dialog.ResourceSelectionDialog
-# DRES=Dialog/RESources
-#
-TOOLTIP_DRES_COMBO_RESOURCE_TYPE=Type of resources to browse.
-TOOLTIP_DRES_TREE_RESOURCE=Resources available for selection.
-
-#
-# Messages for project topology preference page
-#
-TOOLTIP_PTPP_PAGE=Preference that control the project topology of your Web service and client scenarios.
-TOOLTIP_ENABLE_TWO_EARS=Enable this option if you want to generate your Web service and Web service client in different EAR projects.
-
-LABEL_ENABLE_TWO_EARS=&Generate Web service and Web service client in different EAR projects
-LABEL_CLIENT_TYPE_NAME=Client project types
-LABEL_SERVICE_TYPE_NAME=Service project types
-#
-# Resource Browser
-#
-DIALOG_TITLE_RESOURCE_BROWSER=Resource browser
-TOOLTIP_RESOURCE_TREE=Choose a resource.
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPluginMessages.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPluginMessages.java
deleted file mode 100644
index 62c1574c3..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/WSUIPluginMessages.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060329 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060329 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060331 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060515 141398 cbrealey@ca.ibm.com - Chris Brealey
- * 20080324 220983 trungha@ca.ibm.com - Trung Ha
- * 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WSUIPluginMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.ui.WSUIPlugin";//$NON-NLS-1$
-
- private WSUIPluginMessages() {
- // Do not instantiate
- }
-
- public static String PLUGIN_NAME;
- public static String PLUGIN_VENDOR;
- public static String PLUGIN_DESC;
- public static String PLUGIN_NEW_CATEGORY_NAME_WS;
- public static String PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT;
- public static String PREFERENCE_CATEGORY_CODE_GENERATION;
- public static String PREFERENCE_CATEGORY_SCENARIO_DEFAULTS;
- public static String PREFERENCE_CATEGORY_PROJECT_TOPOLOGY;
- public static String PREFERENCE_CATEGORY_DRIVER_JARS;
- public static String BUTTON_LAUNCH_SAMPLE;
- public static String LABEL_MOVE_UP;
- public static String LABEL_MOVE_DOWN;
- public static String LABEL_MOVE_UP_2;
- public static String LABEL_MOVE_DOWN_2;
- public static String TOOLTIP_PPSD_PAGE;
- public static String TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE;
- public static String TOOLTIP_CLIENT_TYPE_TABLE_VIEWER;
- public static String TOOLTIP_SERVICE_TYPE_TABLE_VIEWER;
- public static String TOOLTIP_MOVE_UP;
- public static String TOOLTIP_MOVE_DOWN;
- public static String TOOLTIP_PPRM_PAGE;
- public static String TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES;
- public static String TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS;
- public static String TOOLTIP_PPRM_CHECKBOX_CHECK_OUT;
- public static String TOOLTIP_PPRM_CHECKBOX_SKELETON_MERGE;
- public static String BUTTON_CREATE_FOLDERS;
- public static String BUTTON_OVERWRITE_FILES;
- public static String BUTTON_CHECKOUT_FILES;
- public static String BUTTON_SKELETON_MERGE;
- public static String ISTATUS_WITHOUT_EXCEPTION;
- public static String ISTATUS_WITH_EXCEPTION;
- public static String MSG_INFO_SAVED_STATUS;
- public static String MSG_SEE_ERROR_LOG;
- public static String DIALOG_TITLE_CLASS_BROWSE;
- public static String LABEL_CLASS_BROWSE;
- public static String DIALOG_TITLE_INTERFACE_BROWSE;
- public static String LABEL_SAMPLE_TYPES;
- public static String DIALOG_TITLE_RESOURCE_BROWSE;
- public static String LABEL_RESOURCE_FILTER;
- public static String TOOLTIP_DRES_COMBO_RESOURCE_TYPE;
- public static String TOOLTIP_DRES_TREE_RESOURCE;
- public static String TOOLTIP_PTPP_PAGE;
- public static String TOOLTIP_ENABLE_TWO_EARS;
- public static String LABEL_ENABLE_TWO_EARS;
- public static String LABEL_CLIENT_TYPE_NAME;
- public static String DIALOG_TITLE_RESOURCE_BROWSER;
- public static String TOOLTIP_RESOURCE_TREE;
- public static String LABEL_SERVICE_TYPE_NAME;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WSUIPluginMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
deleted file mode 100644
index ff7cd7ce6..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-
-
-/**
- * This class launches the import wizard.
- */
-public class LaunchImportWizardAction implements IActionDelegate
-{
- private IStructuredSelection selection_;
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action)
- {
- DynamicWizard wizard = new DynamicWizard();
-
- try
- {
- wizard.setInitialData( "org.eclipse.jst.ws.consumption.ui.wsimport" );
- wizard.init( PlatformUI.getWorkbench(), selection_ );
- }
- catch( CoreException exc )
- {
- // Do nothing.
- return;
- }
-
- WizardDialog dialog= new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
- dialog.setPageSize( 500, 400 );
- dialog.create();
- dialog.open();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection)
- {
- if( selection instanceof IStructuredSelection )
- {
- selection_ = (IStructuredSelection)selection;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
deleted file mode 100644
index e8d48b71f..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.action;
-import org.eclipse.core.resources.IResource;
-
-
-public interface WebServiceDeploy {
- public void run(IResource selection);
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
deleted file mode 100644
index 1d4897321..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-
-public class WebServiceDeployAction extends WindowActionDelegate {
-public void run(org.eclipse.jface.action.IAction action) {
-
- IProject project = getSelectedResourceProject();
-
- String [] typeIds = ServerUtils.getServerTypeIdsByModule(project);
- Object theAction = null;
-
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.ui", "webservicedeploy");
- try {
-
- if (typeIds == null || typeIds.length <= 0)
- {
- // that means the module is not attached to a server then pick the first extension found
- theAction = elements[0].createExecutableExtension("class");
- }
- else if ( typeIds.length == 1)
- {
- // that means the module is attached to one server then finds it id and a matchin extension or give a message
- for (int i = 0; i < elements.length; i++)
- {
- String id = elements[i].getAttribute("factoryId");
- if ( typeIds[0].equals(id))
- {
- theAction = elements[i].createExecutableExtension("class");
- break;
- }
- }
- if (theAction == null )
- {
- // give a message
- }
- }
- else
- {
- // The module is attached to more than one server find the first server-extension couple
- // TBD: add a dialog to choose the server for deployment
- for (int i = 0; i < elements.length; i++)
- {
- String id = elements[i].getAttribute("factoryId");
- for ( int k=0; k< typeIds.length; k++)
- {
- if ( typeIds[k].equals(id))
- {
- theAction = elements[i].createExecutableExtension("class");
- break;
- }
- }
- if (theAction != null) break;
- }
- if (theAction == null)
- {
- // give a Message
- }
- }
-
- if (theAction instanceof WebServiceDeploy)
- ((WebServiceDeploy)theAction).run(project);
- }
-
- catch (Exception e) {}
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
deleted file mode 100644
index 28d512b2d..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-
-public abstract class WindowActionDelegate implements IWorkbenchWindowActionDelegate {
-protected IStructuredSelection fSelection;
-
-public WindowActionDelegate() {
- super();
- }
-
-public void dispose()
- {
- }
-
-public void init(org.eclipse.ui.IWorkbenchWindow window) { }
-
-public void selectionChanged(org.eclipse.jface.action.IAction action,
- org.eclipse.jface.viewers.ISelection selection) {
- if (selection instanceof IStructuredSelection)
- fSelection = (IStructuredSelection) selection;
- }
-
-public void setSelection(IStructuredSelection selection) {
- fSelection = selection;
-}
-public IStructuredSelection getSelection() {
- return fSelection;
-}
-
-public IProject getSelectedResourceProject() {
- IProject project = null;
- IResource resource_ = null;
- try {
- if (fSelection != null && fSelection.size() == 1) {
- Object obj = fSelection.getFirstElement();
-
- if (obj != null) {
- if ( obj instanceof IResource)
- {
- resource_ = (IResource) obj;
- }
- else if (obj instanceof ICompilationUnit)
- {
- ICompilationUnit compUnit = (ICompilationUnit)obj;
- resource_= compUnit.getCorrespondingResource();
- }
- else if (obj instanceof IJavaProject) {
- project = ((IJavaProject) obj).getProject();
- }
-
- else if (obj instanceof EObject) {
- project = ProjectUtilities.getProject((EObject) obj);
- }
-
- if ( resource_ != null )
- project = resource_.getProject();
-
- }
- }
- }
- catch (Exception e) {}
- return project;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
deleted file mode 100644
index ed49db17a..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070423 183075 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
-* This class provides a dialog for browsing workspace resources.
-*/
-public class DialogResourceBrowser extends Dialog
-{
- private final String INFOPOP_RESOURCE_TREE = WebServiceUIPlugin.ID + ".DRES0001";
-
- private IResource root_;
- private IFilter[] filters_;
- private boolean multipleSelectionEnabled_;
- private IResource[] selection_;
- private Tree resourceTree_;
- private TreeViewer fileViewer_;
- private HashMap visitedContainers_;
- private boolean foldersSelectable_;
-
- public DialogResourceBrowser(Shell shell, IResource root, IFilter filter)
- {
- this(shell, root, new IFilter[]{filter}, false );
- }
-
- /**
- * Constructs a new <code>DialogResourceBrowser</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code>
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param filters An array of java.lang.String
- */
- public DialogResourceBrowser(Shell shell, IResource root, IFilter[] filters)
- {
- this( shell, root, filters, false );
- }
-
- public DialogResourceBrowser(Shell shell, IResource root, IFilter[] filters, boolean foldersSelectable )
- {
- super(shell);
-
- IResource moduleRoot = root;
- if (root instanceof IProject)
- {
- IProject p = (IProject)moduleRoot;
-
- moduleRoot = p;
-
- }
-
- root_ = (moduleRoot == null) ? ResourcesPlugin.getWorkspace().getRoot() : moduleRoot;
- filters_ = (filters == null) ? new IFilter[0] : filters;
- visitedContainers_ = new HashMap();
- multipleSelectionEnabled_ = false;
- foldersSelectable_ = foldersSelectable;
- setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
- }
-
- /**
- * Enables or disables multiple selection in the tree view.
- * Multiple selection is disabled by default.
- * @param multipleSelectionEnabled True to enabled or false to disable.
- */
- public void setMultipleSelectionEnabled(boolean multipleSelectionEnabled)
- {
- multipleSelectionEnabled_ = multipleSelectionEnabled;
- }
-
- /**
- * Returns the selections made in the dialog if OK was pressed,
- * or null if Cancel was pressed. Returns null if the dialog
- * has never been opened.
- * @return An array of selected resources, possibly empty, possibly null.
- */
- public IResource[] getSelection()
- {
- return selection_;
- }
-
- public IResource getFirstSelection()
- {
- if (selection_ != null && selection_.length > 0)
- return selection_[0];
- else
- return null;
- }
-
- /**
- * Called when the Cancel button is pressed.
- * Insures that {@link #getResult} will return null.
- */
- protected void cancelPressed()
- {
- selection_ = null;
- setReturnCode(Dialog.CANCEL);
- super.cancelPressed();
- }
-
- /**
- * Called when the OK button is pressed.
- * Squirrels away the list of zero or more selected
- * <code>IResource</code>s to be returned by {@link #getResult}.
- */
- protected void okPressed()
- {
- ISelection selection = fileViewer_.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- selection_ = new IResource[structuredSelection.size()];
- int i = 0;
- Iterator it = structuredSelection.iterator();
- while (it.hasNext())
- {
- Object object = it.next();
- if (object instanceof IResource)
- selection_[i++] = (IResource)object;
- }
- }
- setReturnCode(Dialog.OK);
- super.okPressed();
- }
-
- /**
- * See {@link org.eclipse.jface.window.Window#configureShell}.
- * @param shell The shell.
- */
- protected void configureShell(Shell shell)
- {
- super.configureShell(shell);
- shell.setText(WSUIPluginMessages.DIALOG_TITLE_RESOURCE_BROWSER);
- }
-
- /**
- * Creates the dialog area.
- * @param parent The parent composite.
- * @return The control area.
- */
- protected Control createDialogArea(Composite parent)
- {
- Composite composite = (Composite)super.createDialogArea(parent);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.widthHint = 400;
- gd.heightHint = 300;
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
-
- if (multipleSelectionEnabled_)
- {
- resourceTree_ = new Tree(composite,SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- else
- {
- resourceTree_ = new Tree(composite,SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- resourceTree_.setLayoutData(gd);
- resourceTree_.setToolTipText(WSUIPluginMessages.TOOLTIP_RESOURCE_TREE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(resourceTree_, INFOPOP_RESOURCE_TREE);
-
- fileViewer_ = new TreeViewer(resourceTree_);
- fileViewer_.setContentProvider(new WorkbenchContentProvider());
- fileViewer_.setLabelProvider(new DecoratingLabelProvider(new WorkbenchLabelProvider(), WebServiceUIPlugin.getInstance().getWorkbench().getDecoratorManager().getLabelDecorator()));
- fileViewer_.addFilter(
- new ViewerFilter()
- {
- public boolean select(Viewer viewer, Object parentObject, Object object)
- {
- if( object instanceof IResource )
- {
- return isValidResource( (IResource)object );
- }
-
- return false;
- }
- }
- );
-
- if( !foldersSelectable_ )
- {
- fileViewer_.addSelectionChangedListener( new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- handleSelectionChanged();
- }
- } );
- }
-
- fileViewer_.setInput(root_);
- return composite;
- }
-
- private void handleSelectionChanged()
- {
- ISelection selection = fileViewer_.getSelection();
- boolean validSelection = true;
-
- if( selection instanceof IStructuredSelection )
- {
- IStructuredSelection strucSelection = (IStructuredSelection)selection;
- Iterator iter = strucSelection.iterator();
-
- // Ensure that all selected items are valid.
- while( iter.hasNext() )
- {
- Object object = iter.next();
-
- if( object instanceof IFile )
- {
- validSelection = acceptsFile( (IFile)object );
- }
- else
- {
- validSelection = false;
- }
-
- if( !validSelection ) break;
- }
- }
- else
- {
- validSelection = false;
- }
-
- Button okButton = getButton( Dialog.OK );
- okButton.setEnabled( validSelection );
- }
-
- private boolean acceptsFile( IResource file )
- {
- boolean result = false;
-
- for (int i = 0; i < filters_.length; i++)
- {
- if( filters_[i].accepts( file ) )
- {
- result = true;
- break;
- }
- }
-
- return result;
- }
-
- private boolean isValidResource( IResource resource )
- {
- boolean result = false;
-
- if( resource instanceof IFile )
- {
- // Loop over all filters. If one is acceptable then we will
- // return true.
- result = acceptsFile( resource );
- }
- else if( resource instanceof IContainer )
- {
- // Now see if this container contains at least one valid file.
- Boolean validContainer = (Boolean)visitedContainers_.get( resource );
-
- if( validContainer == null )
- {
- // We haven't seen this container before.
- try
- {
- IContainer container = (IContainer)resource;
- IResource[] members = container.members();
-
- visitedContainers_.put( container, Boolean.FALSE );
-
- for( int index = 0; index < members.length; index++)
- {
- if( isValidResource(members[index]) )
- {
- visitedContainers_.put( container, Boolean.TRUE );
- result = true;
- break;
- }
- }
- }
- catch( CoreException exc )
- {
- // Do nothing
- }
- }
- else
- {
- result = validContainer.booleanValue();
- }
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java
deleted file mode 100644
index ed355c40d..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-import org.eclipse.core.resources.IFile;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public class FileExtensionFilter implements IFilter
-{
- private String[] extensions_;
-
- public FileExtensionFilter(String[] extensions)
- {
- extensions_ = (extensions != null) ? extensions : new String[0];
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName()
- {
- return "org.eclipse.jst.ws.atk.ui.editor.common.FileExtensionFilter";
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription()
- {
- return "org.eclipse.jst.ws.atk.ui.editor.common.FileExtensionFilter";
- }
-
- /**
- * Returns true if and only if this <code>Filter</code>
- * accepts the given <code>object</code>. This method
- * must return true if and only if {@link #statusOf}
- * returns an <code>IStatus</code> with a severity of
- * less than <code>IStatus.ERROR</code>.
- * @param object The object to filter.
- * @return True if and only if this <code>Filter</code>
- * accepts the given <code>object</code>.
- */
- public boolean accepts(Object object)
- {
- if (object instanceof IFile)
- {
- IFile file = (IFile)object;
- for (int i = 0; i < extensions_.length; i++)
- {
- if (file.getFileExtension() != null && file.getFileExtension().equals(extensions_[i]))
- return true;
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java
deleted file mode 100644
index 2e5db8b50..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public interface IFilter
-{
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName();
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription();
-
- /**
- * Returns true if and only if this <code>Filter</code>
- * accepts the given <code>object</code>. This method
- * must return true if and only if {@link #statusOf}
- * returns an <code>IStatus</code> with a severity of
- * less than <code>IStatus.ERROR</code>.
- * @param object The object to filter.
- * @return True if and only if this <code>Filter</code>
- * accepts the given <code>object</code>.
- */
- public boolean accepts(Object object);
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java
deleted file mode 100644
index 24793c45f..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060817 140017 makandre@ca.ibm.com - Andrew Mak, longer project or server/runtime strings do not resize wizard
- * 20060829 155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.common;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-
-
-public class UIUtils
-{
- /**
- * A default padding value for horizontalResize().
- */
- public final static int DEFAULT_PADDING = 35;
-
- String infoPopid_;
-
- public UIUtils( String infoPopid )
- {
- infoPopid_ = infoPopid;
- }
-
- public Button createRadioButton( Composite parent, String labelName, String tooltip, String infopop )
- {
- return createButton( SWT.RADIO, parent, labelName, tooltip, infopop );
- }
-
- public Button createCheckbox( Composite parent, String labelName, String tooltip, String infopop )
- {
- return createButton( SWT.CHECK, parent, labelName, tooltip, infopop );
- }
-
- public Button createPushButton( Composite parent, String labelName, String tooltip, String infopop )
- {
- return createButton( SWT.NONE, parent, labelName, tooltip, infopop );
- }
-
- public Button createButton( int kind, Composite parent, String labelName, String tooltip, String infopop )
- {
- Button button = new Button( parent, kind );
-
- tooltip = tooltip == null ? labelName : tooltip;
- button.setText( labelName );
- button.setToolTipText( tooltip );
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( button, infoPopid_ + "." + infopop );
-
- return button;
- }
-
- public Combo createCombo( Composite parent, String labelName, String tooltip, String infopop, int style )
- {
- tooltip = tooltip == null ? labelName : tooltip;
-
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( labelName );
- label.setToolTipText( tooltip );
- }
-
- Combo combo = new Combo( parent, style );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-
- combo.setLayoutData( griddata );
- combo.setToolTipText( tooltip );
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( combo, infoPopid_ + "." + infopop );
-
- return combo;
- }
-
- public Text createText( Composite parent, String labelName, String tooltip, String infopop, int style )
- {
- tooltip = tooltip == null ? labelName : tooltip;
-
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( labelName );
- label.setToolTipText( tooltip );
- }
-
- Text text = new Text( parent, style );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-
- text.setLayoutData( griddata );
- text.setToolTipText( tooltip);
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( text, infoPopid_ + "." + infopop );
-
- return text;
- }
-
- public Composite createComposite( Composite parent, int columns )
- {
- return createComposite( parent, columns, -1, -1 );
- }
-
- public Composite createComposite( Composite parent, int columns, int marginHeight, int marginWidth )
- {
- Composite composite = new Composite( parent, SWT.NONE );
-
- GridLayout gridlayout = new GridLayout();
- gridlayout.numColumns = columns;
-
- if( marginHeight >= 0 ) gridlayout.marginHeight = marginHeight;
- if( marginWidth >= 0 ) gridlayout.marginWidth = marginWidth;
-
- composite.setLayout( gridlayout );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- composite.setLayoutData( griddata );
-
- return composite;
-
- }
- public Group createGroup( Composite parent, String groupName, String tooltip, String infopop )
- {
- return createGroup( parent, groupName, tooltip, infopop, 1, -1, -1 );
- }
-
- public Group createGroup( Composite parent, String groupName, String tooltip, String infopop, int columns, int marginHeight, int marginWidth )
- {
- Group newGroup = new Group( parent, SWT.NONE );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- GridLayout gridlayout = new GridLayout();
-
- gridlayout.numColumns = columns;
-
- if( marginHeight >= 0 ) gridlayout.marginHeight = marginHeight;
- if( marginWidth >= 0 ) gridlayout.marginWidth = marginWidth;
-
- tooltip = tooltip == null ? groupName : tooltip;
- newGroup.setLayout( gridlayout );
- newGroup.setText( groupName );
- newGroup.setLayoutData( griddata );
- newGroup.setToolTipText( tooltip );
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp(newGroup, infoPopid_ + "." + infopop);
-
- return newGroup;
- }
-
- public Tree createTree( Composite parent, String tooltip, String infopop, int style )
- {
-
- tooltip = tooltip == null ? "" : tooltip;
-
- Tree tree = new Tree( parent, style );
-
- tree.setLayoutData( createFillAll() );
- tree.setToolTipText( tooltip);
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( tree, infoPopid_ + "." + infopop );
-
- return tree;
-
- }
-
- public Table createTable( Composite parent, String tooltip, String infopop, int style )
- {
-
- tooltip = tooltip == null ? "" : tooltip;
-
- Table table = new Table( parent, style );
-
- //table.setLayoutData( createFillAll() );
- table.setToolTipText( tooltip);
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( table, infoPopid_ + "." + infopop );
-
- return table;
-
- }
-
- public Label createHorizontalSeparator( Composite parent, int spacing )
- {
- Composite composite = createComposite( parent, 1, spacing, -1 );
-
- Label separator = new Label( composite, SWT.SEPARATOR | SWT.HORIZONTAL );
-
- GridData griddata = new GridData( GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL );
- separator.setLayoutData( griddata );
-
- return separator;
- }
-
- public GridData createFillAll()
- {
- GridData data = new GridData( GridData.HORIZONTAL_ALIGN_FILL |
- GridData.GRAB_HORIZONTAL |
- GridData.VERTICAL_ALIGN_FILL |
- GridData.GRAB_VERTICAL );
- return data;
- }
-
- public void createInfoPop(Control ctrl, String infopop)
- {
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( ctrl, infoPopid_ + "." + infopop );
- }
-
- /**
- * Resizes the width of the target composite so that it is as wide as the
- * reference composite plus a padding value.
- *
- * @param target The composite to resize.
- * @param reference The reference composite
- * @param padding The padding value
- */
- public void horizontalResize(Composite target, Composite reference, int padding) {
-
- Point originalSize = target.getSize();
- Point referenceSize = reference.getSize();
-
- padding = padding >= 0 ? padding : DEFAULT_PADDING;
-
- if (referenceSize.x + padding > originalSize.x)
- target.setSize(referenceSize.x + padding, originalSize.y);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
deleted file mode 100644
index f66c08b88..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080324 220983 trungha@ca.ibm.com - Trung Ha
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.dialog;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jst.ws.internal.common.Filter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-
-/**
-* Contains utility methods for launching various common dialogs.
-*/
-public final class DialogUtils
-{
-
- /**
- * Raises a dialog for browsing containers.
- * @param parentShell The parent shell, optionally null.
- * @param initialPathname The initial selection.
- * @return The selected container or null if the dialog
- * is cancelled, or there is no selection, or the selection
- * is not a project or a folder.
- */
- public static String browseContainers ( Shell parentShell, String initialPathname )
- {
- String selectedPathname = null;
- IPath initialPath = new Path(initialPathname);
- IResource initialResource = ResourceUtils.getWorkspaceRoot().findMember(initialPath);
- if (initialResource == null)
- {
- if (initialPath.segmentCount() == 1)
- {
- initialResource = ResourceUtils.getWorkspaceRoot().getProject(initialPath.segment(0));
- }
- else if (initialPath.segmentCount() > 1)
- {
- initialResource = ResourceUtils.getWorkspaceRoot().getFolder(initialPath);
- }
- }
- else
- {
- if (initialResource.getType() == IResource.FILE)
- {
- initialResource = initialResource.getParent();
- }
- }
- ContainerSelectionDialog dialog = new ContainerSelectionDialog(parentShell,(IContainer)initialResource,true,null);
- dialog.open();
- Object[] result = dialog.getResult();
- if (result != null && result.length > 0)
- {
- if (result[0] instanceof IPath)
- {
- IPath path = (IPath)result[0];
- selectedPathname = path.toString();
- }
- }
- return selectedPathname;
- }
-
- /**
- * Raises a dialog for browsing resources.
- * @param parentShell The parent shell, optionally null.
- * @param topResource The resource under which to browse.
- * If null, all resources in the workspace are browsed.
- * @param initialSelection The initial selection, or null for none.
- * If the initial selection is not null and exists in the set of
- * resources found by the browser, that resource is selected by default.
- * @param filter The resource filter object.
- * @return The selected resource.
- */
- public static IResource browseResources ( Shell parentShell, IResource topResource, IResource initialSelection, Filter filter)
- {
- ResourceSelectionDialog rds = new ResourceSelectionDialog(parentShell,topResource,initialSelection,filter);
- rds.setMultipleSelectionEnabled(false);
- if (rds.open() == Dialog.OK)
- {
- IResource[] resources = rds.getResult();
- if (resources != null && resources.length > 0)
- {
- return resources[0];
- }
- }
- return null;
- }
-
- /**
- * <b>Implementation remains TBD.</b><br>
- * Raises a dialog for browsing classes on a project's class path.
- * @param parentShell The parent shell, optionally null.
- * @param project The project.
- * @return The qualified name of the selected java class.
- */
- public static String browseClasses ( Shell parentShell, IProject project )
- {
- return browseClasses(parentShell, project, (IRunnableContext)null);
- }
-
- public static String browseClasses ( Shell parentShell, IProject project, IWizardContainer container)
- {
- return browseClasses(parentShell, project, (IRunnableContext)container);
- }
-
- /**
- * Raises a dialog for browsing classes on a project's class path.
- * @param parentShell The parent shell, optionally null.
- * @param project The project.
- * @param container The container of the launching wizard.
- * @return The qualified name of the selected java class.
- */
- public static String browseClasses ( Shell parentShell,
- IProject project,
- IRunnableContext ctxt)
- {
- return browseClasses(parentShell, new IResource[] {project}, ctxt);
- }
-
- public static String browseClasses(Shell parentShell, IResource[] resources, IRunnableContext ctxt)
- {
- IType itype = browseClassesAsIType(parentShell, resources, ctxt);
- if (itype != null)
- return itype.getFullyQualifiedName();
- else
- return null;
- }
-
- public static IType browseClassesAsIType(Shell parentShell, IResource[] resources, IRunnableContext ctxt)
- {
- Vector javaElements = new Vector();
- for (int i = 0; i < resources.length; i++)
- {
- IJavaElement javaElement = JavaCore.create(resources[i]);
- if (javaElement != null)
- javaElements.add(javaElement);
- }
- IJavaElement[] elements = (IJavaElement[])javaElements.toArray(new IJavaElement[0]);
-
- IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
- scope.setIncludesClasspaths(true);
- scope.setIncludesBinaries(true);
-
- //Creating and opening a TypeSelectionDialog
- try
- {
- // We want to show every class when the dialog is opened, so throw in this String
- String filterStringToSelectEverything = "* "; //$NON-NLS-1$
-
- SelectionDialog dialog = JavaUI.createTypeDialog(parentShell, ctxt, scope, IJavaElementSearchConstants.CONSIDER_CLASSES, false, filterStringToSelectEverything);
- dialog.setTitle(WSUIPluginMessages.DIALOG_TITLE_CLASS_BROWSE);
- dialog.setMessage(WSUIPluginMessages.LABEL_CLASS_BROWSE);
- dialog.open();
-
- //Getting the result and returning it
- Object[] results = dialog.getResult();
- if (results != null && results.length > 0)
- {
- if (results[0] instanceof IType)
- {
- return (IType)results[0];
- }
- }
- }
- catch (JavaModelException jme)
- {
- }
- return null;
- }
-
- /**
- * Raises a dialog for browsing interfaces on a project's class path.
- * @param parentShell The parent shell, optionally null.
- * @param project The project.
- * @param container The container of the launching wizard.
- * @return The qualified name of the selected java interface.
- */
- public static String browseInterfaces( Shell parentShell,
- IProject project,
- IWizardContainer container)
-
- {
- String interfaceName = null;
-
- //Limiting search scope to the project
- IResource[] resources = new IResource[1];
- resources[0]=project;
- IJavaElement[] elements = new IJavaElement[1];
- elements[0] = JavaCore.create(resources[0]);
- IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
- scope.setIncludesClasspaths(true);
- scope.setIncludesBinaries(true);
-
- //Creating and opening a TypeSelectionDialog
- try
- {
- SelectionDialog dialog = JavaUI.createTypeDialog(parentShell, container, scope, IJavaElementSearchConstants.CONSIDER_TYPES, false);
- dialog.setTitle(WSUIPluginMessages.DIALOG_TITLE_INTERFACE_BROWSE);
- dialog.setMessage(WSUIPluginMessages.DIALOG_TITLE_INTERFACE_BROWSE);
- dialog.open();
-
- //Getting the result and returning it
- Object[] results = dialog.getResult();
- if (results != null && results.length > 0)
- {
- if (results[0] instanceof IType)
- {
- IType resultInterface = (IType)results[0];
- interfaceName = resultInterface.getFullyQualifiedName();
- }
- }
- }
- catch (JavaModelException jme)
- {
- }
-
- return interfaceName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
deleted file mode 100644
index 0de3bead8..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.dialog;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.common.Filter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-
-/**
-* This class provides a dialog for browsing workspace resources.
-* See also {@link DialogUtils#browseResources}.
-*/
-public class ResourceSelectionDialog extends Dialog implements Listener
-{
-
- // Dialog controls.
- //
- private Label filterLabel_;
- private Combo filterCombo_;
- /*CONTEXT_ID DRES0001 for the Resource Type combo box of the Resource Selection Dialog*/
- private static final String INFOPOP_DRES_COMBO_RESOURCE_TYPE = WebServiceUIPlugin.ID + ".DRES0001";
-
- private Tree resourceTree_;
- private TreeViewer fileViewer_;
- /*CONTEXT_ID DRES0002 for the Resource tree of the Resource Selection Dialog*/
- private static final String INFOPOP_DRES_TREE_RESOURCE = WebServiceUIPlugin.ID + ".DRES0002";
-
- //
- // Essential goodies.
- //
- private IResource root_;
- private IResource initialSelection_;
- private Filter[] filters_;
- private Filter currentFilter_;
- private IResource[] selection_;
- private boolean multipleSelectionEnabled_;
-
- /**
- * Constructs a new <code>ResourceSelectionDialog</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code>.
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param initialSelection The initially selected object or null if none.
- */
- public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection )
- {
- this(parent,root,initialSelection,new Filter[] {new AnyFilter()});
- }
-
- /**
- * Constructs a new <code>ResourceSelectionDialog</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code> that
- * are accepted by the given filter.
- * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param initialSelection The initially selected object or null if none.
- * @param filter The {@link org.eclipse.jst.ws.internal.common.Filter},
- * or null to default to all resources under the <code>root</code>.
- */
- public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter filter )
- {
- this(parent,root,initialSelection,new Filter[] {filter});
- }
-
- /**
- * Constructs a new <code>ResourceSelectionDialog</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code> that
- * are accepted by the given filters.
- * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param initialSelection The initially selected object or null if none.
- * @param filters An array of {@link org.eclipse.jst.ws.internal.common.Filter}
- * objects.
- * If the array is null or of length zero, then all resources are accepted
- * (ie. equivalent to <code>ResourceSelectionDialog(parent,root)</code>.
- * If the array is of length one, then the dialog will consist of a single
- * control showing a list of all filtered resources.
- * If the array is of length greater than one, then the dialog will
- * consist of a combo box containing the names of the filters and with the
- * first filter (ie. <code>filters[0]</code>) selected by default, followed
- * by a control showing a list of all resources filtered by the selected filter.
- */
- public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter[] filters )
- {
- super(parent);
- root_ = root == null ? ResourceUtils.getWorkspaceRoot() : root;
- initialSelection_ = initialSelection;
- filters_ = (filters == null || filters.length == 0) ? new Filter[] {new AnyFilter()} : filters;
- currentFilter_ = filters_[0];
- multipleSelectionEnabled_ = false;
- setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
- }
-
- /**
- * Enables or disables multiple selection in the tree view.
- * Multiple selection is disabled by default.
- * @param multipleSelectionEnabled True to enabled or false to disable.
- */
- public void setMultipleSelectionEnabled ( boolean multipleSelectionEnabled )
- {
- multipleSelectionEnabled_ = multipleSelectionEnabled;
- }
-
- /**
- * Returns the selections made in the dialog if OK was pressed,
- * or null if Cancel was pressed. Returns null if the dialog
- * has never been opened.
- * @return An array of selected resources, possibly empty, possibly null.
- */
- public IResource[] getResult ()
- {
- return selection_;
- }
-
- /**
- * Called when the Cancel button is pressed.
- * Insures that {@link #getResult} will return null.
- */
- protected void cancelPressed ()
- {
- selection_ = null;
- setReturnCode(Dialog.CANCEL);
- super.cancelPressed();
- }
-
- /**
- * Called when the OK button is pressed.
- * Squirrels away the list of zero or more selected
- * <code>IResource</code>s to be returned by {@link #getResult}.
- */
- protected void okPressed ()
- {
- ISelection selection = fileViewer_.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- selection_ = new IResource[structuredSelection.size()];
- int i=0;
- Iterator iter = structuredSelection.iterator();
- while (iter.hasNext())
- {
- Object object = iter.next();
- if (object instanceof IResource)
- {
- selection_[i++] = (IResource)object;
- }
- }
- }
- setReturnCode(Dialog.OK);
- super.okPressed();
- }
-
- /**
- * See {@link org.eclipse.jface.window.Window#configureShell}.
- * @param shell The shell.
- */
- protected void configureShell ( Shell shell )
- {
- super.configureShell(shell);
- shell.setText(WSUIPluginMessages.DIALOG_TITLE_RESOURCE_BROWSE);
- }
-
- /**
- * Creates the dialog area.
- * @param parent The parent composite.
- * @return The control area.
- */
- protected Control createDialogArea ( Composite parent )
- {
- GridLayout gl;
- GridData gd;
-
- Composite composite = (Composite)super.createDialogArea(parent);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.widthHint = 400;
- gd.heightHint = 300;
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
-
- if (filters_.length > 1)
- {
- Composite f = new Composite(composite,SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- f.setLayout(gl);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- f.setLayoutData(gd);
-
- filterLabel_ = new Label(f,SWT.WRAP);
- filterLabel_.setText(WSUIPluginMessages.LABEL_RESOURCE_FILTER);
- filterLabel_.setToolTipText(WSUIPluginMessages.TOOLTIP_DRES_COMBO_RESOURCE_TYPE);
-
- filterCombo_ = new Combo(f,SWT.DROP_DOWN | SWT.READ_ONLY);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- filterCombo_.setLayoutData(gd);
- filterCombo_.addListener(SWT.Selection,this);
- filterCombo_.setToolTipText(WSUIPluginMessages.TOOLTIP_DRES_COMBO_RESOURCE_TYPE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(filterCombo_,INFOPOP_DRES_COMBO_RESOURCE_TYPE);
- }
-
- if (multipleSelectionEnabled_)
- {
- resourceTree_ = new Tree(composite,SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- else
- {
- resourceTree_ = new Tree(composite,SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- resourceTree_.setLayoutData(gd);
-// resourceTree_.addListener(SWT.Selection,this);
- resourceTree_.setToolTipText(WSUIPluginMessages.TOOLTIP_DRES_TREE_RESOURCE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(resourceTree_,INFOPOP_DRES_TREE_RESOURCE);
-
- fileViewer_ = new TreeViewer(resourceTree_);
- fileViewer_.setContentProvider(new WorkbenchContentProvider());
- fileViewer_.setLabelProvider(
- new DecoratingLabelProvider(
- new WorkbenchLabelProvider(),
- WebServiceUIPlugin.getInstance().getWorkbench().getDecoratorManager().getLabelDecorator()));
- fileViewer_.addFilter(
- new ViewerFilter ()
- {
- public boolean select ( Viewer viewer, Object parentObject, Object object )
- {
- return
- (
- ((object instanceof IResource) && ((IResource)object).getType() != IResource.FILE)
- || (ResourceSelectionDialog.this.currentFilter_.accepts(object))
- );
- }
- }
- );
- fileViewer_.setInput(root_);
- fileViewer_.addSelectionChangedListener(
- new ISelectionChangedListener ()
- {
- public void selectionChanged ( SelectionChangedEvent event )
- {
-// ResourceSelectionDialog.this.validatePageToStatus();
- }
- }
- );
- if (initialSelection_ != null)
- {
- fileViewer_.setSelection(new StructuredSelection(ResourceSelectionDialog.this.initialSelection_),true);
- }
-
- return composite;
- }
-
- /**
- * Called when an event occurs on the page.
- * Handles the event and revalidates the page.
- * @param event The event that occured.
- */
- public void handleEvent ( Event event )
- {
-// validatePageToStatus();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
deleted file mode 100644
index 6e51a55d3..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceUIPlugin extends AbstractUIPlugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceUIPlugin instance_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceUIPlugin() {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
- * @return The WebServiceUIPlugin singleton.
- */
- static public WebServiceUIPlugin getInstance() {
- return instance_;
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor(String name) {
- try {
- URL installURL = instance_.getBundle().getEntry("/");
- URL imageURL = new URL(installURL, name);
- return ImageDescriptor.createFromURL(imageURL);
- } catch (MalformedURLException e) {
- return null;
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/popup/PopupTestService.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/popup/PopupTestService.java
deleted file mode 100644
index 92537b7ab..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/popup/PopupTestService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060803 152790 mahutch@ca.ibm.com - Mark Hutchinson (created class)
- * 20070327 172339 kathy@ca.ibm.com - Kathy Chan
- * 20080123 216372 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.popup;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL;
-import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
-
-
-public class PopupTestService extends PopupTestWSDL
-{
- public PopupTestService()
- {
- super();
- }
-
- public void run()
- {
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- WSExplorerLauncherCommand command = new WSExplorerLauncherCommand();
- command.setForceLaunchOutsideIDE(false);
- Vector launchOptions = new Vector();
- if (selection != null)
- {
- for (Iterator it = selection.iterator(); it.hasNext();)
- {
- String wsdlURL = null;
- Object object = it.next();
-
- if (object instanceof ServiceRef)
- {
- ServiceRef serviceImpl = (ServiceRef)object;
- wsdlURL = J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
- } else if (object instanceof String) {
- wsdlURL = (String) object;
- } else {
- // Object is not any types we recognized, wsdlURL is still null.
- // Try looking up an adapter for the object.
- // If found, update wsdlURL contains the adapted WSDL string.
- // If not found, wsdlURL would still be null.
- wsdlURL = AdapterUtils.getAdaptedWSDL(object);
- }
-
- addLaunchOptions(launchOptions, wsdlURL, stateLocation, defaultFavoritesLocation);
- }
- }
- command.setLaunchOptions((LaunchOption[])launchOptions.toArray(new LaunchOption[0]));
- command.execute();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
deleted file mode 100644
index 24b3fe7bc..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060331 128827 kathy@ca.ibm.com - Kathy Chan
- * 20060403 128827 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.ResourceDefaults;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.MergeDefaults;
-import org.eclipse.wst.ws.internal.preferences.PersistentMergeContext;
-
-
-
-public class ResourceManagmentPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
- /*CONTEXT_ID PPRM0001 for the Resource Managment Preference Page*/
- private String INFOPOP_PPRM_PAGE = WebServiceUIPlugin.ID + ".PPRM0001";
- //
- private Button overWriteFiles;
- /*CONTEXT_ID PPRM0002 for the file overwrite check box on the Resource Management Preference Page*/
- private String INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES = WebServiceUIPlugin.ID + ".PPRM0002";
- //
- private Button createFolders;
- /*CONTEXT_ID PPRM0003 for the create folders check box on the Resource Management Preference Page*/
- private String INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS = WebServiceUIPlugin.ID + ".PPRM0003";
- //
- private Button checkoutFiles;
- /*CONTEXT_ID PPRM0004 for the checkout files check box on the Resource Management Preference Page*/
- private String INFOPOP_PPRM_CHECKBOX_CHECK_OUT = WebServiceUIPlugin.ID + ".PPRM0004";
-
- private Button skeletonMerge;
- /*CONTEXT_ID PPRM0005 for the skeleton merge check box on the Resource Management Preference Page*/
- private String INFOPOP_PPRM_CHECKBOX_SKELETON_MERGE = WebServiceUIPlugin.ID + ".PPRM0005";
-
- /**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout( layout );
- parent.setToolTipText(WSUIPluginMessages.TOOLTIP_PPRM_PAGE);
- helpSystem.setHelp(parent, INFOPOP_PPRM_PAGE);
-
- overWriteFiles = createCheckBox(parent, WSUIPluginMessages.BUTTON_OVERWRITE_FILES);
- overWriteFiles.setToolTipText(WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES);
- helpSystem.setHelp(overWriteFiles, INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES);
-
- createFolders = createCheckBox(parent, WSUIPluginMessages.BUTTON_CREATE_FOLDERS);
- createFolders.setToolTipText(WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS);
- helpSystem.setHelp(createFolders, INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS);
-
- checkoutFiles = createCheckBox(parent, WSUIPluginMessages.BUTTON_CHECKOUT_FILES);
- checkoutFiles.setToolTipText(WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_CHECK_OUT);
- helpSystem.setHelp(checkoutFiles, INFOPOP_PPRM_CHECKBOX_CHECK_OUT);
-
- skeletonMerge = createCheckBox(parent, WSUIPluginMessages.BUTTON_SKELETON_MERGE);
- skeletonMerge.setToolTipText(WSUIPluginMessages.TOOLTIP_PPRM_CHECKBOX_SKELETON_MERGE);
- helpSystem.setHelp(skeletonMerge, INFOPOP_PPRM_CHECKBOX_SKELETON_MERGE);
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- private Button createCheckBox( Composite parent, String text )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText( text );
- return button;
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- storeValues();
- return true;
- }
-
- protected void performApply()
- {
- performOk();
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * Initializes states of the controls using default values
- * in the preference store.
- */
- private void initializeDefaults()
- {
- overWriteFiles.setSelection( ResourceDefaults.getOverwriteFilesDefault());
- createFolders.setSelection( ResourceDefaults.getCreateFoldersDefault());
- checkoutFiles.setSelection( ResourceDefaults.getCheckoutFilesDefault());
- skeletonMerge.setSelection( MergeDefaults.getSkeletonMergeDefault());
- }
-
- /**
- * Initializes states of the controls from the preference store.
- */
- private void initializeValues()
- {
- // get the persistent context from the plugin
- ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
- PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
- overWriteFiles.setSelection( context.isOverwriteFilesEnabled());
- createFolders.setSelection( context.isCreateFoldersEnabled());
- checkoutFiles.setSelection( context.isCheckoutFilesEnabled());
- skeletonMerge.setSelection( mergeContext.isSkeletonMergeEnabled());
- }
-
- /**
- * Stores the values of the controls back to the preference store.
- */
- private void storeValues()
- {
- // get the persistent context from the plugin
- ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
- PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
- context.setOverwriteFilesEnabled( overWriteFiles.getSelection() );
- context.setCreateFoldersEnabled( createFolders.getSelection() );
- context.setCheckoutFilesEnabled( checkoutFiles.getSelection() );
- mergeContext.setSkeletonMergeEnabled( skeletonMerge.getSelection() );
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/TestFacilityDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/TestFacilityDefaultsPreferencePage.java
deleted file mode 100644
index d23067b01..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/TestFacilityDefaultsPreferencePage.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060217 113169 pmoogk@ca.ibm.com - Peter Moogk
- * 20060222 118711 pmoogk@ca.ibm.com - Peter Moogk
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import java.util.Vector;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.ScenarioDefaults;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class TestFacilityDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
-
- private TableViewer webServiceTestTypeViewer_;
- private Button moveUp_;
- private Button moveDown_;
- private Vector webServiceTestTypes_;
-
- /*CONTEXT_ID PPSD0001 for the Scenario Defaults Preference Page*/
- private String INFOPOP_PPSD_PAGE = WebServiceUIPlugin.ID + ".PPSD0001";
- //
- private Button launchSample;
- /*CONTEXT_ID PPSD0002 for the launch sample check box on the Scenario Defaults Preference Page*/
- private final String INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE = WebServiceUIPlugin.ID + ".PPSD0002";
- //
-
- /**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout( layout );
- parent.setToolTipText(WSUIPluginMessages.TOOLTIP_PPSD_PAGE);
- parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PPSD_PAGE);
-
- launchSample = createCheckBox(parent, WSUIPluginMessages.BUTTON_LAUNCH_SAMPLE);
- launchSample.setToolTipText(WSUIPluginMessages.TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(launchSample, INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE);
-
-
- Text testServiceTypeLabel = new Text(parent, SWT.READ_ONLY | SWT.WRAP);
- testServiceTypeLabel.setText(WSUIPluginMessages.LABEL_SAMPLE_TYPES);
- testServiceTypeLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
- Composite webServiceTestTypeComposite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- webServiceTestTypeComposite.setLayout(gl);
- webServiceTestTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
- Table table= new Table(webServiceTestTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- gd.widthHint = 256;
- table.setLayoutData(gd);
- table.setToolTipText(WSUIPluginMessages.TOOLTIP_CLIENT_TYPE_TABLE_VIEWER);
-
- webServiceTestTypes_ = new Vector();
- webServiceTestTypeViewer_ = new TableViewer(table);
- webServiceTestTypeViewer_.setContentProvider(new WebServiceTestTypeContentProvider());
- webServiceTestTypeViewer_.setLabelProvider(new WebServiceTestTypeLabelProvider());
- webServiceTestTypeViewer_.setInput(webServiceTestTypes_);
-
- TableLayout tableLayout = new TableLayout();
- TableColumn tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setText(WSUIPluginMessages.LABEL_CLIENT_TYPE_NAME);
- ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
- tableLayout.addColumnData(columnData);
- table.setLayout(tableLayout);
-
- Composite c = new Composite(webServiceTestTypeComposite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 1;
- gl.marginHeight = 10;
- gl.marginWidth = 0;
- c.setLayout(gl);
- c.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
- moveUp_ = new Button(c, SWT.PUSH);
- moveUp_.setText(WSUIPluginMessages.LABEL_MOVE_UP);
- moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveUp_.addSelectionListener(this);
- moveUp_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_UP);
-
- moveDown_ = new Button(c, SWT.PUSH);
- moveDown_.setText(WSUIPluginMessages.LABEL_MOVE_DOWN);
- moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveDown_.addSelectionListener(this);
- moveDown_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_DOWN);
-
- table.addSelectionListener(new TableSelectionListener(moveUp_, moveDown_, table));
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- private Button createCheckBox( Composite parent, String text )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText( text );
- return button;
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- try{
- storeValues();
- }catch (Exception exc){
- exc.printStackTrace();}
- return true;
- }
-
- protected void performApply()
- {
- try{
- performOk();
- }catch(NullPointerException exc){
- exc.printStackTrace();
- }
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * Initializes states of the controls to their burned-in defaults.
- */
- private void initializeDefaults()
- {
- ScenarioDefaults defaults = new ScenarioDefaults();
- //pgm launchSample.setSelection( defaults.getLaunchSampleDefault());
-
- webServiceTestTypes_.clear();
- String[] types = defaults.getWebServiceTestIds();
- for (int i = 0; i < types.length; i++)
- webServiceTestTypes_.add(types[i]);
- webServiceTestTypeViewer_.refresh();
- }
-
- /**
- * Initializes states of the controls from the preference helper.
- */
- private void initializeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
- ScenarioDefaults defaults = new ScenarioDefaults();
-
- launchSample.setSelection( context.isLaunchSampleEnabled());
-
- String[] types = context.getWebServiceTestIds();
- for (int i = 0; i < types.length; i++)
- webServiceTestTypes_.add(types[i]);
- // check whether we missed any types from the default list
- boolean missed = false;
- types = defaults.getWebServiceTestIds();
- for (int i = 0; i < types.length; i++)
- {
- if (webServiceTestTypes_.indexOf(types[i]) == -1)
- {
- webServiceTestTypes_.add(types[i]);
- missed = true;
- }
- }
- if (missed)
- {
- types = new String[webServiceTestTypes_.size()];
- webServiceTestTypes_.copyInto(types);
- context.setWebServiceTestIds(types);
- }
- // refresh viewer
- webServiceTestTypeViewer_.refresh();
-
- // Select the first item in the table
- Table table = webServiceTestTypeViewer_.getTable();
- if (table.getItemCount() > 0){
- table.setSelection(0);
- table.notifyListeners(SWT.Selection, new Event());
- }
- }
-
- /**
- * Stores the values of the controls back to the preference helper.
- */
- private void storeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
- String[] types = new String[webServiceTestTypes_.size()];
- webServiceTestTypes_.copyInto(types);
- context.setWebServiceTestIds(types);
-
- context.setLaunchSampleEnabled(launchSample.getSelection());
- }
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- int index = webServiceTestTypeViewer_.getTable().getSelectionIndex();
- if (index != -1)
- {
- if (e.widget == moveUp_ && index > 0)
- {
- Object object = webServiceTestTypes_.remove(index);
- webServiceTestTypes_.insertElementAt(object, index-1);
- webServiceTestTypeViewer_.refresh();
- }
- else if (e.widget == moveDown_ && index < webServiceTestTypes_.size()-1)
- {
- Object object = webServiceTestTypes_.remove(index);
- webServiceTestTypes_.insertElementAt(object, index+1);
- webServiceTestTypeViewer_.refresh();
- }
- webServiceTestTypeViewer_.getTable().notifyListeners(SWT.Selection, new Event());
- }
- }
-
- private class WebServiceTestTypeContentProvider implements IStructuredContentProvider
- {
- /**
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object value)
- {
- return ((Vector)value).toArray(new String[0]);
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose()
- {
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
- */
- public void inputChanged(Viewer arg0, Object arg1, Object arg2)
- {
- }
- }
-
- private class WebServiceTestTypeLabelProvider extends LabelProvider
- {
- public WebServiceTestTypeLabelProvider()
- {
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
- */
- public Image getImage(Object arg0)
- {
- return null;
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
- */
- public String getText(Object value)
- {
- WebServiceTestExtension extension = (WebServiceTestExtension) WebServiceTestRegistry.getInstance()
- .getWebServiceExtensionsById(value.toString());
- if (extension != null)
- return extension.getLabel();
- return value.toString();
- }
- }
-
- protected class TableSelectionListener implements SelectionListener
- {
- Button up;
- Button down;
- Table table;
-
- public void widgetDefaultSelected(SelectionEvent arg0)
- {
- widgetSelected(arg0);
- }
-
- public void widgetSelected(SelectionEvent arg0)
- {
- int i = table.getSelectionIndex();
- if (i == table.getItemCount() - 1) down.setEnabled(false);
- else if (i > -1) down.setEnabled(true);
- if (i == 0) up.setEnabled(false);
- else if (i > -1) up.setEnabled(true);
- }
-
- public TableSelectionListener(Button up, Button down, Table table)
- {
- this.up = up;
- this.down = down;
- this.table = table;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
deleted file mode 100644
index 186d0200b..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.uddi;
-
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-public interface PrivateUDDIRegistryType
-{
- public boolean isPrivateUDDIRegistryInstalled();
- public String[] getPrivateUDDIRegistryInquiryAPI();
- public String[] getPrivateUDDIRegistryPublishAPI();
- public CommandWidgetBinding getBinding();
-}
diff --git a/bundles/org.eclipse.jst.ws/.classpath b/bundles/org.eclipse.jst.ws/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/bundles/org.eclipse.jst.ws/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws/.cvsignore b/bundles/org.eclipse.jst.ws/.cvsignore
deleted file mode 100644
index 5e01b0ff7..000000000
--- a/bundles/org.eclipse.jst.ws/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-ws.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws/.project b/bundles/org.eclipse.jst.ws/.project
deleted file mode 100644
index 641451761..000000000
--- a/bundles/org.eclipse.jst.ws/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ac5284f3f..000000000
--- a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:35:26 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 2bcc8c952..000000000
--- a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:41:42 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
deleted file mode 100644
index 7bb0dfe03..000000000
--- a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws
-Bundle-Version: 1.0.304.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.plugin.WebServicePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal;x-internal:=true,
- org.eclipse.jst.ws.internal.command;x-internal:=true,
- org.eclipse.jst.ws.internal.common;x-internal:=true,
- org.eclipse.jst.ws.internal.conformance;x-internal:=true,
- org.eclipse.jst.ws.internal.conformance.rules;x-internal:=true,
- org.eclipse.jst.ws.internal.context;x-internal:=true,
- org.eclipse.jst.ws.internal.data;x-internal:=true,
- org.eclipse.jst.ws.internal.dialog;x-internal:=true,
- org.eclipse.jst.ws.internal.ext;x-internal:=true,
- org.eclipse.jst.ws.internal.ext.test;x-internal:=true,
- org.eclipse.jst.ws.internal.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.wsrt
-Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.jst.ws/about.html b/bundles/org.eclipse.jst.ws/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.jst.ws/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws/build.properties b/bundles/org.eclipse.jst.ws/build.properties
deleted file mode 100644
index 2d5936b6f..000000000
--- a/bundles/org.eclipse.jst.ws/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-###############################################################################
-src.includes = component.xml
-bin.includes = .,\
- META-INF/,\
- about.html,\
- plugin.properties
-source.. = src/
diff --git a/bundles/org.eclipse.jst.ws/component.xml b/bundles/org.eclipse.jst.ws/component.xml
deleted file mode 100644
index a90bf17d8..000000000
--- a/bundles/org.eclipse.jst.ws/component.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.ws">
- <component-depends unrestricted="true">
- </component-depends>
- <plugin id="org.eclipse.jst.ws" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.axis.consumption.core" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.axis.consumption.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.axis.creation.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.consumption" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.consumption.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.creation.ejb.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.creation.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.uddiregistry" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.ui" fragment="false"/>
-</component>
diff --git a/bundles/org.eclipse.jst.ws/plugin.properties b/bundles/org.eclipse.jst.ws/plugin.properties
deleted file mode 100644
index 505a8be08..000000000
--- a/bundles/org.eclipse.jst.ws/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPlugin.properties b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPlugin.properties
deleted file mode 100644
index 4aaa75e26..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPlugin.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 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
-###############################################################################
-
-MSG_ERROR_SERVER=IWAB0213E Error in starting server.
-
-ANY_FILTER_NAME=All files
-ANY_FILTER_DESC=This is a kind of Filter that accepts all objects.
-
-ERROR_SELECTION_TRANSFORM=Specified selection does not match a resource.
-
-MSG_JAXRPC11_NOT_COMPLIANT=The service class "{0}" does not comply to one or more requirements of the JAX-RPC 1.1 specification, and may not deploy or function correctly.
-MSG_JAXRPC11_UNRESOLVED_CLASS=The class "{0}" cannot be loaded via project "{1}". Check that the project contains the class, or that the class is loadable according to the Java Build Path of the project.
-MSG_JAXRPC11_UNRESOLVED_TYPE=A data type, "{0}", could not be resolved while analyzing the service class. Check your project classpath.
-MSG_JAXRPC11_RULE_0001=The service class "{0}" does not have a public default constructor. Chapter 10.1 of the JAX-RPC 1.1 specification requires a service class to have a public default constructor, otherwise a JAX-RPC 1.1 compliant Web service engine may be unable to construct an instance of the service class to handle an incoming request message.
-MSG_JAXRPC11_RULE_0002=The value type "{0}" used via the service class "{1}" does not have a public default constructor. Chapter 5.4 of the JAX-RPC 1.1 specification requires a value type to have a public default constructor, otherwise a JAX-RPC 1.1 compliant Web service engine may be unable to construct an instance of the value type during deserialization.
-MSG_JAXRPC11_RULE_0003=The method "{0}" on the service class "{1}" is overloaded. Overloaded methods are allowed by chapter 5.5.5 of the JAX-RPC 1.1 specification, however, some JAX-RPC 1.1 compliant tools may not allow overloaded methods or may generate WSDL with overloaded operations as contrary to rule R2304 of the WS-I Basic Profile.
-MSG_JAXRPC11_RULE_0004=The service specific exception class "{0}" does not have a public constructor with parameters corresponding in number and type to the getter methods on the class. Chapter 5.5.5 of the JAX-RPC 1.1 specification requires a service specific exception to have a public constructor with the same number of parameters as there are getter methods, and of matching data types, otherwise a JAX-RPC 1.1 compliant Web service engine may be unable to construct an instance of the exception during deserialization of a fault message.
-MSG_JAXRPC11_RULE_0005=The method "{0}" on the service class "{1}" uses a data type, "{2}", that is not supported by the JAX-RPC specification. Instances of the type may not serialize or deserialize correctly. Loss of data or complete failure of the Web service may result.
-MSG_JAXRPC11_RULE_0006=The field or property "{0}" on the value type "{1}" used via the service class "{2}" has a data type, "{3}", that is not supported by the JAX-RPC 1.1 specification. Instances of the type may not serialize or deserialize correctly. Loss of data or complete failure of the Web service may result.
-MSG_JAXRPC11_RULE_0007=The primitive type "{0}" is not supported by the JAX-RPC 1.1 specification. As stated in chapter 5.1.1 of the specification, the supported primitive types are "boolean", "byte", "short", "int", "long", "float" and "double".
-MSG_JAXRPC11_RULE_0008=The wrapper type "{0}" is not supported by the JAX-RPC 1.1 specification. As stated in chapter 5.1.1 of the specification, the supported wrapper types are those corresponding to "boolean", "byte", "short", "int", "long", "float" and "double".
-MSG_JAXRPC11_RULE_0009=The Java type "{0}" is not supported by the JAX-RPC 1.1 specification. As stated in chapter 5.1.3 of the specification, the supported standard types are "java.lang.String", "java.util.Date", "java.util.Calendar", "java.math.BigInteger", "java.math.BigDecimal", "javax.xml.namespace.QName" and "java.net.URI".
-MSG_JAXRPC11_RULE_0010=Support for collection and map classes such as "{0}" is not required by JAX-RPC 1.1. Due to their non-type safe nature, a JAX-RPC 1.1 compliant Web service engine may not handle collections, or may represent them in WSDL documents and SOAP messages in a manner that impairs interoperability. The use of arrays instead of collections is strongly recommended.
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java
deleted file mode 100644
index b29579325..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060420 132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20060607 145604 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WSPluginMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.WSPlugin";//$NON-NLS-1$
-
- private WSPluginMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_SERVER;
- public static String ANY_FILTER_NAME;
- public static String ANY_FILTER_DESC;
- public static String ERROR_SELECTION_TRANSFORM;
- public static String MSG_JAXRPC11_NOT_COMPLIANT;
- public static String MSG_JAXRPC11_UNRESOLVED_CLASS;
- public static String MSG_JAXRPC11_UNRESOLVED_TYPE;
- public static String MSG_JAXRPC11_RULE_0001;
- public static String MSG_JAXRPC11_RULE_0002;
- public static String MSG_JAXRPC11_RULE_0003;
- public static String MSG_JAXRPC11_RULE_0004;
- public static String MSG_JAXRPC11_RULE_0005;
- public static String MSG_JAXRPC11_RULE_0006;
- public static String MSG_JAXRPC11_RULE_0007;
- public static String MSG_JAXRPC11_RULE_0008;
- public static String MSG_JAXRPC11_RULE_0009;
- public static String MSG_JAXRPC11_RULE_0010;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WSPluginMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
deleted file mode 100644
index 45ab7d815..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.command;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A NullStatusRenderer throws away IStatus information.
-*/
-public class NullStatusMonitor implements StatusMonitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- protected boolean result;
-
- /**
- * Default constructor.
- */
- public NullStatusMonitor () {}
- /**
- * Does nothing.
- */
- public int reportStatus(IStatus status, Vector options) { return 0; }
- public boolean reportStatus(IStatus status)
- {
- switch (status.getSeverity())
- {
- case IStatus.ERROR:
- case IStatus.WARNING:
- result = false;
- break;
- case IStatus.INFO:
- default: //IStatus.OK
- result = true;
- break;
- }
- return result;
- }
- public void dumpSavedStatus() { }
- public boolean canContinue()
- {
- return result;
- }
-
- public void reset () {
- result = true;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
deleted file mode 100644
index c4ac80219..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.command;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusMonitor reports IStatus information to a display system.
-*/
-public interface StatusMonitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * reports the contents of the given status object.
- * Subclasses must implement this method to report
- * IStatus information to a given display system,
- * such as SWT, the command line, or a trace file.
- */
- public int reportStatus(IStatus status, Vector options);
- public boolean reportStatus(IStatus status);
- public void dumpSavedStatus();
- public boolean canContinue();
- public void reset();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
deleted file mode 100644
index 0cff3a6b8..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.command;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusRenderer renders IStatus information to a display system.
-*/
-public interface StatusRenderer
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Renders the contents of the given status object.
- * Subclasses must implement this method to render
- * IStatus information to a given display system,
- * such as SWT, the command line, or a trace file.
- */
- public void render ( IStatus status );
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
deleted file mode 100644
index 95a8f169d..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-
-/**
-* This is a kind of {@link Filter} that accepts all objects,
-* and is a suitable base class for new <code>Filters</code>.
-*/
-public class AnyFilter implements Filter
-{
-
- /**
- * Constructs a new <code>AnyFilter</code>.
- */
- public AnyFilter ()
- {
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return WSPluginMessages.ANY_FILTER_NAME;
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WSPluginMessages.ANY_FILTER_DESC;
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * See {@link Filter#statusOf} for general comments.
- * The default implementation of <code>AnyFilter</code>
- * returns a status with severity <code>IStatus.OK</code>.
- * Subclasses may override.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}.
- */
- public IStatus statusOf ( Object object )
- {
- return new Status(IStatus.OK,WebServicePlugin.ID,0,"",null);
- }
-
- /**
- * Returns true if and only if {@link #statusOf} returns
- * an {@link org.eclipse.core.runtime.IStatus} with a
- * severity of less than <code>IStatus.ERROR</code>.
- * Subclasses may override to provide a higher-performance
- * implementation.
- * @param object The object to filter.
- * @return True if and only if {@link #statusOf} returns
- * an {@link org.eclipse.core.runtime.IStatus} with a
- * severity of less than <code>IStatus.ERROR</code>.
- */
- public boolean accepts ( Object object )
- {
- return !statusOf(object).matches(IStatus.ERROR);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
deleted file mode 100644
index 86876fad5..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public interface Filter
-{
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ();
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ();
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * The severity of the
- * returned <code>IStatus</code> is as follows:
- * <ul>
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#OK}
- * if the <code>Filter</code> accepts the <code>object</code>
- * with no further information for the caller (meaning the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods
- * are ignored).
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#INFO}
- * if the <code>Filter</code> accepts the <code>object</code>
- * Additional information may be available from the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods.
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#WARNING}
- * if the <code>Filter</code> accepts the <code>object</code>.
- * Additional information may be available from the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods.
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#ERROR}
- * if the <code>Filter</code> does not accept the <code>object</code>.
- * Additional information may be available from the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods.
- * </ul>
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- */
- public IStatus statusOf ( Object object );
-
- /**
- * Returns true if and only if this <code>Filter</code>
- * accepts the given <code>object</code>. This method
- * must return true if and only if {@link #statusOf}
- * returns an <code>IStatus</code> with a severity of
- * less than <code>IStatus.ERROR</code>.
- * @param object The object to filter.
- * @return True if and only if this <code>Filter</code>
- * accepts the given <code>object</code>.
- */
- public boolean accepts ( Object object );
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
deleted file mode 100644
index 10061e515..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-
-
-/**
- * Transfroms a org.eclipse.core.runtime.IProject to java.lang.String
- */
-public class IProjectToStringTransformer implements Transformer {
-
- public Object transform(Object value)
- {
- IProject project = (IProject)value;
- return project.getName();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
deleted file mode 100644
index e2453e58f..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060222 125574 zina@ca.ibm.com - Zina Mostafia
- * 20060222 225574 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/*
- * Created on May 8, 2004
- */
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-
-/**
- * @author gilberta
- */
-public class J2EEActionAdapterFactory {
-
-
- public static String getWSDLURI(ServiceImpl serviceImpl)
- {
- Definition definition = serviceImpl.getEnclosingDefinition();
- String location = definition.getLocation();
-
- return location;
- }
-
- //has to be under the webcontent
- public static final String EJB_MODULE = "ejbModule";
- public static final String APPCLIENT_MODULE = "appClientModule";
- public static final String WEB_MODULE = "WebContent";
-
- public static String getWSDLURI(ServiceRef serviceImpl)
- {
- String moduleRoot = null;
- IProject project = ProjectUtilities.getProject(serviceImpl);
- if(J2EEUtils.isWebComponent(project))
- {
- moduleRoot = WEB_MODULE;
- }
- else if (J2EEUtils.isEJBComponent(project))
- {
- moduleRoot = EJB_MODULE;
- }
- else if (J2EEUtils.isAppClientComponent(project))
- {
- moduleRoot = APPCLIENT_MODULE;
- }
- IPath path = project.getLocation().addTrailingSeparator();
- path = path.append(moduleRoot).addTrailingSeparator();
- path = path.append(serviceImpl.getWsdlFile());
- File file = new File(path.toString());
- try{
- URL url = file.toURL();
- return url.toString();
- }catch(MalformedURLException e){return null;}
-
-
-
-
- }
-
- public static String getWSDLURI(WSDLResourceImpl wsdlRI)
- {
- Definition definition = wsdlRI.getDefinition();
- String location = definition.getLocation();
-
- return location;
- }
-
- public static String getWSILPath(WSDLResourceImpl wsdlRI)
- {
- return convertToRelative(getWSDLURI(wsdlRI));
- }
-
- public static String getWSILPath(ServiceRef serviceImpl)
- {
- return convertToRelative(getWSDLURI(serviceImpl));
- }
-
- public static String getWSILPath(ServiceImpl serviceImpl)
- {
- return convertToRelative(getWSDLURI(serviceImpl));
- }
-
- public static String FILE="file:/";
- public static String FILEL="file:";
- public static String convertToRelative(String uri)
- {
- //remove file:
- String root = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- root = FILE + root;
- String rootL = FILEL + root;
- if(uri.startsWith(root) || uri.startsWith(rootL)){
- return uri.substring(root.length());
- }
- return uri;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
deleted file mode 100644
index 76317c086..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
+++ /dev/null
@@ -1,1539 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124143 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060329 128069 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060524 131132 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070723 194434 kathy@ca.ibm.com - Kathy Chan, Check for non-existing EAR with content not deleted
- * 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071221 213726 kathy@ca.ibm.com - Kathy Chan
- * 20070123 216345 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080212 208795 ericdp@ca.ibm.com - Eric Peters, WS wizard framework should support EJB 3.0
- * 20080229 218696 ericdp@ca.ibm.com - Eric D. Peters, APIs using EJBArtifactEdit not able to deal with some EJB 3.0 beans properly
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-/**
- * This class contains some useful J2EE utilities for Web services internal use.
- */
-public final class J2EEUtils {
-
- public final static int WEB = 1;
- public final static int EJB = 2;
- public final static int APPCLIENT = 4;
- public final static int EAR = 8;
-
- /**
- * Returns an IVirtualComponent
- * @param project
- * @return
- */
- public static IVirtualComponent getVirtualComponent(IProject project){
- return ComponentCore.createComponent(project);
- }
-
- /**
- *
- * @param projectName
- * @return
- */
- public static IVirtualComponent getVirtualComponent(String projectName){
- IProject project = null;
- if (projectName!=null && projectName.length() > 0 )
- project = ProjectUtilities.getProject(projectName);
-
- return ComponentCore.createComponent(project);
- }
-
-
- /**
- * Returns the J2EE version
- * @param p project
- * @return int
- */
- public static int getJ2EEVersion(IProject p){
-
- String ver = J2EEProjectUtilities.getJ2EEProjectVersion(p);
- return J2EEVersionUtil.convertVersionStringToInt(ver);
-
- /*
- int j2eeVer = -1;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(p);
- if (vc!=null){
- j2eeVer = getJ2EEVersion(vc);
- }
- }
- catch (Exception e){
- //handle exception
- }
- return j2eeVer;
- */
- }
-
- public static int getJ2EEVersion(IVirtualComponent ch){
- int j2eeVer = -1;
- //check type
- if (ch!=null){
- IProject project = ch.getProject();
- j2eeVer = getJ2EEVersion(project);
- }
-
- /* Use new API provided by J2EE
- if (ch!=null) {
- if (isWebComponent(ch))
- j2eeVer = getWebComponentJ2EEVersion(ch);
- else if (isAppClientComponent(ch))
- j2eeVer = getAppClientComponentJ2EEVersion(ch);
- else if (isEJBComponent(ch))
- j2eeVer = getEJBComponentJ2EEVersion(ch);
- else if (isEARComponent(ch))
- j2eeVer = getEARComponentJ2EEVersion(ch);
- }
- */
-
- return j2eeVer;
- }
-
-
- /**
- * Returns the J2EEVersion
- * @param p IProject
- * @return String
- */
- public static String getJ2EEVersionAsString(IProject p){
-
- String ver = J2EEProjectUtilities.getJ2EEProjectVersion(p);
- return ver != null ? ver : null;
-
- /*
- int j2eeVer = getJ2EEVersion(p);
- if (j2eeVer!=-1){
- return J2EEVersionUtil.getJ2EETextVersion(j2eeVer);
- }
- else
- return null;
-
- */
- }
-
- public static IVirtualComponent[] getAllComponents(){
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- IVirtualComponent vc = ComponentCore.createComponent(projects[i]);
- if(vc != null)
- v.add(vc);
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns all the EAR components in the workspace
- * @return IVirtualComponent[]; empty if none
- */
- public static IVirtualComponent[] getAllEARComponents() {
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
- IVirtualComponent[] components = getEARComponentsFromProject(projects[i]);
- for (int j=0; j<components.length; j++) {
- if (components[j]!=null)
- v.add(components[j]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static IVirtualComponent[] getAllWebComponents(){
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
- IVirtualComponent[] components = getWebComponents(projects[i]);
- for (int j=0; j<components.length; j++) {
- if (components[j]!=null)
- v.add(components[j]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static IVirtualComponent[] getAllEJBComponents(){
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
- IVirtualComponent[] components = getEJBComponents(projects[i]);
- for (int j=0; j<components.length; j++) {
- if (components[j]!=null)
- v.add(components[j]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns the EAR components in a given IProject
- * @param project
- * @return empty if no EAR components; must not return null
- */
- public static IVirtualComponent[] getEARComponentsFromProject(IProject project){
- //get all components in the project
- List v = new ArrayList();
- try {
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null && isEARComponent(component)){
- v.add(component);
- }
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns Web components in a project
- * @param project
- * @return empty array if no web components; must not return null
- */
- public static IVirtualComponent[] getWebComponents(IProject project){
-
- //get all components in the project
- List v = new ArrayList();
- try {
- IVirtualComponent component = ComponentCore.createComponent(project);
-
- if (component != null && isWebComponent(component)){
- v.add(component);
- }
-
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static String[] getWebComponentNames(IProject project){
- IVirtualComponent[] vcs = getWebComponents(project);
- return toComponentNamesArray(vcs);
- }
-
- public static String[] getEARComponentNames(IProject project){
- IVirtualComponent[] vcs = getEARComponentsFromProject(project);
- return toComponentNamesArray(vcs);
- }
-
- /**
- * Returns all components of type, componentType in the project.
- * @param project
- * @param componentType i.e. J2EEUtils.WEB
- * @return
- */
- public static IVirtualComponent[] getComponentsByType(IProject project, int componentType){
-
- List v = new ArrayList();
- if ( (WEB & componentType)==WEB ){
- IVirtualComponent[] webVC = getWebComponents(project);
- addToArrayListHelper(webVC, v);
- }
- if ( (EJB & componentType)==EJB ){
- IVirtualComponent[] ejbVC = getEJBComponents(project);
- addToArrayListHelper(ejbVC, v);
- }
- if ( (APPCLIENT & componentType)==APPCLIENT ) {
- IVirtualComponent[] appClientVC = getAppClientComponents(project);
- addToArrayListHelper(appClientVC, v);
- }
- if ( (EAR & componentType)==EAR ) {
- IVirtualComponent[] earVC = getEARComponentsFromProject(project);
- addToArrayListHelper(earVC, v);
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns all components of type, componentType in the project.
- * @param project
- * @param componentTypeId as defined in IModuleConstants.
- * @return
- */
- public static IVirtualComponent[] getComponentsByType(IProject project, String componentTypeId){
-
- //get all components in the project of type componentTypeId
- List v = new ArrayList();
- try {
-
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if ( vc != null && J2EEProjectUtilities.isProjectOfType(project,componentTypeId))
- {
- v.add(vc);
- }
- //if (isWebComponent(project, components[i].getName())){
- //v.add(components[i]);
- //}
-
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static String[] getProjectsContainingComponentOfType(String componentTypeId)
- {
- Vector v = new Vector();
- IVirtualComponent[] comps = getAllComponents();
- for (int i = 0; i < comps.length; i++) {
- if (J2EEProjectUtilities.isProjectOfType(comps[i].getProject(),componentTypeId))
- {
- //Add the project name to the vector if it has not been added already
- String name = comps[i].getProject().getName();
- if (!v.contains(name))
- {
- v.add(name);
- }
- }
-
- }
-
- return (String[])v.toArray(new String[0]);
- }
-
- /**
- * Helper method for getComponentsByType
- * @param vcs
- * @param vect
- */
- private static void addToArrayListHelper(IVirtualComponent[] vcs, List al){
- for (int i=0;i<vcs.length;i++){
- al.add(vcs[i]);
- }
- }
-
-
- /**
- * Essentially, returns all projects in the workspace
- * @return
- */
- public static IProject[] getAllFlexibleProjects(){
-
- List v = new ArrayList();
- try {
- IProject[] projects = ProjectUtilities.getAllProjects();
- for(int i=0; i<projects.length;i++) {
- if (ModuleCoreNature.getModuleCoreNature(projects[i])!=null){
- v.add(projects[i]);
- }
- }
- }
- catch(Exception e){
- }
-
- return (IProject[])v.toArray(new IProject[0]);
- }
-
-
- /**
- * True if there exists a underlying resource backing up the component and project
- * @param projectName
- * @param componentName
- * @return
- */
- public static boolean exists(String projectName, String componentName){
- IProject project = null;
- if (projectName!=null && projectName.length() > 0 ) {
- project = ProjectUtilities.getProject(projectName);
- }
- else
- return false;
-
- return exists(project);
- }
-
- /**
- * True if there exists a underlying resource backing up the component and project
- * @param project
- * @return
- */
- public static boolean exists(IProject project){
- if (project!=null) {
- if (!project.exists())
- return false;
-
- IVirtualComponent vc = ComponentCore.createComponent(project);
- return vc.exists();
- }
- else
- return false;
-
- }
-
- /**
- * Returns an array of EAR components which are referenced by the component
- * @param project
- * @return
- */
- public static IVirtualComponent[] getReferencingEARComponents(IProject project){
- List ears = new ArrayList();
- try{
- IVirtualComponent targetVC = ComponentCore.createComponent(project);
-
- IVirtualComponent[] earVC = getAllEARComponents();
- for (int i=0; i<earVC.length;i++) {
- IVirtualReference[] refs = earVC[i].getReferences();
- for (int k=0;k<refs.length;k++) {
- if (targetVC.equals(refs[k].getReferencedComponent())){
- ears.add(refs[k].getEnclosingComponent());
- }
- }
- }
-
- }
- catch (Exception e){
- }
-
- return (IVirtualComponent[])ears.toArray(new IVirtualComponent[0]);
- }
-
-
- /**
- * Returns the EJB Components referenced by the ear
- * @param project
- * @return
- */
- public static IVirtualComponent[] getReferencingEJBComponentsFromEAR(IProject project){
-
- List ejbComps = new ArrayList();
- try{
- IVirtualComponent vc = ComponentCore.createComponent(project);
- IVirtualReference[] refs = vc.getReferences();
- for (int i=0;i<refs.length;i++){
- if (isEJBComponent(refs[i].getReferencedComponent())){
- ejbComps.add(refs[i].getReferencedComponent());
- }
- }
- }
- catch(Exception e){
- }
-
- return (IVirtualComponent[])ejbComps.toArray(new IVirtualComponent[0]);
- }
-
-
- /**
- *
- * @param jar
- * @return Vector of bean String names.
- * @deprecated use getBeanNames(IProject project)
- */
- public static Vector getBeanNames(EJBJar jar) {
- // We currently only support Stateless session beans.
- // List cmpBeans = jar.getBeanManagedBeans();
- // List bmpBeans = jar.getContainerManagedBeans();
- List sessionBeans = jar.getSessionBeans();
-
- Vector names = new Vector();
-
- // getBeanNames( names, cmpBeans );
- // getBeanNames( names, bmpBeans );
- getBeanNames(names, sessionBeans);
-
- return names;
- }
-
-
- /**
- *
- * @param project- the project to find stateless session beans in
- * @return Vector of bean String names.
- */
- public static Vector getBeanNames(IProject project) {
- // We currently only support Stateless session beans.
- Vector names = new Vector();
- IModelProvider provider = ModelProviderManager.getModelProvider(project);
- Object modelObject = provider.getModelObject();
-
- List sessionBeans = new Vector();
- boolean isJ2EE5 = J2EEProjectUtilities.isJEEProject(project);
- if (isJ2EE5) {
- //a JEE5 project
- EnterpriseBeans eBeans = ((org.eclipse.jst.javaee.ejb.EJBJar)modelObject).getEnterpriseBeans();
- if (eBeans !=null)
- sessionBeans = eBeans.getSessionBeans();
- } else {
- sessionBeans = ((EJBJar)modelObject).getSessionBeans();
- }
-
- Iterator iterator = sessionBeans.iterator();
-
- while (iterator.hasNext()) {
- Object next = (iterator.next());
- if (next instanceof EnterpriseBean) {
- EnterpriseBean bean = (EnterpriseBean) next;
-
- if (bean.isSession()) {
- Session sessionBean = (Session) bean;
-
- if (sessionBean.getSessionType().getValue() == SessionType.STATELESS) {
- names.add(bean.getName());
- }
- }
- } else {
- SessionBean bean = (SessionBean) next;
- if (bean.getSessionType().getValue() == SessionType.STATELESS) {
- names.add(bean.getEjbName());
- }
- }
- }
- return names;
- }
-
- /**
- * @param names
- * specifies that vector of strings that will be used to add bean
- * names to.
- * @param beans
- * specifies a list of beans.
- */
- private static void getBeanNames(Vector names, List beans) {
- Iterator iterator = beans.iterator();
-
- while (iterator.hasNext()) {
- EnterpriseBean bean = (EnterpriseBean) (iterator.next());
-
- if (bean.isSession()) {
- Session sessionBean = (Session) bean;
-
- if (sessionBean.getSessionType().getValue() == SessionType.STATELESS) {
- names.add(bean.getName());
- }
- }
- }
- }
- /**
- * Uses jem ProjectUtilities to get the project
- * @param ejb eObject
- * @return IProject
- */
- public static IProject getProjectFromEJB(EnterpriseBean ejb) {
- return ProjectUtilities.getProject(ejb);
- }
-
- /**
- * Returns a default J2EE 1.3 EAR component in the workspace
- * @return EAR component name
- */
- public static IVirtualComponent getDefault13EARComponent(){
- IVirtualComponent[] allEARComponents = getAllEARComponents();
- for (int j=0;j<allEARComponents.length;j++){
- int j2eeVersion = getJ2EEVersion(allEARComponents[j]);
- if (j2eeVersion == J2EEVersionConstants.J2EE_1_3_ID)
- return allEARComponents[j];
- }
- return null;
- }
-
- /**
- * Returns a default J2EE 1.4 EAR component in the workspace
- * @return EAR component name
- */
- public static IVirtualComponent getDefault14EARComponent(){
- IVirtualComponent[] allEARComponents = getAllEARComponents();
- for (int j=0;j<allEARComponents.length;j++){
- int j2eeVersion = getJ2EEVersion(allEARComponents[j]);
- if (j2eeVersion == J2EEVersionConstants.J2EE_1_4_ID)
- return allEARComponents[j];
- }
- return null;
- }
-
- /**
- * Returns the first EAR component of the J2EE version
- * @param versionId
- * @return
- */
- public static IVirtualComponent getEARComponentofJ2EEVersion(int versionId){
- IVirtualComponent[] components = getAllEARComponents();
- for (int i=0; i<components.length; i++){
- if (getJ2EEVersion(components[i]) == versionId)
- return components[i];
- }
- return null;
- }
-
-
- /**
- *
- * @param j2eeVersionInt
- * @return
- */
- public static String getLabelFromJ2EEVersion(String j2eeVersionInt) {
- if (j2eeVersionInt == null || j2eeVersionInt.length() == 0)
- return "";
-
- int j2eeVersion = Integer.parseInt(j2eeVersionInt);
- switch (j2eeVersion) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- return J2EEVersionConstants.VERSION_1_2_TEXT;
- case J2EEVersionConstants.J2EE_1_3_ID :
- return J2EEVersionConstants.VERSION_1_3_TEXT;
- case J2EEVersionConstants.J2EE_1_4_ID :
- return J2EEVersionConstants.VERSION_1_4_TEXT;
- default :
- return "";
- }
- }
-
- public static String getJ2EEVersionFromLabel(String j2eeLabel) {
- String j2ee12String = String.valueOf(J2EEVersionConstants.J2EE_1_2_ID);
- String j2ee13String = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
- String j2ee14String = String.valueOf(J2EEVersionConstants.J2EE_1_4_ID);
- if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
- return j2ee12String;
-
- if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
- return j2ee13String;
-
- if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
- return j2ee14String;
-
- return "";
-
- }
-
- /**
- * Returns String representations of J2EE versions
- * @param aVersion
- * @return
- */
- public static String getJ2EEIntVersionAsString(String aVersion) {
- if (aVersion.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
- return new Integer(J2EEVersionConstants.J2EE_1_4_ID).toString();
- if (aVersion.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
- return new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString();
- if (aVersion.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
- return new Integer(J2EEVersionConstants.J2EE_1_2_ID).toString();
- // default
- return new Integer(J2EEVersionConstants.J2EE_1_4_ID).toString();
- }
-
- // ----------------------------------------------------------------------
-
-
-
- /**
- *
- * @return
- *
- * @deprecated // use getALLEARComponents
- */
- public static IProject[] getEARProjects() {
- Vector v = new Vector();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
-// if (projects[i].hasNature(IEARNatureConstants.NATURE_ID)) {
- if (ResourceUtils.isEARProject(projects[i])) {
- v.add(projects[i]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
-
- return (IProject[])v.toArray(new IProject[0]);
- }
-
-
- /**
- * Returns the first EAR project associated with the project and server
- * @param serviceProject
- * @param server
- * @return
- *
- * @deprecated // to be simplified
- */
- public static IProject getDefaultEARProject(IProject serviceProject, IServer server) {
-
- IProject[] earProjects = null;
- IProject ear = null;
-
- if (serviceProject != null && serviceProject.exists()) {
- try {
-
- boolean isWebEJBOrAppClient = ResourceUtils.isWebProject(serviceProject) //serviceProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)
- || ResourceUtils.isEJBProject(serviceProject) //serviceProject.hasNature(IEJBNatureConstants.NATURE_ID)
- || ResourceUtils.isAppClientProject(serviceProject);//serviceProject.hasNature(IApplicationClientNatureConstants.NATURE_ID);
- if (!isWebEJBOrAppClient) {
- return null;
- }
-
- IProject[] ears = getEARProjects();
-
- // separate EARs which are already deployed to the existing
- // server
- if (ears != null && ears.length >= 1) {
- ArrayList preferredEARList = new ArrayList();
- ArrayList secondaryEARList = new ArrayList();
- for (int i = 0; i < ears.length; i++) {
- ear = ears[i];
- IModule module = ResourceUtils.getModule(ear);
- if (module != null) {
- if (server != null
- || ServerUtil.containsModule(server,
- module, new NullProgressMonitor())) {
- preferredEARList.add(ear);
- } else {
- secondaryEARList.add(ear);
- }
- }
- }
- // add secondaryEARList items to end of primary list
- for (int j = 0; j < secondaryEARList.size(); j++) {
- preferredEARList.add(secondaryEARList.get(j));
- }
- // toArray
- if (preferredEARList != null) {
- earProjects = (IProject[]) preferredEARList.toArray(new IProject[0]);
- }
- }
- } catch (Exception ce) {
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.ERROR, 5039, J2EEUtils.class, "getEARProjects", ce);
-
- }
- }
- return earProjects[0];
- }
-
- /**
- * Gets the EJB Components in the project
- * @param project
- * @return
- */
- public static IVirtualComponent[] getEJBComponents(IProject project){
-
- //get all components in the project
- List v = new ArrayList();
- IVirtualComponent component = ComponentCore.createComponent(project);
- try {
- if (component != null && isEJBComponent(component)){
- v.add(component);
- }
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Gets the Application Client components in a project.
- * @param project
- * @return
- */
- public static IVirtualComponent[] getAppClientComponents(IProject project){
-
- //get all components in the project
- List v = new ArrayList();
- try {
- IVirtualComponent component = ComponentCore.createComponent(project);
-
- if (component != null && isAppClientComponent(component)){
- v.add(component);
- }
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- *
- * @param project
- * @return
- */
- public static IVirtualComponent[] getReferencingEJB20ComponentsFromEAR(IProject project){
-
- List ejbComps = new ArrayList();
- try{
- IVirtualComponent vc = ComponentCore.createComponent(project);
- IVirtualReference[] refs = vc.getReferences();
- for (int i=0; i<refs.length;i++) {
- if (isEJB20Component(refs[i].getReferencedComponent()))
- ejbComps.add(refs[i].getReferencedComponent());
- }
- }
- catch (Exception e){
- }
-
- return (IVirtualComponent[])ejbComps.toArray(new IVirtualComponent[0]);
- }
-
-
- /**
- * Utility method to combine two IProject[]
- * @param projectArray1
- * @param projectArray2
- * @return
- */
- public static IProject[] combineProjectArrays(IProject[] projectArray1,
- IProject[] projectArray2) {
-
- // check if either or both arrays are null.
- if (projectArray1 == null && projectArray2 == null)
- return null;
- else if (projectArray1 != null && projectArray2 == null)
- return projectArray1;
- else if (projectArray1 == null && projectArray2 != null)
- return projectArray2;
-
- IProject[] combinedProjects = new IProject[projectArray1.length
- + projectArray2.length];
-
- System.arraycopy(projectArray1, 0, combinedProjects, 0,
- projectArray1.length);
- if (projectArray2.length > 0) {
- System.arraycopy(projectArray2, 0, combinedProjects,
- projectArray1.length, projectArray2.length);
- }
-
- return combinedProjects;
- }
-
- /**
- *
- * @param project
- * @return
- */
- public static IVirtualComponent[] getReferencingWebComponentsFromEAR(IProject project){
- List webComps = new ArrayList();
- try{
- IVirtualComponent vc = ComponentCore.createComponent(project);
- IVirtualReference[] refs = vc.getReferences();
- for (int i=0; i<refs.length;i++) {
- if (isWebComponent(refs[i].getReferencedComponent()))
- webComps.add(refs[i].getReferencedComponent());
- }
- }
- catch(Exception e){
- }
-
- return (IVirtualComponent[])webComps.toArray(new IVirtualComponent[0]);
- }
-
-
-
- /**
- *
- * @param ejbComponent
- * @return
- */
- public static boolean isEJB20Component(IVirtualComponent ejbComponent){
- return isEJB20Component(ejbComponent.getProject());
- }
-
- /**
- *
- * @param project
- * @return
- */
- public static boolean isEJB20Component(IProject project){
- boolean isEJB = false;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (EJBArtifactEdit.isValidEJBModule(vc)) {
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(vc);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- if (ejbRes.getModuleVersionID()== J2EEVersionConstants.EJB_2_0_ID) {
- return true;
- }
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
-
- return isEJB;
- }
-
-
- /**
- * Checks if the component at compName is referenced by the ear at earCompName
- * @param earProject
- * @param project
- * @return
- */
- public static boolean isComponentAssociated(IProject earProject, IProject project) {
- IVirtualComponent vc1 = ComponentCore.createComponent(earProject);
- IVirtualComponent vc2 = ComponentCore.createComponent(project);
- return isComponentAssociated(vc1, vc2);
- }
-
- /**
- * Checks if the component is referenced by the ear
- * @param ear
- * @param component
- * @return
- */
- private static boolean isComponentAssociated(IVirtualComponent ear, IVirtualComponent component){
- boolean isAssociated = false;
-
- // Note: not implemented by J2EE yet.. to be used later.
- IVirtualReference[] compRefs = ear.getReferences();
- if (compRefs!= null) {
- for (int i=0;i<compRefs.length;i++){
- IVirtualReference vref = compRefs[i];
- if (component.equals(vref.getReferencedComponent()))
- isAssociated = true;
- }
- }
- return isAssociated;
- }
-
- /**
- *
- * @param project
- * @param earProject
- */
- public static void associateComponentToEAR(IProject project, IProject earProject) {
-
- IDataModel addComponentToEARDataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- addComponentToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- List modList = (List) addComponentToEARDataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- IVirtualComponent targetComp = ComponentCore.createComponent(project);
- modList.add(targetComp);
- addComponentToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
-
- try {
- addComponentToEARDataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
-
- }
-
- /*
- * Determines whether project can be associated with earProject.
- * @returns IStatus of OK if the project is a Web project, EJB project, or AppClient
- * project that can be associated with the EAR project.
- * Returns IStatus with an ERROR severity if the project is a Web project,
- * EJB project, or AppClient project that cannot be associated with the EAR project.
- * When an IStatus of severity ERROR is returned, the IStatus' message will contain the
- * lowest J2EE level that this project requires on an EAR.
- * Returns an IStatus with severity OK if project is not recognized as a Web, EJB, or
- * AppClient project or if earProject is not recognized as an EAR project.
- */
- public static IStatus canAssociateProjectToEAR(IProject project, IProject earProject)
- {
- //If project contains the web, ejb, or appclient facet, and earProject contains the
- //ear facet, return whether or not the facet versions are such that the project
- //can be added to the ear.
-
- IStatus status = Status.OK_STATUS;
- boolean isWeb = isWebComponent(project);
- boolean isEJB = isEJBComponent(project);
- boolean isAppClient = isAppClientComponent(project);
- boolean isEAR = isEARComponent(earProject);
- if ((isWeb || isEJB || isAppClient) && isEAR)
- {
- try
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
-
- IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
- IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
- String earVersion = earPfv.getVersionString();
-
- String webVersion = null;
- String ejbVersion = null;
- String acVersion = null;
-
- if (isWeb)
- {
- IProjectFacet webPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE);
- IProjectFacetVersion webPfv = fProject.getInstalledVersion(webPf);
- webVersion = webPfv.getVersionString();
- }
- else if (isEJB)
- {
- IProjectFacet ejbPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EJB_MODULE);
- IProjectFacetVersion ejbPfv = fProject.getInstalledVersion(ejbPf);
- ejbVersion = ejbPfv.getVersionString();
- }
- else if (isAppClient)
- {
- IProjectFacet acPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_APPCLIENT_MODULE);
- IProjectFacetVersion acPfv = fProject.getInstalledVersion(acPf);
- acVersion = acPfv.getVersionString();
- }
-
- if ((isWeb && webVersion.equals(J2EEVersionConstants.VERSION_2_2_TEXT)) ||
- (isEJB && ejbVersion.equals(J2EEVersionConstants.VERSION_1_1_TEXT)) ||
- (isAppClient && acVersion.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
- )
- {
- if (!greaterThanOrEqualTo(earVersion, J2EEVersionConstants.VERSION_1_2_TEXT))
- {
- status = StatusUtils.errorStatus(J2EEVersionConstants.VERSION_1_2_TEXT);
- }
- }
- else if ((isWeb && webVersion.equals(J2EEVersionConstants.VERSION_2_3_TEXT)) ||
- (isEJB && ejbVersion.equals(J2EEVersionConstants.VERSION_2_0_TEXT)) ||
- (isAppClient && acVersion.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
- )
- {
- if (!greaterThanOrEqualTo(earVersion, J2EEVersionConstants.VERSION_1_3_TEXT))
- {
- status = StatusUtils.errorStatus(J2EEVersionConstants.VERSION_1_3_TEXT);
- }
- }
- else if ((isWeb && webVersion.equals(J2EEVersionConstants.VERSION_2_4_TEXT)) ||
- (isEJB && ejbVersion.equals(J2EEVersionConstants.VERSION_2_1_TEXT)) ||
- (isAppClient && acVersion.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
- )
- {
- if (!greaterThanOrEqualTo(earVersion, J2EEVersionConstants.VERSION_1_4_TEXT))
- {
- status = StatusUtils.errorStatus(J2EEVersionConstants.VERSION_1_4_TEXT);
- }
- }
- } catch (CoreException ce)
- {
- //If facet API throws a CoreException when trying to create an IFacetedProject from
- //an IProject, an OK Status will be returned and clients of this utility method
- //won't raise a validation error.
- }
- }
-
- return status;
- }
-
-
- /*
- * @param versionA version number of the form 1.2.3
- * @param versionA version number of the form 1.2.3
- * @return boolean returns whether versionA is greater than or equal to versionB
- */
- private static boolean greaterThanOrEqualTo(String versionA, String versionB)
- {
- if (versionA.equals(versionB))
- {
- return true;
- }
- else
- {
- StringTokenizer stA = new StringTokenizer(versionA, ".");
- StringTokenizer stB = new StringTokenizer(versionB, ".");
-
- int sizeA = stA.countTokens();
- int sizeB = stB.countTokens();
-
- int size;
- if (sizeA < sizeB)
- {
- size = sizeA;
- }
- else
- size = sizeB;
-
- for (int i = 0; i < size; i++)
- {
- int a = Integer.parseInt(stA.nextToken());
- int b = Integer.parseInt(stB.nextToken());
- if (a != b)
- {
- return a > b;
- }
- }
-
- return sizeA > sizeB;
- }
- }
-
- /**
- * @param project
- * @return
- */
- public static IPath getWebInfPath(IProject project){
-
- IVirtualComponent component = ComponentCore.createComponent(project);
-
- //should WEB-INF location be pulled in from the .component file rather than hardcoded here?
- IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF"));
- IPath modulePath = webInfDir.getWorkspaceRelativePath();
-
- if (!webInfDir.exists())
- {
- try
- {
- webInfDir.create(0,null);
- }
- catch (CoreException e)
- {}
- }
- return modulePath;
- }
-
-
- /**
- *
- * @param project
- * @return
- *
- */
- public static IPath getFirstWebContentPath(IProject project){
-
- IPath modulePath = null;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (ModuleCoreNature.isFlexibleProject(project)) {
- modulePath = vc.getRootFolder().getWorkspaceRelativePath();
- }
- }
- catch(Exception ex){}
-
- return modulePath;
- }
-
- /**
- * @param project
- * @return
- */
- public static IPath getWebContentPath(IProject project){
- IVirtualComponent component = ComponentCore.createComponent(project);
- IPath modulePath = component.getRootFolder().getWorkspaceRelativePath();
- return modulePath;
- }
-
- /**
- *
- * @param project
- * @return
- *
- */
- public static IContainer getFirstWebContentContainer(IProject project){
- IContainer container = null;
- IPath modulePath = getFirstWebContentPath(project);
- IResource res = ResourceUtils.findResource(modulePath);
- if (res!=null){
- container = res.getParent();
- }
-
- return container;
- }
-
- /**
- * @param project
- * @return
- */
- public static IContainer getWebContentContainer(IProject project){
- IContainer container = null;
- IPath modulePath = getWebContentPath(project);
- IResource res = ResourceUtils.findResource(modulePath);
- if (res instanceof IContainer){
- container = (IContainer)res;
- }
- return container;
- }
-
-
- /**
- * Returns the first Module name
- * @param project
- * @return
- *
- */
- public static String getFirstWebModuleName(IProject project){
- String moduleName = null;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- moduleName = vc.getName();
- }
- catch(Exception ex){}
-
- return moduleName;
- }
-
-
- public static boolean isWebComponent(IVirtualComponent comp){
- return J2EEProjectUtilities.isDynamicWebProject(comp.getProject());
- }
-
- public static boolean isEARComponent(IVirtualComponent comp){
- return J2EEProjectUtilities.isEARProject(comp.getProject());
- }
-
- /**
- * True if the component is a valid EJB component
- * @param project
- * @return
- */
- public static boolean isEJBComponent(IProject project) {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null)
- {
- return isEJBComponent(vc);
- }
- else
- {
- return false;
- }
- }
-
- public static boolean isEJBComponent(IVirtualComponent comp){
- return J2EEProjectUtilities.isEJBProject(comp.getProject());
- }
-
- public static boolean isAppClientComponent(IVirtualComponent comp){
- return J2EEProjectUtilities.isApplicationClientProject(comp.getProject());
- }
-
- public static boolean isJavaComponent(IVirtualComponent comp){
- return J2EEProjectUtilities.isUtilityProject(comp.getProject());
- }
-
- public static String getComponentTypeId(IProject project) {
- return J2EEProjectUtilities.getJ2EEProjectType(project);
- }
-
- public static String[] toComponentNamesArray(IVirtualComponent[] components){
- String[] ecNames = new String[components.length];
- for(int i=0; i<components.length; i++){
- ecNames[i] = components[i].getName();
- }
- return ecNames;
- }
-
- public static IProject[] toProjectArray(IVirtualComponent[] components){
- IProject[] projects = new IProject[components.length];
- for (int i=0; i<components.length; i++){
- projects[i] = components[i].getProject();
- }
- return projects;
- }
-
- /**
- * Given a J2EE level, this method returns the highest supported servlet level
- * @param j2eeLevel
- * @return web app version
- */
- public static Integer getServletVersionForJ2EEVersion(String j2eeLevel){
- int aVersion = Integer.valueOf(j2eeLevel).intValue();
- switch (aVersion) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- return new Integer(J2EEVersionConstants.WEB_2_2_ID);
-
- case J2EEVersionConstants.J2EE_1_3_ID:
- return new Integer(J2EEVersionConstants.WEB_2_3_ID);
-
- case J2EEVersionConstants.J2EE_1_4_ID:
- return new Integer(J2EEVersionConstants.WEB_2_4_ID);
-
- default:
- return new Integer(J2EEVersionConstants.WEB_2_3_ID);
- }
- }
-
- /**
- * Given a J2EE level, this method returns the highest supported EJB version
- * @param j2eeLevel
- * @return ejb spec version
- */
- public static Integer getEJBVersionForJ2EEVersion(String j2eeLevel){
- int aVersion = Integer.valueOf(j2eeLevel).intValue();
- switch (aVersion) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- return new Integer(J2EEVersionConstants.EJB_1_1_ID);
-
- case J2EEVersionConstants.J2EE_1_3_ID:
- return new Integer(J2EEVersionConstants.EJB_2_0_ID);
-
- case J2EEVersionConstants.J2EE_1_4_ID:
- return new Integer(J2EEVersionConstants.EJB_2_1_ID);
-
- default:
- return new Integer(J2EEVersionConstants.EJB_2_0_ID);
- }
- }
-
- /**
- * True if the component is a valid Java component
- * @param project
- * @return
- */
- public static boolean isJavaComponent(IProject project) {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null)
- {
- return isJavaComponent(vc);
- }
- else
- {
- //check if it's a faceted project with only the Java facet.
- try
- {
- if (project.exists())
- {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
- if (fProject != null)
- {
- Set facets = fProject.getProjectFacets();
- if (facets.size()==1)
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)facets.iterator().next();
- if (pfv.getProjectFacet().getId().equals(IModuleConstants.JST_JAVA))
- {
- return true;
- }
- }
- }
- else
- {
- //This is not a faceted project. Check if this is a simple Java project.
- if (ResourceUtils.isJavaProject(project))
- {
- return true;
- }
- }
- }
- } catch (CoreException ce)
- {
-
- }
- }
-
- return false;
- }
-
- /**
- * True if the component is a valid Web component
- * @param project
- * @return
- */
- public static boolean isWebComponent(IProject project) {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null)
- {
- return isWebComponent(vc);
- }
- else
- {
- return false;
- }
- }
-
- /**
- * True if the component is a true Application client component
- * @param project
- * @return
- */
- public static boolean isAppClientComponent(IProject project) {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null)
- {
- return isAppClientComponent(vc);
- }
- else
- {
- return false;
- }
- }
-
- /**
- * True is the component is a valid EAR component
- * @param project
- * @return
- */
- public static boolean isEARComponent(IProject project){
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null)
- {
- return isEARComponent(vc);
- }
- else
- {
- return false;
- }
- }
-
- public static IFolder getOutputContainerRoot (IVirtualComponent component) {
- return (IFolder)J2EEProjectUtilities.getOutputContainers(component.getProject())[0];
- }
-
- // 194434 - Check for non-existing EAR with contents that's not deleted previously
- public static IStatus canCreateEAR(IProject earProject)
- {
- IStatus status = Status.OK_STATUS;
- if( !earProject.exists() ){
- IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation();
- path = path.append(earProject.getName());
- status = ProjectCreationDataModelProviderNew.validateExisting(earProject.getName(), path.toOSString());
- }
- return status;
- }
-
-
- public static void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
- {
- if (J2EEUtils.isWebComponent(project))
- {
- ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
- manifest.mergeClassPath(new String[]{uri});
- J2EEProjectUtilities.writeManifest(project, manifest);
- forceClasspathUpdate(project);
- }
- }
-
- public static void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
- {
- try {
- IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
- migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName());
- migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
- migrationdm.getDefaultOperation().execute(monitor, null);
-
-
- IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-
- IVirtualComponent targetcomponent = ComponentCore.createComponent(javaProject);
- IVirtualComponent sourcecomponent = ComponentUtilities.getComponent(earProject.getName());
- targetCompList.add(targetcomponent);
-
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT,sourcecomponent );
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, "/WEB-INF/lib");
- refdm.getDefaultOperation().execute(monitor, null);
-
- }catch (Exception e) {
-
- }
- }
-
- //Forcing classpath update
- public static void forceClasspathUpdate (IProject project) {
- J2EEComponentClasspathUpdater classpathUpdater = J2EEComponentClasspathUpdater.getInstance();
- Collection projCollection = Collections.singleton(project);
- classpathUpdater.forceUpdate(projCollection, true);
- IJobManager jm = Job.getJobManager();
- try{
- jm.join(J2EEComponentClasspathUpdater.MODULE_UPDATE_JOB_NAME, null);
- }catch(Exception exc){}
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
deleted file mode 100644
index 5455fdcb6..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-
-/**
-* This class contains some useful utilities for dealing with the JavaMOF
-*/
-
-public final class JavaMOFUtils
-{
- /**
- * Determine whether this class of the given name is loadable in the given
- * project.
- * @param className The fully qualified name of the class
- * @param project The project
- * @return True if the class is loadable and no exceptions are thrown.
- */
- public static boolean isClassLoadable(String className, IProject project) throws CoreException
- {
- return isClassLoadable(getJavaClass(className,project));
- }
-
- public static boolean isClassLoadable(JavaClass javaClass)
- {
- return javaClass.isExistingType();
- }
-
- /**
- * Determine whether the specified class has a public constructor
- * with an empty parameter list.
- * @param className The fully qualified name of the class
- * @param project The project
- * @return True if the class is loadable from the project and the
- * class has a public constructor with an empty parameter list
- */
- public static boolean hasPublicDefaultCtor(String className, IProject project) throws CoreException
- {
- return hasPublicDefaultCtor(getJavaClass(className, project));
- }
-
-
- public static boolean hasPublicDefaultCtor(JavaClass javaClass)
- {
-
- List methodList = javaClass.getMethods();
- if (methodList==null)
- return true;
-
- Iterator iMethods = methodList.iterator();
- boolean userDefinedCtor = false;
- while (iMethods.hasNext())
- {
- Method thisMethod = (Method)iMethods.next();
-
- if (thisMethod.isConstructor())
- {
- userDefinedCtor = true;
-
- //Since the user has defined a ctor, the default ctor is no longer available.
- //We must ensure that the user has provided a public ctor with no parameters.
-
- //check if public
- if (thisMethod.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
- {
- //see if parameter list is empty
- List paramList = thisMethod.getParameters();
- if (paramList.isEmpty() )
- {
- return true;
- }
- }
- }
-
- }
-
- if (userDefinedCtor)
- {
- return false; //if the user defined a ctor and we still haven't
- //returned true, none of them were public with no parameters.
- }
- else
- {
- return true;
- }
-
- }
- /**
- * Determine whether the specified class implements the specified interface.
- * @param className The fully qualified name of the class
- * @param interfaceName The fully qualified name of the interface
- * @param project The project
- * @return True if the class and interface are loadable from the project and
- * the class implements the interface.
- */
- public static boolean implementsInterface(String className, String interfaceName, IProject project)
- throws CoreException
- {
- return implementsInterface(getJavaClass(className, project), getJavaClass(interfaceName, project));
- }
-
-public static boolean implementsInterface(JavaClass javaClass, JavaClass interfaceClass)
- {
-
- if (!javaClass.isExistingType()) return false;
-
- if (!interfaceClass.isExistingType()) return false;
-
- return javaClass.implementsInterface(interfaceClass);
- }
-
- /**
- * Determine whether the specified class extends the specified superclass
- * @param className The fully qualified name of the class
- * @param superClassName The fully qualified name of the superclass
- * @param project The project
- * @return True if the class and superClass are loadable from the project and
- * the class extends the superClass
- */
- public static boolean extendsClass(String className, String superClassName, IProject project)
- throws CoreException
- {
- return extendsClass(getJavaClass(className,project), getJavaClass(superClassName, project));
- }
-
- public static boolean extendsClass(JavaClass javaClass, JavaClass superClass)
- {
- return superClass.isAssignableFrom(javaClass);
- }
-
- /**
- * Determine whether the specified class is actually an interface
- * @param className The fully qualified name of the class
- * @param project The project
- * @return True if the class is loadable from the project and is
- * actually an interface
- */
- public static boolean isInterface(String className, IProject project) throws CoreException
- {
- return isInterface(getJavaClass(className, project));
- }
-
- public static boolean isInterface(JavaClass javaClass)
- {
- return javaClass.isInterface();
- }
- public static boolean hasAbstractMethods (String className, IProject project) throws CoreException
- {
- return hasAbstractMethods(getJavaClass(className, project));
- }
-
- public static boolean hasAbstractMethods (JavaClass javaClass)
- {
- List methodList = javaClass.getMethods();
- if (methodList==null)
- return false;
-
- Iterator iMethods = methodList.iterator();
- while (iMethods.hasNext())
- {
- Method thisMethod = (Method)iMethods.next();
- if ( thisMethod.isAbstract()) return true;
- }
- return false;
- }
-
- /*
- *
- */
- /**
- * @param classQName Fully qualified classname (packageName + typeName)
- * @param project
- * @return
- * @throws CoreException
- */
-public static JavaClass getJavaClass(String classQName , IProject project) throws CoreException
- {
- EMFNature jMOF = JemProjectUtilities.getJEM_EMF_Nature(project, true);
- return (JavaClass)JavaRefFactory.eINSTANCE.reflectType(classQName,jMOF.getResourceSet());
- }
-
- /**
- * @param packageName
- * @param typeName
- * @param project
- * @return
- * @throws CoreException
- */
-public static JavaClass getJavaClass(String packageName, String typeName , IProject project) throws CoreException
- {
- EMFNature jMOF = JemProjectUtilities.getJEM_EMF_Nature(project, true);
- return (JavaClass)JavaRefFactory.eINSTANCE.reflectType(packageName, typeName, jMOF.getResourceSet());
- }
-
- public static boolean isValidSEIFile(JavaClass beanClass, JavaClass seiClass)
- {
- if (!seiClass.isInterface())
- return false;
-
- Vector beanMethodsList = new Vector();
- List beanMethods = beanClass.getMethods();
- Iterator beanMethodsIterator = beanMethods.iterator();
- while (beanMethodsIterator.hasNext())
- {
- Method thisMethod = (Method)beanMethodsIterator.next();
- beanMethodsList.add(thisMethod.getMethodElementSignature());
- }
-
- List seiMethods = seiClass.getMethods();
- if (beanMethods == null ) {
- if ( seiMethods == null) return true;
- else return false;
- }
- if (seiMethods == null) return false;
-
- Iterator seiMethodsIterator = seiMethods.iterator();
- while (seiMethodsIterator.hasNext())
- {
- Method thisMethod = (Method)seiMethodsIterator.next();
- if ( !beanMethodsList.contains(thisMethod.getMethodElementSignature())) {
- return false;
- }
- }
- return true;
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
deleted file mode 100644
index 21b03100b..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
+++ /dev/null
@@ -1,1919 +0,0 @@
-/*******************************************************************************
- * 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20060421 136761 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20080122 215866 trungha@ca.ibm.com - Trung Ha
- * 20080303 218696 ericdp@ca.ibm.com - Eric D. Peters, APIs using EJBArtifactEdit not able to deal with some EJB 3.0 beans properly
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IURLProvider;
-
-/**
- * This class contains useful methods for working with Eclipse resources.
- */
-public final class ResourceUtils {
-
- // Keeps the IWorkspaceRoot hanging around. See getWorkspaceRoot().
- private static IWorkspaceRoot root_ = null;
-
- // Keeps the IWorkspace hanging around. See getWorkspace().
-
- private static IWorkspace workspace_ = null;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has no Java or Web nature.
- */
- public static byte PROJECT_TYPE_NONE = 0;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has a Java project nature.
- */
- public static byte PROJECT_TYPE_JAVA = 1;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has a Web project nature.
- */
- public static byte PROJECT_TYPE_WEB = 2;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has an EJB project nature.
- */
- public static byte PROJECT_TYPE_EJB = 4;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has an Application client project nature.
- */
- public static byte PROJECT_TYPE_APPCLIENT = 8;
-
- /**
- * The SOAP rpcrouter servlet extension to be added to web project URL
- */
- public static String SERVLET_EXT = "/servlet/rpcrouter";
-
- private static final String DEFAULT_CLIENT_WEB_PROJECT_EXT = "Client";
- private static final String DEFAULT_CLIENT_EJB_PROJECT_EXT = "EJBClient";
- private static final String DEFAULT_EJB_PROJECT_NAME = "WebServiceEJBProject";
- private static final String DEFAULT_EJB_COMPONENT_NAME = "WebServiceEJB";
- private static final String DEFAULT_WEB_PROJECT_NAME = "WebServiceProject";
- private static final String DEFAULT_WEB_COMPONENT_NAME = "WebServiceProject";
- private static final String DEFAULT_ROUTER_PROJECT_EXT = "Router";
-
- private static final String DEFAULT_SERVICE_EAR_PROJECT_NAME = "WebServiceProjectEAR";
- private static final String DEFAULT_SERVICE_EAR_COMPONENT_NAME = "WebServiceProjectEAR";
- private static final String DEFAULT_CLIENT_EAR_PROJECT_NAME = "WebServiceProjectClientEAR";
- private static final String DEFAULT_CLIENT_EAR_COMPONENT_NAME = "WebServiceProjectClientEAR";
-
- private static final String DEFAULT_EAR_EXT = "EAR";
-
- /**
- * Returns the IWorkspaceRoot object.
- * @return The IWorkspaceRoot object.
- */
- public static IWorkspaceRoot getWorkspaceRoot() {
- if (root_ == null) {
- root_ = ResourcesPlugin.getWorkspace().getRoot();
- }
- return root_;
- }
-
- /**
- * Returns the IWorkspace object.
- * @return The IWorkspace object.
- */
- public static IWorkspace getWorkspace() {
- if (workspace_ == null) {
- if (root_ == null) {
- root_ = ResourcesPlugin.getWorkspace().getRoot();
- }
- workspace_ = root_.getWorkspace();
- }
- return workspace_;
- }
-
- /**
- * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
- * given absolute pathname or null if no such resource exists.
- *
- * @param absolutePathname
- * The absolute path of the resource.
- * @return The <code>IResource</code>.
- */
- public static IResource findResource(String absolutePathname) {
- if (absolutePathname == null) {
- return null;
- }
- return findResource(new Path(absolutePathname));
- }
-
- /**
- * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
- * given absolute path or null if no such resource exists.
- *
- * @param absolutePath
- * The absolute <code>IPath</code> of the resource.
- * @return The <code>IResource</code>.
- */
- public static IResource findResource(IPath absolutePath) {
- if (absolutePath == null) {
- return null;
- }
- return ResourceUtils.getWorkspaceRoot().findMember(absolutePath);
- }
-
- /**
- * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
- * given file system relative pathname and project or null if no such resource exists.
- *
- * @param filePath File system relative pathname
- * @param project Project
- * @return The <code>IResource</code>.
- */
- public static IResource findResourceAtLocation(String filePath, IProject project) {
-
- return findResource(findPathAtLocation( new Path(filePath), project));
- }
-
- /**
- * This method attempts to convert a path that is relative to a file system
- * to a path that is relative to the workspace. Instead of comparing the
- * filePath with the install location of the workspace (i.e.
- * Platform.getLocation()), the filePath is compared with the location of the project
- * since the project could be in a location other than the the default location relative to the
- * workspace.
- *
- * @param filePath File path relative to a file system
- * @param project The project the file is in
- * @return Path relative to the workspace
- */
- public static IPath findPathAtLocation(IPath filePath, IProject project) {
- IPath result = null;
-
- IPath projectLocation = project.getLocation();
-
- if (projectLocation.matchingFirstSegments(filePath) == projectLocation
- .segmentCount()) {
- filePath = filePath.removeFirstSegments(projectLocation
- .segmentCount() - 1);
- result = filePath.setDevice(null);
- }
-
- return result;
- }
- /**
- * Validates the given string as a name for a resource of the given type(s).
- * This method obeys the contract of
- * {@link org.eclipse.core.resources.IWorkspace#validateName IWorkspace.validateName()}.
- *
- * @param segment
- * The path to validate.
- * @param typeMask
- * The <code>IResource</code> type or types.
- * @return The status with a value if <code>IStatus.OK</code> if the path
- * is valid, or with appropriate severity and message information if
- * the path is not valid.
- *
- * @deprecated not used
- */
- public static IStatus validateName(String segment, int typeMask) {
- return getWorkspace().validateName(segment, typeMask);
- }
-
- /**
- * Validates the given string as the path of a resource of the given
- * type(s). This method obeys the contract of
- * {@link org.eclipse.core.resources.IWorkspace#validatePath IWorkspace.validatePath()}.
- *
- * @param path
- * The path to validate.
- * @param typeMask
- * The <code>IResource</code> type or types.
- * @return The status with a value if <code>IStatus.OK</code> if the path
- * is valid, or with appropriate severity and message information if
- * the path is not valid.
- * @deprecated not used
- */
- public static IStatus validatePath(String path, int typeMask) {
- return getWorkspace().validatePath(path, typeMask);
- }
-
- /**
- * Validates the given Java type name.
- *
- * @param typeName
- * The Java type name.
- * @return The status with a value of <code>IStatus.OK</code> if the name
- * is valid, or with appropriate severity and message information if
- * name is not valid. The primitive types (boolean, char, byte,
- * short, int, long, float, double) are valid. Arrays of valid types
- * are themselves valid.
- * @deprecated use JavaConventions in the jdt core
- */
- public static IStatus validateJavaTypeName(String typeName) {
- //
- // Strip off the trailing array bits, if any.
- //
- int a = typeName.indexOf('[');
- if (a > 0) {
- typeName = typeName.substring(0, a);
- }
- //
- // Allow primitives.
- //
- if (isPrimitiveJavaType(typeName)) {
- return new Status(IStatus.OK, WebServicePlugin.ID, 0, "", null);
- }
- //
- // Defer to JavaConventions.
- //
- return JavaConventions.validateJavaTypeName(typeName);
- }
-
- /**
- * Returns true if the given <code>typeName</code> is a Java primitive
- * (boolean, char, byte, short, int, long, float, double).
- *
- * @return True if the type name is a Java primitive.
- *
- * @deprecated
- */
- public static boolean isPrimitiveJavaType(String typeName) {
- return (typeName.equals("boolean") || typeName.equals("char")
- || typeName.equals("byte") || typeName.equals("short")
- || typeName.equals("int") || typeName.equals("long")
- || typeName.equals("float") || typeName.equals("double"));
- }
-
- /**
- * Returns the handle of the IProject at the beginning of the given
- * <code>absolutePath</code>. Neither the given path nor the project need
- * exist in the workspace. The path must be absolute, and must consist of at
- * least one segment.
- *
- * @return An IProject handle for the project at the beginning of the given
- * <code>absolutePath</code>, or null if the path does not
- * specify a project.
- */
- public static IProject getProjectOf(IPath absolutePath) {
- if (absolutePath.isAbsolute()) {
- String projectName = absolutePath.segment(0);
- if (projectName != null) {
- return getWorkspaceRoot().getProject(projectName);
- }
- }
- return null;
- }
-
- /**
- *
- * @param absolutePath
- * @return
- */
- public static IVirtualComponent getComponentOf(IPath absolutePath){
- if (absolutePath.isAbsolute()) {
- String projectName = absolutePath.segment(0);
- IProject project = getWorkspaceRoot().getProject(projectName);
- if (projectName != null) {
- return ComponentCore.createComponent(project);
- }
- }
- return null;
- }
-
- public static IVirtualComponent getComponentOf(IResource res)
- {
- IVirtualResource[] vresources = ComponentCore.createResources(res);
- IVirtualComponent vcomp = null;
- if (vresources != null && vresources.length>0)
- {
- IVirtualResource vres = vresources[0];
- vcomp = vres.getComponent();
- }
- return vcomp;
- }
-
-
- /**
- * Returns true if the given <code>project</code> is a Java Project.
- *
- * @param project
- * The project.
- * @return True if the project is a Java Project.
- */
- public static boolean isJavaProject(IProject project) {
- try
- {
- return project.hasNature(JavaCore.NATURE_ID);
- }
- catch (CoreException ce)
- {
- //Return false if CoreException occurs while checking nature.
- return false;
- }
- }
-
- /**
- * Returns true if the given <code>project</code> is a Java Project.
- *
- * @param project
- * The project.
- * @return True if the project is a Java Project.
- */
- public static boolean isTrueJavaProject(IProject project) {
- return (!isWebProject(project) && !isAppClientProject(project) && !isEARProject(project)
- && !isEJBProject(project) && isJavaProject(project));
- /*
- * try { String[] natures = project.getDescription().getNatureIds();
- * return (natures.length == 1 &&
- * natures[0].equals(JavaCore.NATURE_ID)); } catch (CoreException e) { }
- * return false;
- */
- }
-
- /**
- * Returns true if the given <code>project</code> is a Web Project.
- * Note: For components; use J2EEUtils.isWebComponent()
- * @param project
- * The project.
- * @return True if the project is a Web Project.
- *
- * @deprecated
- */
- public static boolean isWebProject(IProject project) {
- boolean isWeb = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- //isWeb = WebArtifactEdit.isValidWebModule(wbcs[0]);
- }
- }
- catch(Exception ex){
- // handle exception
- }
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isWeb;
- }
-
- /**
- * Note: for components; use J2EEUtils.isEARComponent()
- * @param project
- * @return
- *
- * @deprecated
- */
- public static boolean isEARProject(IProject project){
- boolean isEAR = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- EARArtifactEdit earEdit = null;
- try {
- //earEdit = EARArtifactEdit.getEARArtifactEditForRead(wbcs[0]);
- if (earEdit!=null){
- isEAR = true;
- }
- }
- finally{
- if (earEdit!=null)
- earEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isEAR;
- }
- /**
- * Returns true if the given <code>project</code> is an EJB 1.1 or EJB 2.0
- * Project.
- * Note: for components, use J2EEUtils.isEJBComponent
- * @param project
- * The project.
- * @return True if the project is an EJB 1.1 or an EJB 2.0 Project.
- *
- * @deprecated
- *
- */
- public static boolean isEJBProject(IProject project) {
- boolean isEJB = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- EJBArtifactEdit ejbEdit = null;
- try {
- //ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(wbcs[0]);
- if (ejbEdit!=null){
- isEJB = true;
- }
- }
- finally{
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isEJB;
- }
-
- /**
- * Returns true if the given <code>project</code> is an Application Client
- * Project.
- * Note: for components, use J2EEUtils.isAppClientComponent()
- * @param project
- * The project.
- * @return True if the project is an Application Client Project
- *
- * @deprecated
- */
- public static boolean isAppClientProject(IProject project) {
- boolean isAppClient = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- AppClientArtifactEdit appClientEdit = null;
- try {
- //appClientEdit = AppClientArtifactEdit.getAppClientArtifactEditForRead(wbcs[0]);
- if (appClientEdit!=null){
- isAppClient = true;
- }
- }
- finally{
- if (appClientEdit!=null)
- appClientEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isAppClient;
- }
-
- /**
- * Returns the type of the given <code>project</code> as a bitmask.
- * Relevant bitmask values are:
- * <ol>
- * <li>{@link #PROJECT_TYPE_JAVA PROJECT_TYPE_JAVA}
- * <li>{@link #PROJECT_TYPE_WEB PROJECT_TYPE_WEB}
- * <li>{@link #PROJECT_TYPE_EJB PROJECT_TYPE_EJB}
- * <li>{@link #PROJECT_TYPE_NONE PROJECT_TYPE_NONE}
- * </ol>
- *
- * @param project
- * The project.
- * @return The type bitmask of the project.
- *
- * @deprecated use getComponentType
- */
- public static byte getProjectType(IProject project) {
- byte projectType = PROJECT_TYPE_NONE;
- if (ResourceUtils.isJavaProject(project)) {
- projectType |= PROJECT_TYPE_JAVA;
- }
- if (ResourceUtils.isWebProject(project)) {
- projectType |= PROJECT_TYPE_WEB;
- }
- if (ResourceUtils.isEJBProject(project)) {
- projectType |= PROJECT_TYPE_EJB;
- }
- return projectType;
- }
-
- /**
- * Returns the component type id as defined in IModuleConstants
- * i.e. IModuleConstants.JST_WEB_MODULE = "jst.web"
- * @param project
- * @return
- */
- public static String getComponentType(IProject project){
- return J2EEProjectUtilities.getJ2EEProjectType(project);
- }
-
- /**
- * Returns the component type
- * @param component
- * @return
- */
- public static String getComponentType(IVirtualComponent component){
- return getComponentType(component.getProject());
- }
-
- /**
- * Returns WebModule Deployable of the <code>project</code> as an
- * <code>IDeployable</code>, or null if the project has no Web nature.
- *
- * @param project
- * The project.
- * @return WebModule Deployable of the <code>project</code> or null if the
- * project has no Web nature.
- */
- public static IModule getModule(IProject project) {
- return ServerUtil.getModule(project);
-}
-
-// Workaround for 113621
-//public static IModule getModule(IProject project) {
-// IModule[] modules = ServerUtil.getModules(project);
-// if (modules!=null && modules.length!=0) {
-// return modules[0];
-// }
-// return null;
-//}
-
- /**
- * Returns the build output location of the <code>project</code> as an
- * <code>IPath</code>, or null if the project has no Java nature.
- * i.e. WP\.deployables\webModule\WEB-INF\classes
- * @param project
- * The project.
- * @return The build output location of the <code>project</code> or null
- * if the project has no Java nature.
- * @deprecated not used
- */
- public static IPath getJavaOutputLocation(IProject project) {
- IPath outputLocation = null;
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- outputLocation = javaProject.getOutputLocation();
- }
- } catch (JavaModelException e) {
- }
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.INFO, 5032, ResourceUtils.class, "getJavaOutputLocation",
- "project=" + project + ",outputLocation=" + outputLocation);
-
- return outputLocation;
- }
-
- /**
- * Returns a build source location of the <code>project</code> as an
- * <code>IPath</code>, or null if the project either has no Java nature
- * or if the project's build classpath contains no folders local to the
- * project. If the project has more than one of its own folders on the build
- * classpath, then one of them is chosen arbitrarily as the build source
- * location. To work with all entries on the build classpath, use
- * {@link #getJavaPackageFragmentRoots getJavaPackageFragmentRoots()}or
- * {@link #getJavaClasspath getJavaClasspath()}.
- *
- * @param project
- * The project.
- * @return A build source location of the <code>project</code> or null if
- * the project has no Java nature or if the project's build
- * classpath contains no folders local to the project.
- */
-
- public static IPath getJavaSourceLocation(IProject project) {
- IPath sourceLocation = null;
- IPackageFragmentRoot[] fragmentRoots = getJavaPackageFragmentRoots(project);
- for (int i = 0; i < fragmentRoots.length && sourceLocation == null; i++) {
- try {
- IResource fragmentRoot = fragmentRoots[i]
- .getCorrespondingResource();
- if (fragmentRoot != null
- && (fragmentRoot.getProject().equals(project))
- && (fragmentRoot.getType() != IResource.FILE)) {
- sourceLocation = fragmentRoot.getFullPath();
- }
- } catch (JavaModelException e) {
- }
- }
-
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.INFO, 5030, ResourceUtils.class, "getJavaSourceLocation",
- "project=" + project + ",sourceLocation=" + sourceLocation);
-
- return sourceLocation;
- }
-
-
- /**
- * Returns the "JavaSource" folder
- * @param project
- * @return
- */
- /*
- public static IPath getJavaSourceLocation(IProject project){
- IVirtualComponent component = ComponentCore.createComponent(project);
- return getJavaSourceLocation(component);
- }
- */
- /**
- * Returns the JavaSource location folder
- * @param comp
- * @return
- */
- public static IPath getJavaSourceLocation(IVirtualComponent comp){
- if (comp!=null){
- IVirtualFolder folder = comp.getRootFolder().getFolder(new Path("/WEB-INF/classes"));
- return folder.getWorkspaceRelativePath();
- }
- return null;
- }
-
- /**
- * Returns the JavaSource locations in each project
- * @param project
- * @return
- */
- public static IPath[] getAllJavaSourceLocations(IProject project) {
- Vector pathVector = new Vector();
- IPackageFragmentRoot[] fragmentRoots = getJavaPackageFragmentRoots(project);
-
- for (int i = 0; i < fragmentRoots.length; i++) {
- try {
- IResource fragmentRoot = fragmentRoots[i].getCorrespondingResource();
- if (fragmentRoot != null && (fragmentRoot.getProject().equals(project))
- && (fragmentRoot.getType() != IResource.FILE)) {
- pathVector.add(fragmentRoot.getFullPath());
- }
- } catch (JavaModelException e) {
- }
- }
- return (IPath[]) pathVector.toArray(new Path[pathVector.size()]);
- }
-
- public static IPath[] getAllJavaSourceLocations(IVirtualComponent[] components) {
-
- if (components!=null){
- List javaSourcePaths = new ArrayList();
- for (int i=0;i<components.length;i++){
- IPath path = getJavaSourceLocation(components[i]);
- javaSourcePaths.add(path);
- }
- return (IPath[])javaSourcePaths.toArray(new IPath[0]);
- }
- return null;
- }
-
- /**
- * Returns a build source package fragment root of the <code>project</code>
- * as an <code>IPackageFragmentRoot</code>, or null if the project either
- * has no Java nature or if the project's build classpath contains no
- * folders local to the project. If the project has more than one of its own
- * folders on the build classpath, then one of them is chosen arbitrarily as
- * the build source location.
- *
- * @param project
- * The project.
- * @return A build source package fragment root of the <code>project</code>
- * or null if the project has no Java nature or if the project's
- * build classpath contains no folders local to the project.
- *
- * @deprecated not used
- */
- public static IPackageFragmentRoot getJavaSourcePackageFragmentRoot(IProject project) {
- IPackageFragmentRoot packageFragmentRoot = null;
- IPath javaSourceLocation = getJavaSourceLocation(project);
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- packageFragmentRoot = javaProject.findPackageFragmentRoot(javaSourceLocation);
- }
- } catch (JavaModelException e) {
- }
- return packageFragmentRoot;
- }
-
- /**
- * Returns the package fragment roots of the <code>project</code> as an
- * array of <code>IPackageFragmentRoot</code> objects. If the project has
- * no Java nature then the returned array will be of length zero.
- *
- * @param project
- * The project.
- * @return The package fragment roots of the <code>project</code>.
- */
- public static IPackageFragmentRoot[] getJavaPackageFragmentRoots(IProject project) {
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IPackageFragmentRoot[] packageFragmentRoots = javaProject
- .getPackageFragmentRoots();
- return packageFragmentRoots;
- }
- } catch (JavaModelException e) {
- }
- return new IPackageFragmentRoot[0];
- }
-
- /**
- * Returns the build classpath entries of the <code>project</code> as an
- * array of <code>IClasspathEntry</code> objects. If the project has no
- * Java nature then the returned array will be of length zero.
- *
- * @param project
- * The project.
- * @return The classpath entries of the <code>project</code>.
- *
- * @deprecated not used
- */
- public static IClasspathEntry[] getJavaClasspath(IProject project) {
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IClasspathEntry[] classpathEntries = javaProject.getRawClasspath();
- return classpathEntries;
- }
- } catch (JavaModelException e) {
- }
- return new IClasspathEntry[0];
- }
-
- /**
- *
- * @param project
- * @return
- */
- public static IFolder getWebComponentServerRoot(IProject project){
-
- IFolder webModuleServerRoot = null;
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc.exists())
- webModuleServerRoot = J2EEUtils.getOutputContainerRoot(vc);
-
- return webModuleServerRoot;
- }
-
- /**
- *
- * @param project
- * @return
- */
- public static IPath getWebComponentServerRootPath(IProject project){
-
- IContainer webModuleServerRoot = null;
- IVirtualComponent vc = ComponentCore.createComponent(project);
- if (vc != null && vc.exists()){
- IContainer[] containers = J2EEProjectUtilities.getOutputContainers(project.getProject());
- if (containers.length > 0)
- webModuleServerRoot = containers[0];
- }
-
- if (webModuleServerRoot != null)
- return webModuleServerRoot.getFullPath();
- return null;
- }
-
- /**
- * Returns the URL string corresponding to the web server module root of the
- * project in a server instance or null if the project has no Web nature or
- * has no association to a server instance.
- *
- * @param project
- * The project.
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- * @deprecated use getWebComponentURL(..) which belongs in ServerUtils
- */
- public static String getWebProjectURL(IProject project,
- String serverFactoryId, IServer server) {
-
- String webProjectURL = null;
- IModule module = getModule(project);
- if (module != null) {
- IServer serverInstance = ServerUtils.getServerForModule(module,
- serverFactoryId, server, true, new NullProgressMonitor());
- if (serverInstance != null) {
-// URL url = ((IURLProvider) serverInstance.getDelegate()).getModuleRootURL(module);
- URL url = ((IURLProvider)serverInstance.getAdapter(IURLProvider.class)).getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s
- .length() - 1) : s);
- }
- }
- }
-
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.INFO, 5036, ResourceUtils.class, "getWebProjectURL",
- "project=" + project + ",webProjectURL=" + webProjectURL);
-
- return webProjectURL;
- }
-
- /**
- * Returns the forged URL string corresponding to the web server module root
- * of the project in a server instance or null if the project has no Web
- * nature or has no association to a server instance.
- *
- * @param project
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- * @deprecated not used
- */
-// public static String getForgedWebProjectURL(IProject project, String serverFactoryId, IServer server){
-//
-// String webProjectURL = null;
-// IModule module = getModule(project);
-// if (module != null)
-// {
-// //IServer serverInstance = ServerUtils.getServerForModule(module,
-// // serverFactoryId, server, true, new NullProgressMonitor());
-// if (server != null)
-// {
-// String hostname = server.getHost();
-//
-// // get ServerPort
-// int portNumber = 0;
-//
-// ServerPort[] ports = server.getServerPorts(null);
-// ServerPort port = null;
-// for (int it = 0; it<ports.length; it++)
-// {
-// ServerPort p = ports[it];
-// String protocol = p.getProtocol();
-// if (protocol != null && protocol.trim().toLowerCase().equals("http"))
-// {
-// port = p;
-// portNumber = p.getPort();
-// break;
-// }
-// }
-//
-//
-//
-// URL url = null;
-// try {
-// url = new URL("http", hostname, portNumber, "");
-// }
-// catch(Exception e){
-// e.printStackTrace();
-// }
-//
-//
-// //URL url = ((IURLProvider) serverInstance.getDelegate()).getModuleRootURL(module);
-//
-// if (url != null)
-// {
-// String s = url.toString();
-// webProjectURL = s + "/"+project.getName();
-// //webProjectURL = (s.endsWith("/") ? s.substring(0,s.length()-1) : s);
-// }
-// }
-// }
-// ILog log = new EclipseLog();
-// log.log(ILog.INFO, 5036, ResourceUtils.class, "getWebProjectURL", "project="+project+",webProjectURL="+webProjectURL);
-// return webProjectURL;
-// }
- /**
- * Returns the URL string corresponding to the web server module root of the
- * project in a server instance or null if the project has no Web nature or
- * has no association to a server instance.
- *
- * @param project
- * The project.
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- * @deprecated belongs in ServerUtils
- *
- */
- public static String getWebProjectURL(IProject project) {
- String webProjectURL = null;
- IModule module = getModule(project);
- if (module != null) {
- IServer serverInstance = ServerUtils.getServerForModule(module);
- if (serverInstance != null) {
- URL url = ((IURLProvider)serverInstance.getAdapter(IURLProvider.class)).getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s
- .length() - 1) : s);
- }
- }
- }
- ILog log = EnvironmentService.getEclipseLog();
- log.log(ILog.INFO, 5037, ResourceUtils.class, "getWebProjectURL",
- "project=" + project + ",webProjectURL=" + webProjectURL);
-
- return webProjectURL;
- }
-
- /**
- *
- * @param project
- * @return
- *
- * @deprecated should be in ServerUtils
- */
- public static String getEncodedWebProjectURL(IProject project) {
- String url = getWebProjectURL(project);
- if (url != null) {
- int index = url.lastIndexOf('/');
- if (index != -1) {
- StringBuffer encodedURL = new StringBuffer();
- encodedURL.append(url.substring(0, index + 1));
- try {
- String ctxtRoot = URLEncoder.encode(url.substring(index + 1, url.length()), "UTF-8");
- int plusIndex = ctxtRoot.indexOf('+');
- while (plusIndex != -1) {
- StringBuffer sb = new StringBuffer();
- sb.append(ctxtRoot.substring(0, plusIndex));
- sb.append("%20");
- sb.append(ctxtRoot.substring(plusIndex + 1, ctxtRoot
- .length()));
- ctxtRoot = sb.toString();
- plusIndex = ctxtRoot.indexOf('+');
- }
- encodedURL.append(ctxtRoot);
- }catch (IOException io){
- //handler exception
- }
- url = encodedURL.toString();
- }
- }
- return url;
- }
-
- /**
- * Given the <code>absolutePath</code> of a Java resource, returns the
- * package name of the resource or null if the resource is not properly
- * located in a project or folder on the build classpath or that is the
- * build output path.
- *
- * @param absolutePath
- * The absolute path of the Java resource.
- * @return the package name of the Java resource.
- */
- public static String getJavaResourcePackageName(IPath absolutePath) {
- try {
- IPath javaFolderPath = absolutePath.removeLastSegments(1);
- IProject project = getProjectOf(absolutePath);
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IPackageFragment fragment = javaProject
- .findPackageFragment(javaFolderPath);
- if (fragment != null) {
- return fragment.getElementName();
- }
- IPath outputPath = getJavaOutputLocation(project);
- if (outputPath.isPrefixOf(javaFolderPath)) {
- IPath javaPackagePath = javaFolderPath
- .removeFirstSegments(outputPath.segmentCount());
- return javaPackagePath.isEmpty() ? null : javaPackagePath
- .toString().replace(IPath.SEPARATOR, '.');
- }
- }
- } catch (JavaModelException e) {
- }
- return null;
- }
-
- /**
- * Given the <code>absolutePath</code> of a Java resource, returns the
- * package name of the resource as a relative pathname or null if the
- * resource is not properly located in a project or folder on the build
- * classpath.
- *
- * @param absolutePath
- * The absolute path of the Java resource.
- * @return the package name of the Java resource as a relative path.
- */
- public static IPath getJavaResourcePackagePath(IPath absolutePath) {
- String packageName = ResourceUtils
- .getJavaResourcePackageName(absolutePath);
- return (packageName == null ? null : new Path(packageName.replace('.',
- IPath.SEPARATOR)));
- }
-
- /**
- * Given the <code>absolutePath</code> of a Java resource, returns the
- * absolute path of the project or folder that is on the build classpath or
- * is the build output path and that contains the fully qualified Java
- * resource, or null if no such project or folder exists.
- *
- * @param absolutePath
- * The absolute path of the Java resource.
- * @return The absolute path of the project or folder containing the fully
- * qualified Java resource.
- * @deprecated not used
- */
- public static IPath getJavaResourceRootPath(IPath absolutePath) {
- try {
- IProject project = getProjectOf(absolutePath);
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IPackageFragmentRoot[] pfrs = javaProject
- .getPackageFragmentRoots();
- for (int i = 0; i < pfrs.length; i++) {
- IResource fragmentRoot = pfrs[i].getCorrespondingResource();
- if (fragmentRoot != null) {
- IPath fragmentPath = fragmentRoot.getFullPath();
- if (fragmentPath.isPrefixOf(absolutePath)) {
- return fragmentPath;
- }
- }
- }
- IPath outputPath = getJavaOutputLocation(project);
- if (outputPath.isPrefixOf(absolutePath)) {
- return outputPath;
- }
- }
- } catch (JavaModelException e) {
- }
- return null;
- }
-
- /**
- * Determines an URL (HTTP or FILE) to an Eclipse resource, returning the
- * URL string if successful and false otherwise. A value of null will
- * definitely be returned if any of the following conditions are not met:
- * <ol>
- * <li>The absolute path begins with a Web Project.
- * <li>The leading portion of the absolute path matches the path of the
- * container returned by {#link #getWebModuleServerRoot
- * getWebModuleServerRoot} for the project.
- * <li>The path does not lead to the WEB-INF folder or any descendent
- * thereof.
- * <li>The Web Project is associated with an explicit or default server
- * instance.
- * </ol>
- *
- * @param absolutePath
- * The absolute path of the resource.
- * @return The URL of the file, or null if no URL can be determined.
- * @deprecated not used
- */
-// public static String getURLFromPath(IPath absolutePath,
-// String serverFactoryId, IServer server) {
-// return getURLFromPath(absolutePath, getWebProjectURL(
-// getProjectOf(absolutePath), serverFactoryId, server));
-// }
-
- /**
- *
- * @param absolutePath
- * @param webProjectURL
- * @return
- * @deprecated not used
- */
-// public static String getURLFromPath(IPath absolutePath, String webProjectURL) {
-// StringBuffer url = new StringBuffer();
-// IProject project = getProjectOf(absolutePath);
-// IContainer webModuleServerRoot = getWebModuleServerRoot(project);
-// if (webModuleServerRoot != null) {
-// IPath webModuleServerRootPath = webModuleServerRoot.getFullPath();
-// if (webModuleServerRootPath.isPrefixOf(absolutePath)) {
-// int numSegment = webModuleServerRootPath.segmentCount();
-// int numSegmentFromPath = absolutePath.segmentCount();
-// if (numSegmentFromPath > numSegment) {
-// String nextSegment = absolutePath.segment(numSegment);
-// // check if the segment after the WebModuleServerRoot is
-// // WEB-INF (ignoring case)
-// if (nextSegment != null && !nextSegment.equalsIgnoreCase("WEB-INF")) {
-// IPath relativePath = absolutePath.removeFirstSegments(numSegment);
-// if (webProjectURL != null)
-// url.append(webProjectURL).append(IPath.SEPARATOR).append(relativePath.toString());
-// }
-// } else if (numSegmentFromPath == numSegment)
-// url.append(webProjectURL);
-// }
-// }
-// if (url.length() < 1) {
-// IWorkspaceRoot workspace = getWorkspaceRoot();
-// url.append(getResourceURI(workspace.getFile(absolutePath)));
-// }
-// ILog log = new EclipseLog();
-// log.log(ILog.INFO, 5038, ResourceUtils.class, "getURLFromPath",
-// "absolutePath=" + absolutePath + ",url=" + url);
-//
-// return url.toString();
-// }
-
- /**
- * Copies a set of files from a plugin's installation location to a native
- * directory. The files are named in an index file located relative to the
- * plugin's installation location.
- *
- * @param plugin
- * The plugin containing the files to copy. Must not be null.
- * @param sourcePath
- * The path, relative to the <code>plugin</code> install
- * location, containing the files to copy. If null, then the
- * plugin install location is the source path (ie. null is
- * equivalent to ".").
- * @param indexPathname
- * A file containing a whitespace-delimitted list of pathnames of
- * the files to copy. The pathnames are relative to the
- * <code>plugin sourcePath</code>. Must not be null.
- * @param targetPath
- * The absolute path of the native directory to which the files
- * will be copied. The relative pathnames of the files named in
- * the <code>indexPathname</code> file are preserved. Must not
- * be null.
- * @param progressMonitor
- * The progress monitor for the operation, or null.
- * @throws IOException
- * An exception indicating an IO error has occured.
- */
- static public void copyIndexedFilesToOS(Plugin plugin, IPath sourcePath,
- IPath indexPathname, IPath targetPath,
- IProgressMonitor progressMonitor) throws IOException {
- InputStream input = plugin.openStream(indexPathname);
- Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
- copyEnumeratedFilesToOS(plugin, sourcePath, filenames, targetPath,
- progressMonitor);
- }
-
- /**
- * Copies a set of files from a plugin's installation location to a native
- * directory. The files are named in an enumeration.
- *
- * @param plugin
- * The plugin containing the files to copy. Must not be null.
- * @param sourcePath
- * The path, relative to the <code>plugin</code> install
- * location, containing the files to copy. If null, then the
- * plugin install location is the source path (ie. null is
- * equivalent to ".").
- * @param pathnames
- * An enumeration of pathnames of the files to copy. The
- * pathnames are relative to the <code>plugin sourcePath</code>.
- * Must not be null.
- * @param targetPath
- * The absolute path of the native directory to which the files
- * will be copied. The relative pathnames of the files named in
- * the <code>pathnames</code> enumeration are preserved. Must
- * not be null.
- * @param progressMonitor
- * The progress monitor for the operation, or null.
- * @throws IOException
- * An exception indicating an IO error has occured.
- */
- static public void copyEnumeratedFilesToOS(Plugin plugin, IPath sourcePath,
- Enumeration pathnames, IPath targetPath,
- IProgressMonitor progressMonitor) throws IOException {
- while (pathnames.hasMoreElements()) {
- String filename = (String) pathnames.nextElement();
- copyFileToOS(plugin, sourcePath, new Path(filename), targetPath,
- progressMonitor);
- }
- }
-
- /**
- * Copies a file from a plugin's installation location to a native
- * directory.
- *
- * @param plugin
- * The plugin containing the files to copy. Must not be null.
- * @param sourcePath
- * The path, relative to the <code>plugin</code> install
- * location, containing the files to copy. If null, then the
- * plugin install location is the source path (ie. null is
- * equivalent to ".").
- * @param pathname
- * The pathname of the file to copy. The pathname is relative to
- * the <code>plugin sourcePath</code>. Must not be null.
- * @param targetPath
- * The absolute path of the native directory to which the file
- * will be copied. The relative pathname of the file is
- * preserved. Must not be null.
- * @param progressMonitor
- * The progress monitor for the operation, or null.
- * @throws IOException
- * An exception indicating an IO error has occured.
- */
- static public void copyFileToOS(Plugin plugin, IPath sourcePath,
- IPath pathname, IPath targetPath, IProgressMonitor progressMonitor)
- throws IOException {
- IPath target = targetPath.append(pathname);
- IPath source = sourcePath == null ? pathname : sourcePath
- .append(pathname);
- InputStream input = plugin.openStream(source);
- OutputStream output = new FileOutputStream(target.toOSString());
- copyStream(input, output);
- input.close();
- output.close();
- }
-
- /**
- * Copies data from one stream to another.
- *
- * @param input
- * The input stream.
- * @param output
- * The output stream.
- * @return The number of bytes copied.
- * @throws IOException
- * An exception if an error occurs while processing either of
- * the streams.
- */
- static public int copyStream(InputStream input, OutputStream output)
- throws IOException {
- int t = 0;
- byte[] buffer = new byte[1024];
- int n = input.read(buffer);
- while (n >= 0) {
- output.write(buffer, 0, n);
- t += n;
- n = input.read(buffer);
- }
- return t;
- }
-
- /**
- * Creates a native directory path equal to the parent portion of the given
- * <code>pathname</code>. If the directory already exists, then no action
- * is taken.
- *
- * @param pathname
- * The pathname to the file whose parent directory should be
- * created.
- * @throws IOException
- * An exception if an IO error occurs.
- */
- static public void createParentDirectoryFor(String pathname)
- throws IOException {
- File file = new File(pathname);
- File parent = file.getParentFile();
- if (parent != null) {
- parent.mkdirs();
- }
- }
-
- /**
- * Returns the IResource represented by the given selection.
- *
- * @param object
- * The selection
- * @return IResource if the selection represents an IResource. Returns null
- * otherwise.
- * @throws CoreException
- */
- static public IResource getResourceFromSelection(Object obj)
- throws CoreException {
- IResource res = null;
- if (obj != null) {
- if (obj instanceof IResource) {
- res = (IResource) obj;
- } else if (obj instanceof IJavaElement) {
- IJavaElement javaElement = (IJavaElement) obj;
- res = javaElement.getCorrespondingResource();
- } else if (obj instanceof EnterpriseBean) {
- EnterpriseBean ejbBean = (EnterpriseBean) obj;
- IProject ejbProject = ProjectUtilities.getProject(ejbBean);
- if (ejbProject != null)
- res = ejbProject;
- } else if (obj instanceof SessionBean) {
- SessionBean JEE5Bean = (SessionBean) obj;
- IProject ejbProject = ProjectUtilities.getProject(JEE5Bean);
- if (ejbProject != null)
- res = ejbProject;
- }
-
- }
-
- return res;
- }
-
- //----------------------------------------------------------------------
- // Naughty bits...
- //----------------------------------------------------------------------
-
- //
- // Creates a path of folders.
- // Do not call with an absolutePath of less than one segment.
- //
- // private static IContainer makeFolderPath (
- // ResourceContext resourceContext,
- // IPath absolutePath,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // if (absolutePath.segmentCount() <= 1)
- // {
- // return getWorkspaceRoot().getProject(absolutePath.segment(0));
- // }
- // else
- // {
- // IContainer parent = makeFolderPath(resourceContext,
- // absolutePath.removeLastSegments(1), progressMonitor, statusMonitor);
- // String folderName = absolutePath.lastSegment();
- // return makeFolder(resourceContext, parent,folderName, progressMonitor ,
- // statusMonitor);
- // }
- // }
- //
- // Creates a folder under a container.
- // The container must already exist.
- //
- // private static IFolder makeFolder (
- // ResourceContext resourceContext,
- // IContainer parent,
- // String folderName,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // IResource child = parent.findMember(folderName);
- // if (child == null)
- // {
- // if (!resourceContext.isCreateFoldersEnabled()) {
- // int result = statusMonitor.reportStatus(new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FOLDER_CREATION_DISABLED",
- // new Object[] {parent.getFullPath().toString(),folderName}),null),
- // getThreeStateFileOptions());
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return null;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setCreateFoldersEnabled(true);
- //
- // }
- // IFolder folder = parent.getFolder(new Path(folderName));
- // folder.create(true,true,progressMonitor);
- // return folder;
- // }
- // else if (child.getType() == IResource.FOLDER)
- // {
- // return (IFolder)child;
- // }
- // else
- // {
- // throw new CoreException(new
- // Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_RESOURCE_NOT_FOLDER",new
- // Object[] {parent.getFullPath().append(folderName).toString()}),null));
- // }
- // }
-
- //
- // Creates a file under a container.
- // The container must already exist.
- //
- // private static IFile makeFile (
- // ResourceContext resourceContext,
- // IContainer parent,
- // String fileName,
- // InputStream inputStream,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // IResource child = parent.findMember(fileName);
- // if (child != null)
- // {
- // if (child.getType() == IResource.FILE)
- // {
- // if (!resourceContext.isOverwriteFilesEnabled()) {
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_OVERWRITE_DISABLED",
- // new Object[] {parent.getFullPath().toString(),fileName}),null),
- // getThreeStateFileOptions());
- //
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return null;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setOverwriteFilesEnabled(true);
- // }
- // //We have permission to overwrite so check if file is read-only
- // if (child.isReadOnly())
- // {
- // if (!resourceContext.isCheckoutFilesEnabled()) {
- //
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_CHECKOUT_DISABLED",
- // new Object[] {parent.getFullPath().toString(),fileName}),null),
- // getThreeStateFileOptions());
- //
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return null;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setCheckoutFilesEnabled(true);
- // }
- //
- // IFile[] files = new IFile[1];
- // files[0] = (IFile)child;
- //
- // if (
- // !statusMonitor.reportStatus(getWorkspace().validateEdit(files,null)))
- // return null;
- // }
- //
- // //Change the contents of the existing file.
- // IFile file = parent.getFile(new Path(fileName));
- // file.setContents(inputStream,true,true,progressMonitor);
- // return file;
- //
- // }
- // else
- // {
- // throw new CoreException(new
- // Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_RESOURCE_NOT_FILE",new
- // Object[] {parent.getFullPath().append(fileName)}),null));
- // }
- // }
- // else
- // {
- // //Create a new file.
- // IFile file = parent.getFile(new Path(fileName));
- // file.create(inputStream,true,progressMonitor);
- // return file;
- // }
- // }
-
- /**
- * Deletes a file under a container. The container must already exist.
- *
- * @param file -
- * the IFile to be deleted
- * @param progressMonitor
- * @param statusMonitor
- * @return True if the file does not exist or if it exists and is
- * successfully deleted. False otherwise.
- */
- // public static boolean deleteFile (
- // ResourceContext resourceContext,
- // IFile file,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor )
- // throws CoreException
- // {
- // if (file.exists())
- // {
- // if (!resourceContext.isOverwriteFilesEnabled()) {
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_OVERWRITE_DISABLED",
- // new Object[]
- // {file.getParent().getFullPath().toString(),file.getName()}),null),
- // getThreeStateFileOptions());
- //
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return false;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setOverwriteFilesEnabled(true);
- // }
- // //We have permission to overwrite so check if file is read-only
- // if (file.isReadOnly())
- // {
- // if (!resourceContext.isCheckoutFilesEnabled()) {
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_CHECKOUT_DISABLED",
- // new Object[]
- // {file.getParent().getFullPath().toString(),file.getName()}),null),
- // getThreeStateFileOptions());
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return false;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setCheckoutFilesEnabled(true);
- //
- // }
- // IFile[] files = new IFile[1];
- // files[0] = file;
- //
- // if (
- // !statusMonitor.reportStatus(getWorkspace().validateEdit(files,null)))
- // return false;
- // }
- // file.delete(true,progressMonitor);
- // }
- // //At this point, either the file did not exist or we successfully deleted
- // it. Return success.
- // return true;
- // }
- /**
- * Deletes a folder under a container.
- *
- * @param folder -
- * the IFolder to be deleted
- * @param progressMonitor
- * @param statusMonitor
- * @return True if the folder does not exist or if it exists and is
- * successfully deleted along with its members. False otherwise.
- */
- // public static boolean deleteFolder (
- // ResourceContext resourceContext,
- // IFolder folder,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // if (!folder.exists()) return true;
- //
- // boolean deleted = true;
- // IResource[] resources = folder.members();
- // for (int i=0; i<resources.length; i++)
- // {
- // IResource resource = resources[i];
- // if (resource instanceof IFile)
- // {
- // deleted = deleteFile(resourceContext, (IFile)resource, progressMonitor,
- // statusMonitor);
- // }
- // if (resource instanceof IFolder)
- // {
- // deleted = deleteFolder( resourceContext, (IFolder)resource,
- // progressMonitor, statusMonitor);
- // }
- //
- // if (!deleted) break;
- // }
- // if (deleted) {
- // folder.delete(true, true, progressMonitor);
- // return true;
- // }
- // else
- // return false;
- //
- // }
- /**
- * Deletes a set of files that are named in an index file located relative
- * to the plugin's installation location.
- *
- * @param plugin
- * The plugin containing the indexed file Must not be null.
- * @param sourcePath -
- * relative path of the indexed file passing a null in has the
- * same effect as passing a "." in
- * @param indexFilePath -
- * the indexed filename Must not be null
- * @param targetPath -
- * path containing the files named in the indexed file Must not
- * be null, this path must end with a trailing separator
- * @param progressMonitor
- */
- // public static void deleteIndexFilesFromOS (
- // Plugin plugin,
- // IPath indexFilePath,
- // IPath targetPath
- // )
- // throws IOException {
- // InputStream input = plugin.openStream(indexFilePath);
- // Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
- // while (filenames.hasMoreElements()) {
- // File targetFile =
- // targetPath.append((String)filenames.nextElement()).toFile();
- // if (targetFile.exists())
- // targetFile.delete();
- // }
- // }
- /**
- * Returns a URI reference to the given Eclipse resource, or null if no such
- * reference can be determined (for example, if the resource does not exist
- * in the underlying filesystem).
- *
- * @param resource
- * The resource.
- * @return The URI as a string, or null if there is no URI to the resource.
- */
- public static String getResourceURI(IResource resource) {
- String uri = null;
- IPath location = resource.getLocation();
- if (location != null) {
- uri = "file:" + location.toString();
- }
- return uri;
- }
-
- /**
- * Returns a URI reference to the given Eclipse resource using the
- * "platform:" protocol, or null if no such reference can be determined (for
- * example, if the resource does not exist in the underlying filesystem).
- *
- * @param resource
- * The resource.
- * @return The URI as a string, or null if there is no URI to the resource.
- */
- public static String getPlatformResourceURI(IResource resource) {
- String uri = null;
- IPath location = resource.getFullPath();
- if (location != null) {
- uri = "platform:/resource" + location.toString();
- }
- return uri;
- }
-
- /**
- * Returns the default binding namespace string given a Java bean name
- * (using the convention used by CTC in GM). e.g. Java bean MyClass result
- * in binding namespace of
- * "http://www.myclass.com/definitions/MyClassRemoteInterface"
- *
- * @param beanName
- * The java bean.
- * @return The binding namespace as a string.
- */
- public static String getBindingNamespace(String beanName) {
- return "http://www." + beanName.toLowerCase() + ".com/definitions/"
- + beanName + "RemoteInterface";
- }
-
- /**
- * Returns the default schema namespace string given a Java bean name (using
- * the convention used by CTC in GM). e.g. Java bean MyClass result in
- * schema namespace of
- * "http://www.myclass.com/schemas/MyClassRemoteInterface"
- *
- * @param beanName
- * The java bean.
- * @return The schemas namespace as a string.
- */
- public static String getSchemaNamespace(String beanName) {
- return "http://www." + beanName.toLowerCase() + ".com/schemas/"
- + beanName + "RemoteInterface";
- }
-
- // public static Vector getThreeStateFileOptions() {
- // Vector options = new Vector();
- // options.add(new
- // StatusOption(IStatusDialogConstants.YES_ID,IStatusDialogConstants.YES_LABEL,"",""));
- // options.add(new
- // StatusOption(IStatusDialogConstants.YES_TO_ALL_ID,IStatusDialogConstants.YES_TO_ALL_LABEL,"",""));
- // options.add(new
- // StatusOption(IStatusDialogConstants.CANCEL_ID,IStatusDialogConstants.CANCEL_LABEL,"",""));
- // return options;
- // }
-
- //----------------------------------------------------------------------
-
- /**
- * Gets the SOAP rpcrouter servlet URL for the service project
- *
- * @param project
- * The project.
- * @param serverFactoryId
- * The server factory id
- * @param server
- * The server
- * @return The URL, possibly null.
- */
-
- public static String getServletURL(IProject project,
- String serverFactoryId, IServer server) {
- return getServletURL(getWebProjectURL(project, serverFactoryId, server));
- }
-
- public static String getServletURL(String webProjectURL) {
- if (webProjectURL == null)
- return null;
- else
- return webProjectURL + SERVLET_EXT;
- }
-
- /**
- * Gets the client Web project name
- *
- * @param projectName
- * The project name to base on.
- * @param typeId the webservice type id.
- * @return The client Web project name.
- *
- * @deprecated
- */
- public static String getClientWebProjectName(String projectName, String typeId)
- {
- String baseClientWebProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
- IPath projectPath;
- IProject project;
- boolean foundWebProject = false;
- int i = 1;
-
- if( isSkeletonEJBType( typeId ) )
- {
- // For the skeleton EJB scenario we need to create a slightly different
- // base name. When the EJB project is created another project
- // is created with "Client" tacked onto the end. We will
- // add "WS" to our client so we don't collide with the other
- // client project.
- baseClientWebProjectName = projectName + "WS" + DEFAULT_CLIENT_WEB_PROJECT_EXT;
- }
-
- String clientWebProjectName = baseClientWebProjectName;
-
- while (!foundWebProject)
- {
- projectPath = new Path(clientWebProjectName).makeAbsolute();
- project = ResourceUtils.getProjectOf(projectPath);
-
- if (project.exists() && !ResourceUtils.isWebProject(project))
- {
- clientWebProjectName = baseClientWebProjectName + i;
- i++;
- }
- else
- {
- foundWebProject = true;
- }
- }
-
- return clientWebProjectName;
- }
-
- public static String[] getClientProjectComponentName(String projectName, String componentName, boolean isEJB)
- {
- String clientProjectName = null;
- String clientComponentName = null;
- if (isEJB)
- {
- clientProjectName = projectName + DEFAULT_CLIENT_EJB_PROJECT_EXT;
- clientComponentName = componentName + DEFAULT_CLIENT_EJB_PROJECT_EXT;
- }
- else
- {
- clientProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-// String baseName = clientProjectName;
- clientComponentName = componentName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-// String baseCompName = clientComponentName;
- }
-
- //TODO we may want to remove this if statement once defect 103366 is resolved.
- //TODO: Defect 107997 - Revisit prject and module creation logic
-// if( !FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp() )
-// {
-// clientComponentName = clientProjectName;
-// }
-
-// boolean foundWebProject = false;
-// int i = 1;
-//
-// while (!foundWebProject)
-// {
-// IPath projectPath = new Path(clientProjectName).makeAbsolute();
-// IProject project = ResourceUtils.getProjectOf(projectPath);
-//
-// if (project.exists())
-// {
-// clientProjectName = baseName + i;
-// clientComponentName = baseCompName + i;
-// i++;
-// }
-// else
-// {
-// foundWebProject = true;
-// }
-// }
-
- return new String[]{clientProjectName, clientComponentName};
- }
-
- /**
- *
- * @param typeID
- * @return
- *
- * @deprecated
- */
- public static boolean isSkeletonEJBType( String typeID )
- {
- return typeID.equals( "org.eclipse.jst.ws.type.wsdl.ejb" );
- }
-
- public static String getDefaultEJBProjectName() {
- return DEFAULT_EJB_PROJECT_NAME;
- }
-
- public static String getDefaultEJBComponentName() {
- return DEFAULT_EJB_COMPONENT_NAME;
- }
-
- public static String getDefaultWebProjectName() {
- return DEFAULT_WEB_PROJECT_NAME;
- }
-
- public static String getDefaultWebComponentName() {
- return DEFAULT_WEB_COMPONENT_NAME;
- }
-
- public static String getDefaultClientExtension() {
- return DEFAULT_CLIENT_WEB_PROJECT_EXT;
- }
-
- /**
- *
- * @param projectName
- * @return
- *
- */
- public static String getRouterProjectName(String projectName) {
- return projectName + DEFAULT_ROUTER_PROJECT_EXT;
- }
-
- public static String getDefaultServiceEARProjectName() {
- return DEFAULT_SERVICE_EAR_PROJECT_NAME;
- }
-
- public static String getDefaultServiceEARComponentName() {
- return DEFAULT_SERVICE_EAR_COMPONENT_NAME;
- }
-
- public static String getDefaultClientEARProjectName() {
- return DEFAULT_CLIENT_EAR_PROJECT_NAME;
- }
-
- public static String getDefaultClientEARComponentName() {
- return DEFAULT_CLIENT_EAR_COMPONENT_NAME;
- }
-
- public static String getDefaultEARExtension() {
- return DEFAULT_EAR_EXT;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
deleted file mode 100644
index 57e412062..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class SelectionToResource implements Transformer
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object)
- */
- public Object transform(Object value)
- {
- IStructuredSelection selection = (IStructuredSelection)value;
- IResource resource = null;
-
- if( selection != null )
- {
- Object object = selection.getFirstElement();
-
- if( object != null )
- {
- if( object instanceof IResource)
- {
- resource = (IResource)object;
- }
- else if( object instanceof ICompilationUnit )
- {
- ICompilationUnit compUnit = (ICompilationUnit)object;
-
- try
- {
- resource = compUnit.getCorrespondingResource();
- }
- catch( JavaModelException exc)
- {
- }
- }
- else if( object instanceof EnterpriseBean )
- {
- EnterpriseBean ejbBean = (EnterpriseBean)object;
- IProject ejbProject = ProjectUtilities.getProject( ejbBean );
-
- if( ejbProject != null )
- {
- resource = ejbProject;
- }
- }
- }
- }
-
- return resource;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
deleted file mode 100644
index 087d51553..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
+++ /dev/null
@@ -1,809 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060330 124667 kathy@ca.ibm.com - Kathy Chan
- * 20061004 159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- * 20070119 159458 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IURLProvider;
-
-/**
- * This class contains useful methods for working with Server plugin functions
- */
-public final class ServerUtils {
-
- private Hashtable serverIdToLabel_;
-
- private Hashtable serverLabelToId_;
-
- private static ServerUtils instance_;
-
- public static ServerUtils getInstance() {
- if (instance_ == null) {
- instance_ = new ServerUtils();
- }
- return instance_;
-
- }
-
- public ServerUtils() {
- }
-
- // Gets the Server labels given the server factory id
- public void getServerLabelsAndIds() {
- serverIdToLabel_ = new Hashtable();
- serverLabelToId_ = new Hashtable();
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (int idx = 0; idx < serverTypes.length; idx++) {
-
- IServerType serverType = (IServerType) serverTypes[idx];
-
- String id = serverType.getId();
- String serverLabel = serverType.getName();
- if (!(id == null) && !(serverLabel == null)) {
- serverIdToLabel_.put(id, serverLabel);
- serverLabelToId_.put(serverLabel, id);
- }
- }
- }
-
- public String getServerLabelForId(String factoryId) {
- if (serverIdToLabel_ == null)
- this.getServerLabelsAndIds();
- return (String) serverIdToLabel_.get(factoryId);
- }
-
- public String getServerIdForLabel(String factoryLabel) {
- if (serverLabelToId_ == null)
- this.getServerLabelsAndIds();
- return (String) serverLabelToId_.get(factoryLabel);
- }
-
- public IStatus modifyModules(IEnvironment env, IServer server,
- IModule module, boolean add, IProgressMonitor monitor) {
-
- IServerWorkingCopy wc = null;
- IStatus status = Status.OK_STATUS;
-
- try {
-
- if (module == null || !module.getProject().exists()) {
- return status;
- }
-
- // check if module is a true Java project
- if (module instanceof IModule) {
- IModule pm = (IModule) module;
- if (pm != null) {
- IProject project = pm.getProject();
- if (project == null
- || ResourceUtils.isTrueJavaProject(project)) {
- return status;
- }
- }
- }
-
- wc = server.createWorkingCopy();
- if (wc != null) {
-// Object x = server.getAdapter(IRunningActionServer.class);
-// if (x != null && x instanceof IRunningActionServer) {
-// int state = server.getServerState();
-// if (state == IServer.STATE_STOPPED
-// || state == IServer.STATE_UNKNOWN) {
-// String mode = ILaunchManager.RUN_MODE;
-// server.synchronousStart(mode, monitor);
-// }
-// }
-
- List list = Arrays.asList(server.getModules());
- if (add) {
- if (!list.contains(module)) {
- ServerUtil.modifyModules(wc, new IModule[] { module },
- new IModule[0], monitor);
- }
- } else { // removes module
- if (list.contains(module)) {
- ServerUtil.modifyModules(wc, new IModule[0],
- new IModule[] { module }, monitor);
- }
- }
- } else {
- // handle case of Null WC; non-issue for now
- }
- }
- catch (CoreException exc )
- {
- status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, exc );
- env.getStatusHandler().reportError(status);
- return status;
- } finally {
- if (wc != null) {
- // Always saveAll and release the serverWorkingCopy
- try
- {
- wc.saveAll(true, monitor);
- }
- catch (CoreException exc )
- {
- status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, exc );
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
- return status;
- }
-
- public static IServer getServerForModule(IModule module, String serverTypeId,
- IServer server, boolean create, IProgressMonitor monitor) {
- if (server != null)
- return server;
- else
- return getServerForModule(module, serverTypeId, create, monitor);
- }
-
- public static IServer getServerForModule(IModule module,
- String serverTypeId, boolean create, IProgressMonitor monitor) {
- try {
-
- IServer[] servers = ServerUtil.getServersByModule(module, monitor);
-
- if (servers != null && servers.length > 0) {
- if (serverTypeId == null || serverTypeId.length() == 0)
- return servers[0]; // WSAD v4 behavior
-
- for (int i = 0; i < servers.length; i++) {
- if (servers[i].getServerType().getId().equalsIgnoreCase(
- serverTypeId))
- return servers[i];
- }
- }
-
- return createServer(module, serverTypeId, monitor);
-
- } catch (Exception e) {
- return null;
- }
- }
-
- public static IServer getServerForModule(IModule module) {
- try {
- IServer[] servers = ServerUtil.getServersByModule(module, null);
- return ((servers != null && servers.length > 0) ? servers[0] : null);
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- *
- * @param env
- * @param module
- * @param serverTypeId
- * @param monitor
- * @return
- *
- * @deprecated
- */
- public IServer createServer(IEnvironment env, IModule module,
- String serverTypeId, IProgressMonitor monitor) {
- IServerWorkingCopy serverWC = null;
- IServer server = null;
- try {
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- serverWC = serverType.createServer(serverTypeId, null, monitor);
- try {
- if (serverWC != null) {
- server = serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce)
- {
- IStatus status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, ce);
- env.getStatusHandler().reportError(status);
- return null;
- }
-
- if (server != null) {
-
-// Object x = server.getAdapter(IRunningActionServer.class);
-// if (x != null && x instanceof IRunningActionServer) {
-// int state = server.getServerState();
-// if (state == IServer.STATE_STOPPED
-// || state == IServer.STATE_UNKNOWN) {
-// String mode = ILaunchManager.RUN_MODE;
-// server.synchronousStart(mode, monitor);
-// }
-// }
-
- if (module != null && module.getProject().exists()) {
- IModule[] parentModules = server.getRootModules(module,
- monitor);
- if (parentModules != null && parentModules.length != 0) {
- module = (IModule) parentModules[0];
- }
- serverWC.modifyModules(new IModule[] { module },
- new IModule[0], monitor);
- }
-
- }
-
- return server;
- }
- catch (Exception e)
- {
- IStatus status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, e);
- env.getStatusHandler().reportError(status);
- return null;
- } finally {
- try {
- if (serverWC != null) {
- serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce) {
- IStatus status = StatusUtils.errorStatus( WSPluginMessages.MSG_ERROR_SERVER, ce);
- env.getStatusHandler().reportError(status);
- return null;
- }
- }
- }
-
- /**
- * createServer This creates a server but does not report errors. @param
- * module
- * @param serverTypeId
- * @param monitor progress monitor
- * @return IServer returns null if unsuccessful
- *
- * @deprecated
- */
- public static IServer createServer(IModule module, String serverTypeId,
- IProgressMonitor monitor) {
- IServerWorkingCopy serverWC = null;
- IServer server = null;
- try {
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- serverWC = serverType.createServer(serverTypeId, null, monitor);
-
- try {
- if (serverWC != null) {
- server = serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce) {
- return null;
- }
-
- if (server != null) {
-
-// Object x = server.getAdapter(IRunningActionServer.class);
-// if (x != null && x instanceof IRunningActionServer) {
-// int state = server.getServerState();
-// if (state == IServer.STATE_STOPPED
-// || state == IServer.STATE_UNKNOWN) {
-// String mode = ILaunchManager.RUN_MODE;
-// server.synchronousStart(mode, monitor);
-// }
-// }
- if (module != null) {
- IModule[] parentModules = server.getRootModules(module,
- monitor);
- if (parentModules != null && parentModules.length != 0) {
- module = (IModule) parentModules[0];
- }
- serverWC.modifyModules(new IModule[] { module },
- new IModule[0], monitor);
- }
-
- }
-
- return server;
- } catch (Exception e) {
- return null;
- } finally {
- try {
- if (serverWC != null) {
- serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce) {
- return null;
- // handler core exception
- }
- }
- }
-
- public static String[] getServerTypeIdsByModule(IVirtualComponent component) {
- IProject project = component.getProject();
- String[] serverIds = null;
-
- if (project != null) {
- IServer[] servers = ServerUtil.getServersByModule(getModule(project), null);
- if (servers != null) {
- serverIds = new String[servers.length];
-
- for (int index = 0; index < servers.length; index++) {
- serverIds[index] = servers[index].getId();
-
- }
- }
- }
-
- if (serverIds == null) {
- serverIds = new String[0];
- }
-
- return serverIds;
- }
-
- /**
- * @param project
- * @return
- * @deprecated should be using getServerTypeIdsByModule( IVirtualComponent )
- */
- public static String[] getServerTypeIdsByModule(IProject project) {
- Vector serverIds = new Vector();
- if (project != null) {
- IServer[] servers = ServerUtil.getServersByModule(ResourceUtils
- .getModule(project), null);
- if (servers != null && servers.length > 0) {
- for (int i = 0; i < servers.length; i++) {
- serverIds.add(servers[i].getId());
- }
- }
- }
- return (String[]) serverIds.toArray(new String[serverIds.size()]);
- }
-
- public static IModule getModule(IProject project) {
- return ServerUtil.getModule(project);
-}
-
-// Workaround for 113621
-//public static IModule getModule(IProject project) {
-// IModule[] modules = ServerUtil.getModules(project);
-// if (modules!=null && modules.length!=0) {
-// return modules[0];
-// }
-// return null;
-//}
-
- /**
- * Returns the URL string corresponding to the web server module root of the
- * component based on a server factory ID or null if the project has no Web nature
- * or the module root cannot be determined (e.g. For some types of
- * servers, we would not be able to get module root URL if the server has not been started).
- * Note that we are not relying on which server the module is currently associated with to determine
- * the correct module server root because the project might be associated with a server but we need the
- * module root based on another server factory ID.
- *
- * @param project
- * The project.
- * @param serverFactoryId server factory ID
- * @return The web server module root URL or null
- */
- public static String getWebComponentURL(IProject project, String serverFactoryId) {
- String webProjectURL = null;
- IModule module = getModule(project);
- if (module != null) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType!=null)
- {
- try {
- //Choose a Runtime which is not a stub
- IRuntime nonStubRuntime = null;
- IRuntime[] runtimes = ServerUtil.getRuntimes(null, null);
- String serverRuntimeTypeId = serverType.getRuntimeType().getId();
- for (int i = 0; i < runtimes.length; i++) {
- IRuntime runtime = runtimes[i];
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String thisRuntimeTypeId = runtimeType.getId();
- if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
- //Found an appropriate IRuntime that is not a stub
- nonStubRuntime = runtime;
- break;
- }
- }
- }
-
- if (nonStubRuntime != null)
- {
- IServerWorkingCopy serverWC = serverType.createServer(null, null, nonStubRuntime, null);
- IURLProvider urlProvider = (IURLProvider) serverWC.loadAdapter(IURLProvider.class, null);
- if (urlProvider!=null) {
- URL url = urlProvider.getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
- }
- }
- }
-
- } catch(CoreException ce){
- Logger.getLogger().log(ce);
- }
-
- }
- }
- return webProjectURL;
- }
-
- /**
- * Returns the URL string corresponding to the web server module root of the
- * component based on a server factory ID and server. Returns null if the project has no Web nature
- * or the module root cannot be determined (e.g. For some types of
- * servers, we would not be able to get module root URL if the server has not been started).
- * Note that we are not relying on which server the module is currently associated with to determine
- * the correct module server root because the project might be associated with a server but we need the
- * module root based on another server / server factory ID.
- *
- * @param project
- * The project.
- * @param serverFactoryId server factory ID
- * @param server Server id
- * @return The web server module root URL or null
- */
- public static String getWebComponentURL(IProject project,
- String serverFactoryId, IServer server) {
-
- String webProjectURL = null;
- IModule module = getModule(project);
- if (module != null) {
- if (server != null) {
- IURLProvider urlProvider = (IURLProvider) server.loadAdapter(IURLProvider.class, null);
- if (urlProvider!=null) {
- URL url = urlProvider.getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
- }
- }
- } else {
- webProjectURL = getWebComponentURL(project, serverFactoryId);
- }
- }
- return webProjectURL;
- }
-
- public static String getEncodedWebComponentURL(IProject project, String serverFactoryId) {
- String url = getWebComponentURL(project, serverFactoryId);
- return encodeURL(url);
- }
-
- public static String getEncodedWebComponentURL(IProject project, String serverFactoryId, IServer server) {
- String url = getWebComponentURL(project, serverFactoryId, server);
- return encodeURL(url);
- }
-
- public static String encodeURL(String url) {
- if (url != null) {
- int index = url.lastIndexOf('/');
- if (index != -1) {
- StringBuffer encodedURL = new StringBuffer();
- encodedURL.append(url.substring(0, index + 1));
- try {
- String ctxtRoot = URLEncoder.encode(url.substring(index + 1, url.length()), "UTF-8");
- int plusIndex = ctxtRoot.indexOf('+');
- while (plusIndex != -1) {
- StringBuffer sb = new StringBuffer();
- sb.append(ctxtRoot.substring(0, plusIndex));
- sb.append("%20");
- sb.append(ctxtRoot.substring(plusIndex + 1, ctxtRoot
- .length()));
- ctxtRoot = sb.toString();
- plusIndex = ctxtRoot.indexOf('+');
- }
- encodedURL.append(ctxtRoot);
- }catch (IOException io){
- //handler exception
- }
- url = encodedURL.toString();
- }
- }
- return url;
- }
-
- public static IServer getDefaultExistingServer(IVirtualComponent component) {
- IProject project = component.getProject();
- IModule module = getModule(project);
- IServer preferredServer = ServerCore.getDefaultServer(module);
- if (preferredServer != null)
- return preferredServer;
-
- IServer[] configuredServers = ServerUtil.getServersByModule(module,
- null);
-
- if (configuredServers != null && configuredServers.length > 0) {
- preferredServer = configuredServers[0];
- } else {
- IServer[] nonConfiguredServers = ServerUtil
- .getAvailableServersForModule(module, false, null);
-
- if (nonConfiguredServers != null
- && nonConfiguredServers.length > 0) {
- preferredServer = nonConfiguredServers[0];
- }
- }
-
- return preferredServer;
- }
-
- /**
- * @param project
- * @return
- * @deprecated should be using getDefaultExistingServer( IVirtualComponent )
- */
- public static IServer getDefaultExistingServer(IProject project) {
-
- IModule module = ServerUtil.getModule(project);
- IServer preferredServer = null;
- preferredServer = ServerCore.getDefaultServer(module);
-
-// Workaround for 113621
-// IModule[] modules = ServerUtil.getModules(project);
-// IServer preferredServer = null;
-// if (modules.length > 0){
-// preferredServer = ServerCore.getDefaultServer(modules[0]);
-// }
-
- if (preferredServer != null)
- return preferredServer;
-
- IServer[] configuredServers = ServerUtil.getServersByModule(
- ResourceUtils.getModule(project), null);
- if (configuredServers != null && configuredServers.length > 0) {
- return configuredServers[0];
- }
-
- IServer[] nonConfiguredServers = ServerUtil
- .getAvailableServersForModule(ResourceUtils.getModule(project),
- false, null);
- if (nonConfiguredServers != null && nonConfiguredServers.length > 0) {
- return nonConfiguredServers[0];
- }
- return null;
- }
-
- /*
- * @param moduleType - ad defined in IServerTargetConstants (i.e. EAR_TYPE,
- * WEB_TYPE, etc.) @param j2eeVersion String representation of the int
- * values in J2EEVersionConstants i.e. "12" or "13" or "14" @return String
- * the id of the server target - to be used in project creation operations.
- */
- public static String getServerTargetIdFromFactoryId(String serverFactoryId,
- String moduleType, String j2eeVersion) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType == null)
- return null;
-
- String serverRuntimeTypeId = serverType.getRuntimeType().getId();
-
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- List runtimes = Arrays.asList(ServerUtil.getRuntimes(moduleType, stJ2EEVersion));
- for (int i = 0; i < runtimes.size(); i++) {
- IRuntime runtime = (IRuntime) runtimes.get(i);
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String thisRuntimeTypeId = runtimeType.getId();
- if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
- return runtime.getId();
- }
- }
- }
-
- return null;
- }
-
- /*
- * @param serverFactoryId the server's factory id @returns the runtime type
- * id given the server's factory id. Returns a blank String if the no
- * ServerType exists for the given factory id.
- */
- public static String getRuntimeTargetIdFromFactoryId(String serverFactoryId) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType != null) {
- String serverRuntimeId = serverType.getRuntimeType().getId();
- return serverRuntimeId;
- } else
- return "";
- }
-
- public static String getFactoryIdFromRuntimeTargetId(String runtimeTargetId){
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (int i=0;i<serverTypes.length;i++) {
- IRuntimeType runtimeTyp = serverTypes[i].getRuntimeType();
- if (runtimeTyp!=null){
- if (runtimeTyp.getId().equals(runtimeTargetId))
- return serverTypes[i].getId();
- }
- }
- return "";
-
- }
-
-
- /*
- * @param serverFactoryId the server's factory id @returns the server type
- * id given the server's factory id. Returns a blank String if the no
- * ServerType exists for the given factory id.
- */
- public static String getServerTypeIdFromFactoryId(String serverFactoryId) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType != null) {
- String serverTypeId = serverType.getId();
- return serverTypeId;
- } else
- return "";
- }
-
- /*
- * @param j2eeVersion String representation of the int values in
- * J2EEVersionConstants i.e. "12" or "13" or "14"
- */
- public static boolean isTargetValidForEAR(String runtimeTargetId,
- String j2eeVersion) {
- if (runtimeTargetId == null)
- return false;
-
- String earModuleType = IModuleConstants.JST_EAR_MODULE;
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- List runtimes = Arrays.asList(ServerUtil.getRuntimes(earModuleType, stJ2EEVersion));
- for (int i = 0; i < runtimes.size(); i++) {
- IRuntime runtime = (IRuntime) runtimes.get(i);
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String thisId = runtimeType.getId();
- if (thisId.equals(runtimeTargetId))
- return true;
- }
- }
-
- return false;
- }
-
- /*
- * @param j2eeVersion String representation of the int values in
- * J2EEVersionConstants i.e. "12" or "13" or "14" @param the project type
- * from IServerTargetConstants
- */
- public static boolean isTargetValidForProjectType(String runtimeTargetId,
- String j2eeVersion, String projectType) {
- if (runtimeTargetId == null)
- return false;
-
- if (projectType == null || projectType.length() == 0)
- return false;
-
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- List runtimes = Arrays.asList(ServerUtil.getRuntimes(projectType, stJ2EEVersion));
- for (int i = 0; i < runtimes.size(); i++) {
- IRuntime runtime = (IRuntime) runtimes.get(i);
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String thisId = runtimeType.getId();
- if (thisId.equals(runtimeTargetId))
- return true;
- }
- }
-
- return false;
- }
-
- public static String getServerTargetJ2EEVersion(String j2eeVersion) {
-
- if (j2eeVersion == null || j2eeVersion.length() == 0)
- return null;
-
- int j2eeVersionInt = Integer.parseInt(j2eeVersion);
- switch (j2eeVersionInt) {
- case (J2EEVersionConstants.J2EE_1_2_ID):
- return IServerTargetConstants.J2EE_12;
- case (J2EEVersionConstants.J2EE_1_3_ID):
- return IServerTargetConstants.J2EE_13;
- case (J2EEVersionConstants.J2EE_1_4_ID):
- return IServerTargetConstants.J2EE_14;
- default:
- return null;
- }
- }
-
- //Converts a module type from J2EEUtils to a module type like
- //the one in IServerTargetConstants.
- public static String getServerTargetModuleType(int moduleType)
- {
- switch (moduleType)
- {
- case J2EEUtils.WEB :
- return IServerTargetConstants.WEB_TYPE;
- case J2EEUtils.EJB :
- return IServerTargetConstants.EJB_TYPE;
- case J2EEUtils.APPCLIENT :
- return IServerTargetConstants.APP_CLIENT_TYPE;
- case J2EEUtils.EAR :
- return IServerTargetConstants.EAR_TYPE;
- default:
- return null;
-
- }
- }
-
- /*
- * Returns a non-stub runtime if one is available for the the given server type.
- * @param serverFactoryId - server type id
- * @returns IRuntime Returns a non-stub runtime if one is available for the the given server type.
- * Returns null otherwise.
- */
- public static IRuntime getNonStubRuntime(String serverFactoryId)
- {
- //Find a Runtime which is not a stub
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- IRuntime nonStubRuntime = null;
- if (serverType != null)
- {
- //boolean foundNonStubRuntime = false;
- IRuntime[] runtimes = ServerUtil.getRuntimes(null, null);
- String serverRuntimeTypeId = serverType.getRuntimeType().getId();
- for (int i = 0; i < runtimes.length; i++)
- {
- IRuntime runtime = runtimes[i];
- IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType != null)
- {
- String thisRuntimeTypeId = runtimeType.getId();
- if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub())
- {
- // Found an appropriate IRuntime that is not a stub
- //foundNonStubRuntime = true;
- nonStubRuntime = runtime;
- break;
- }
- }
- }
- }
-
- return nonStubRuntime;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
deleted file mode 100644
index 1f499b036..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-
-public class StatusObjectHandler
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private static final int MAX_DETAILS = 16;
-
- public static IStatus generateTreeStatus (IStatus status)
- {
- //
- // There could be lots of Throwables, CoreExceptions,
- // WrappedExceptions and IStatus objects beneath the
- // given status. Find them.
- //
- LinkedList statusList = new LinkedList();
- appendStatus(MAX_DETAILS, statusList, status, status.getSeverity());
- if (statusList.size() > 0)
- {
- IStatus newStatus = (IStatus)statusList.removeFirst();
- if (statusList.size() > 0)
- {
- IStatus[] secondaryStatusArray = new IStatus[statusList.size()];
- int n = 0;
- Iterator i = statusList.iterator();
- while (i.hasNext())
- {
- secondaryStatusArray[n++] = (IStatus)i.next();
- }
- newStatus = new MultiStatus(status.getPlugin(),status.getCode(),secondaryStatusArray,status.getMessage(),status.getException());
- }
- return newStatus;
- }
- else
- return null;
- }
-
- //
- // Appends zero or more IStatus objects to the list of IStatus objects
- // based upon an IStatus.
- //
- private static int appendStatus ( int max, List statusList, IStatus status, int severity )
- {
- if (max > 0 && status != null)
- {
- //
- // Append an IStatus object for the given status' message.
- //
- if (status.getMessage() != null)
- {
- max = append(statusList,max,severity,status.getPlugin(),status.getCode(),status.getMessage(),status.getException());
- }
- //
- // Append the IStatus' Throwable, if any.
- //
- max = appendThrowable(max,statusList,status.getException(),severity);
- //
- // If the IStatus is a multi status, append the children.
- //
- IStatus[] children = status.getChildren();
- for (int i=0; i<children.length && max>0; i++)
- {
- max = appendStatus(max,statusList,children[i],severity);
- }
- }
- return max;
- }
-
- //
- // Appends zero or more IStatus objects to the list of IStatus objects
- // based upon a Throwable. WrappedExceptions and CoreExceptions are
- // given special treatment.
- //
- private static int appendThrowable ( int max, List statusList, Throwable throwable, int severity )
- {
- if (max > 0 && throwable != null)
- {
- //
- // Append an IStatus object for the exception's message.
- //
- if (throwable.getLocalizedMessage() != null)
- {
- max = append(statusList,max,severity,WebServicePlugin.ID,0,throwable.getLocalizedMessage(),throwable);
- }
- //
- // If the exception is a WrappedException, append the wrapped Exception.
- //
- if (throwable instanceof WrappedException)
- {
- WrappedException wexc = (WrappedException)throwable;
- max = appendThrowable(max,statusList,wexc.exception(),severity);
- }
- //
- // If the exception is a CoreException, append the enclosed IStatus.
- //
- if (throwable instanceof CoreException)
- {
- CoreException cexc = (CoreException)throwable;
- max = appendStatus(max,statusList,cexc.getStatus(),severity);
- }
- }
- return max;
- }
-
- //
- // Creates and appends an IStatus to the list of IStatus objects.
- //
- private static int append ( List statusList, int max, int severity, String id, int code, String message, Throwable throwable )
- {
- if (max > 0)
- {
- IStatus status = new Status(severity,id,code,message,throwable);
- statusList.add(status);
- max--;
- }
- return max;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2PathTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2PathTransformer.java
deleted file mode 100644
index da7e1da65..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2PathTransformer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-/**
- *
- * Transforms a input String to a Path
- *
- * @author joan
- *
- */
-
-public class String2PathTransformer implements Transformer {
-
- public Object transform(Object value) {
- Path path = new Path(value.toString());
- return path;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java
deleted file mode 100644
index 06067de1a..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060222 128094 joan@ca.ibm.com - Joan Haggarty
- * 20070305 175194 makandre@ca.ibm.com - Andrew Mak, Ant task InitialSelection only allows wsdl within the workspace
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * Transforms a string value representing a workspace resource path into a StructuredSelection object
- *
- * @author joan
- *
- */
-
-public class String2SelectionTransformer implements Transformer {
-
- public Object transform(Object value) {
-
- StructuredSelection selection = null;
- IResource resource = FileResourceUtils.getWorkspaceRoot().findMember(new Path(value.toString()));
- if (resource != null)
- {
- IProject resProject = resource.getProject();
- // check if resource is part of an EJB
- if (J2EEUtils.isEJBComponent(resProject))
- {
- // if resource is part of EJB need to get the EnterpriseBean as the selection
- IVirtualComponent[] ejbComponents = J2EEUtils.getEJBComponents(resProject);
- EJBArtifactEdit ejbEdit = null;
- try{
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[0]);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- EJBJar ejbJar = ejbRes.getEJBJar();
- IPath path = resource.getFullPath();
- String resourcePath = ResourceUtils.getJavaResourcePackageName(path);
- String javaClassName = resource.getName();
- // strip off file extension if necessary
- if (javaClassName.lastIndexOf('.')>-1)
- {
- javaClassName = javaClassName.substring(0, javaClassName.lastIndexOf('.'));
- }
- JavaClass javaClass = JavaMOFUtils.getJavaClass(resourcePath, javaClassName, resProject);
- EnterpriseBean ejb = ejbJar.getEnterpriseBeanWithReference(javaClass);
- if (ejb != null)
- {
- selection = new StructuredSelection(ejb.getName());
- }
- }
- catch (Exception exc)
- {
-
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- // if selection not already set - create it from the resource object
- if (selection == null)
- {
- selection = new StructuredSelection(resource);
- }
- }
- else if (value instanceof String && value.toString().indexOf(":") != -1) {
- // remote file
- selection = new StructuredSelection(value);
- }
- else
- {
- // string doesn't return resource - error condition
- throw new IllegalArgumentException(WSPluginMessages.ERROR_SELECTION_TRANSFORM);
- }
- return selection;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TestFacilityListTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TestFacilityListTransformer.java
deleted file mode 100644
index b8596054b..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TestFacilityListTransformer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-
-public class String2TestFacilityListTransformer implements Transformer {
-
- public Object transform(Object value) {
- String testFacility = (String)value;
- //value represents name of a test facility
- //pick up list of test facilities
- String[] testTypes = WebServicePlugin.getInstance().getScenarioContext().getWebServiceTestTypes();
-
- int index = 0;
- //match value to name of test facility and set index accordingly
- for (int i = 0; i < testTypes.length; i++) {
- if (testTypes[i].equals(testFacility))
- {
- break;
- }
- index++;
- }
-
- SelectionList selectionList = new SelectionList(testTypes, index);
- return selectionList;
- }
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.java
deleted file mode 100644
index de87fe13b..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060303 128832 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import java.util.Map;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.data.BeanModifier;
-
-public class String2TypeRuntimeServerModifier implements BeanModifier {
-
- private String SERVICE_RT_ID_KEY = "Service.RuntimeId"; //$NON-NLS-N$
- private String RUNTIME_ID = "RuntimeId"; //$NON-NLS-N$
- private String SERVICE_SRV_ID_KEY = "Service.ServerId"; //$NON-NLS-N$
- private String SERVER_ID = "ServerId"; //$NON-NLS-N$
- private String TYPE_ID = "TypeId"; //$NON-NLS-N$
- private String TD_EJB = "TOP DOWN EJB"; //$NON-NLS-N$
- private String BU_EJB = "BOTTOM UP EJB"; //$NON-NLS-N$
- private String TD_EJB_TYPE_ID = "1/org.eclipse.jst.ws.wsImpl.ejb";
- private String BU_EJB_TYPE_ID = "0/org.eclipse.jst.ws.wsImpl.ejb";
- private String SERVICE_PREFIX = "Service."; //$NON-NLS-N$
- private String CLIENT_PREFIX = "Client."; //$NON-NLS-N$
-
- /**
- * Modifies the supplied TypeRuntimeServer bean with properties in holder.
- * If the bean is null, construct a new one and set its properties.
- * @param bean TypeRuntimeServer bean to be modified
- * @param holder Map containing values for TypeRuntimeServer properties
- * @return TypeRuntimeServer with properties set
- */
- public void modify(Object bean, Object holder) {
-
- TypeRuntimeServer types = null;
- if (bean == null || !(bean instanceof TypeRuntimeServer))
- {
- types = new TypeRuntimeServer();
- }
- else
- {
- types = (TypeRuntimeServer)bean;
- }
-
- if (holder instanceof Map)
- {
- Map typesMap = (Map)holder;
- String prefix = "";
-
-
- if (typesMap.containsKey(SERVICE_RT_ID_KEY)||typesMap.containsKey(SERVICE_SRV_ID_KEY))
- {
- prefix = SERVICE_PREFIX;
- }
- else
- {
- prefix = CLIENT_PREFIX;
- }
-
- String runtimeID = (String)typesMap.get(prefix+RUNTIME_ID);
- if (runtimeID != null)
- types.setRuntimeId(runtimeID);
-
- String serverID = (String)typesMap.get(prefix+SERVER_ID);
- if (serverID != null)
- types.setServerId(serverID);
-
- //check if web service type is EJB - if not, default for Java bean types
- String typeID = (String)typesMap.get(prefix+TYPE_ID);
- if (typeID != null)
- {
- if (typeID.toUpperCase().equals(TD_EJB)) //only setting typeID specifically for EJB case
- {
- types.setTypeId(TD_EJB_TYPE_ID);
- }
- else if (typeID.toUpperCase().equals(BU_EJB))
- {
- types.setTypeId(BU_EJB_TYPE_ID);
- }
- }
- }
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
deleted file mode 100644
index c1b66d811..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-
-/**
- * Transfroms a java.lang.String to an org.eclipse.core.runtime.IProject
- */
-public class StringToIProjectTransformer implements Transformer
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object)
- * @param Object This must be a java.lang.String
- * @return Object Returns an IProject
- */
-
- public Object transform(Object value)
- {
- String project = (String)value;
- int slashIndex = project.indexOf( '/' );
- String projectName = project;
-
- if( slashIndex != -1 )
- {
- projectName = project.substring( 0, slashIndex );
- }
-
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
deleted file mode 100644
index bb5eaa3fe..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.jdt.core.JavaConventions;
-
-/**
- * This class contains some useful string utilities that are not provided by
- * either String or StringBuffer.
- *
- * @author Peter Moogk
- * @date July 13, 2000
-**/
-public final class StringUtils
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The platform-specific line separator.
- */
- public static final String NEWLINE = System.getProperty("line.separator");
-
- private StringUtils(){};
-
- /**
- * This method splits a single line of text into multiple lines
- * based on a maximum line length. The method will try to fit as
- * many words as possible onto a line without exceeding the maximum
- * line length. Note: the only case where a line might exceed the
- * maximum is if a single word is longer than the maximum.
- **/
- public static String[] splitter( String text, int max_length )
- {
- Vector return_text = new Vector(20);
- String[] return_str;
- int index = 0;
-
- while( index < text.length() )
- {
- String str = text.substring( index, Math.min( max_length + index,
- text.length() ) );
- int space_index = str.lastIndexOf( " " );
-
- if( index + str.length() < text.length() &&
- text.charAt( index + str.length() - 1 ) != ' ' &&
- text.charAt( index + str.length() ) != ' ' &&
- space_index != -1 )
- {
- return_text.addElement( str.substring( 0, space_index ) );
- index += space_index + 1;
- }
- else
- {
- return_text.addElement( str.trim() );
- index += str.length();
- }
- }
-
- return_str = new String[return_text.size()];
-
- for( index = 0; index < return_text.size(); index++ )
- {
- return_str[index] = (String)(return_text.elementAt(index));
- }
-
- return return_str;
- }
-
- /**
- * This method returns a string with a repeated number of characters.
- **/
- static public String repeat( char the_char, int count )
- {
- StringBuffer buf = new StringBuffer( count );
-
- for( int index = 0; index < count; index++ )
- {
- buf.append( the_char );
- }
-
- return buf.toString();
- }
-
- /**
- * This method flattens an array of arguments to a string.
- * The method respects embedded whitespace and quotes.
- * <ul>
- * <li>Any argument with embedded whitespace will be flattened out
- * with enclosing quotes. For example, the single argument
- * <u>Hello World</u>
- * will be returned as
- * <u>"Hello World"</u>.
- * <li>Any argument with quotes will be flattened out with the
- * quotes escaped. For example, the single argument
- * <u>"Happy days"</u>
- * will be returned as
- * <u>\"Happy days\"</u>.
- * </ul>
- * @param arguments The array of strings to flatten.
- * @return the flattened string.
- */
- static public String flattenArguments ( String[] arguments )
- {
- StringBuffer buf = new StringBuffer();
-
- for (int i=0; i<arguments.length; i++)
- {
- //
- // Append a separator (except the first time).
- //
- if (i > 0) buf.append(' ');
-
- //
- // Look for whitespace.
- //
- boolean whitespace = false;
- char[] chars = arguments[i].toCharArray();
- for (int j=0; !whitespace && j<chars.length; j++)
- {
- if (Character.isWhitespace(chars[j]))
- {
- whitespace = true;
- }
- }
-
- //
- // Append the argument, quoted as necessary.
- //
- if (whitespace) buf.append('"');
- for (int j=0; j<chars.length; j++)
- {
- if (chars[j] == '"') buf.append('\\');
- buf.append(chars[j]);
- }
- if (whitespace) buf.append('"');
- }
-
- return buf.toString();
- }
-
- /**
- * This method parses whitespace-delimitted filenames from
- * the given <code>input</code> stream. <b>Limitation:</b>
- * Quoted filenames or filenames with embedded whitespace
- * are not currently supported.
- * @param input The input stream.
- * @return An enumeration of filenames from the stream.
- */
- static public Enumeration parseFilenamesFromStream ( InputStream input )
- throws IOException
- {
- Vector filenames = new Vector(64,64);
- StringBuffer buffer = null;
- byte state = STATE_WS;
- int ic = input.read();
- while (ic >= 0)
- {
- char c = (char)ic;
- switch (state)
- {
- case STATE_WS:
- if (!Character.isWhitespace(c))
- {
- buffer = new StringBuffer();
- buffer.append(c);
- state = STATE_NWS;
- }
- break;
- case STATE_NWS:
- if (!Character.isWhitespace(c))
- {
- buffer.append(c);
- }
- else
- {
- String filename = buffer.toString();
- filenames.add(filename);
- buffer = null;
- state = STATE_WS;
- }
- break;
- default:
- break;
- }
- ic = input.read();
- }
- return filenames.elements();
- }
-
- private static final byte STATE_WS = 0;
- private static final byte STATE_NWS = 1;
-
-
- /**
- * Returns true is the type passed in is a primtive java type
- * @param class name String
- * @return true is primitive type
- */
- public static boolean isPrimitiveType(String typeName)
- {
-
- if (typeName.equalsIgnoreCase("boolean") ||
- typeName.equalsIgnoreCase("byte") ||
- typeName.equalsIgnoreCase("double") ||
- typeName.equalsIgnoreCase("float") ||
- typeName.equalsIgnoreCase("int") ||
- typeName.equalsIgnoreCase("long") ||
- typeName.equalsIgnoreCase("short") ||
- typeName.equalsIgnoreCase("char"))
- return true;
- return false;
-
- }
-
- /**
- * The method replace the characters that are allowed in URIs
- * and not allowed in Java class names to an underscore ('_')
- * @param URI String
- * @return valid Java class name String
- */
- public static String URI2ClassName( String uri ) {
- String className = uri;
- for ( int i = 0; i < URI_SYMBOLS.length; i++ ) {
- className = className.replace ( URI_SYMBOLS[i], UNDERSCORE );
- }
- return className;
- }
-
- private static final char[] URI_SYMBOLS = {'-', '~', '#', '/', '.'};
- private static final char UNDERSCORE = '_';
-
-
- /**
- * This returns a valid Java identifier based on the given name.
- * (follows JAX-RPC 1.0 Public Review Draft 2 recommendations)
- */
- public static String javaIdentifierFor(String localName)
- {
- StringBuffer result = new StringBuffer();
- boolean skipped = false;
- for (int i = 0, length = localName.length(); i < length; ++i)
- {
- char character = localName.charAt(i);
- if (Character.isJavaIdentifierPart(character) && !isDelimiter(character))
- {
- if (skipped && result.length() != 0)
- {
- character = Character.toUpperCase(character);
- }
- result.append(character);
- skipped = false;
- }
- else
- {
- skipped =true;
- }
- }
-
- if (!JavaConventions.validateIdentifier(result.toString()).isOK())
- {
- result.insert(0, "_");
- }
-
- return result.toString();
- }
-
- private static boolean isDelimiter(char character)
- {
- return "\u002D\u002E\u003A\u005F\u00B7\u0387\u06DD\u06DE".indexOf(character) != -1;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaBeanProperty.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaBeanProperty.java
deleted file mode 100644
index 9cfe27dba..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaBeanProperty.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This object represents a simple or indexed property
- * as defined by the Java Bean specification. Every
- * IJavaBeanProperty is characterized by four things:
- * <ol>
- * <li>The name of the property.</li>
- * <li>Whether or not the property is indexed.</li>
- * <li>The JDT IMethod of the getter, if any.</li>
- * <li>The JDT IMethod of the setter, if any.</li>
- * </ol>
- */
-public interface IJavaBeanProperty
-{
- /**
- * Returns the name of the property.
- * @return The name of the property.
- */
- public String getName ();
-
- /**
- * Returns true if and only if the property is indexed.
- * @return True if and only if the property is indexed.
- */
- public boolean isIndexed ();
-
- /**
- * Returns the JDT IMethod of the getter.
- * For indexed properties,
- * the return type of the getter will be an array.
- * For simple properties,
- * the return type of the getter will not be an array.
- * @return The JDT IMethod of the getter,
- * or null if this is a write-only property.
- */
- public IMethod getGetter ();
-
- /**
- * Returns the JDT IMethod of the indexed getter,
- * or null if this is either not an indexed property,
- * or is an indexed property but has only the array-
- * based getter.
- * @return The JDT IMethod of the indexed getter,
- * or null if this is not an indexed property or
- * if there is no indexed getter.
- */
- public IMethod getIndexedGetter ();
-
- /**
- * Returns the JDT IMethod of the setter.
- * For indexed properties,
- * the parameter type of the setter will be an array.
- * For simple properties,
- * the parameter type of the setter will not be an array.
- * @return The JDT IMethod of the setter,
- * or null if this is a read-only property.
- */
- public IMethod getSetter ();
-
- /**
- * Returns the JDT IMethod of the indexed setter,
- * or null if this is either not an indexed property,
- * or is an indexed property but has only the array-
- * based setter.
- * @return The JDT IMethod of the indexed setter,
- * or null if this is not an indexed property or
- * if there is no indexed setter.
- */
- public IMethod getIndexedSetter ();
-
- /**
- * Returns the type within which the getter and/or setter
- * of this property is declared, or null if none.
- * @return The type within which the getter and/or setter
- * of this property is declared.
- */
- public IType getDeclaringType ();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRule.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRule.java
deleted file mode 100644
index 0912c9d05..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRule.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * A Java Web service conformance Rule tests some collection
- * of Java resources that implement, or are meant to implement,
- * a Web service against a single, concise requirement as is
- * typically defined by a specification (eg. JAX-RPC, JSR 109)
- * or a runtime (eg. Apache Axis).
- * <p>
- * Every rule must have a namespace and a unique ID under that
- * that namespace. Every rule may have a short name and a long
- * description, both of which are recommended but optional.
- * <p>
- * Every rule follows a lifecycle of initialization, analysis
- * and completion. A Java Web service rule engine will drive
- * the <code>init()</code> method to initialize the rule, then
- * drive the various <code>visit...()</code> methods as it
- * navigates some collection of JDT resources, then drive the
- * <code>getResults()</code> method to indicate analysis is done
- * and retrieve a status object with the results of the analysis.
- */
-public interface IJavaWebServiceRule
-{
- /**
- * Returns the unique identifier of the rule
- * within the namespace to which the rule belongs.
- * @return The unique identifier of the rule.
- * Valid rule identifiers must not be negative.
- */
- public int getId ();
-
- /**
- * Returns the namespace to which this rule belongs.
- * @return The namespace to which this rule belongs.
- * Never returns null.
- */
- public String getNamespace ();
-
- /**
- * Returns the translatable short name of this rule.
- * @return The translatable short name of this rule,
- * or null if the rule has no name.
- */
- public String getName ();
-
- /**
- * Returns the translatable description of this rule.
- * @return The translatable description of this rule,
- * or null if the rule has no description.
- */
- public String getDescription ();
-
- /**
- * Called by the rule engine to give this rule a chance
- * to initialize itself prior to visiting JDT objects.
- * @param engine The engine initializing this rule.
- */
- public void init ( IJavaWebServiceRuleEngine engine );
-
- /**
- * Called by the rule engine when it decides to visit
- * a Java class (ie. primitive types are excluded).
- * @param jdtClass The class to visit.
- * @param peanutTrail The trail of objects back to the root.
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail );
-
- /**
- * Called by the rule engine when it decides to visit
- * a Java class found on the throws clause of a method.
- * @param jdtClass The exception class to visit.
- * @param peanutTrail The trail of objects back to the root.
- */
- public void visitException ( IType jdtClass, Stack peanutTrail );
-
- /**
- * Called by the rule engine when it decides to visit
- * a field belonging to a class.
- * @param jdtField The field to visit.
- * @param peanutTrail The trail of objects back to the root.
- */
- public void visitField ( IField jdtField, Stack peanutTrail );
-
- /**
- * Called by the rule engine when it decides to visit
- * a Java Bean property (ie. represented by a "get" and/or
- * "set" method) beloning to a class.
- * @param beanProperty The property to visit.
- * @param peanutTrail The trail of objects back to the root.
- */
- public void visitProperty ( IJavaBeanProperty beanProperty, Stack peanutTrail );
-
- /**
- * Called by the rule engine when it decides to visit a method.
- * @param jdtMethod The method to visit.
- * @param peanutTrail The trail of objects back to the root.
- */
- public void visitMethod ( IMethod jdtMethod, Stack peanutTrail );
-
- /**
- * Called by the rule engine after all JDT objects have
- * been visited so that the rule can return a status
- * object (usually a multi-status) with a summary of
- * any violations by JDT objects detected by this rule.
- * @return The results of the rule's analysis.
- */
- public IStatus getResults ();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRuleEngine.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRuleEngine.java
deleted file mode 100644
index 23ef0b6ab..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRuleEngine.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This is an engine that walks a JDT model and runs rules.
- */
-public interface IJavaWebServiceRuleEngine
-{
- /**
- * Analyzes the given class in the context of the given
- * project for compliance to a set of JAX-RPC rules.
- * @param project The project context of the analysis.
- * @param rootClass The IType of the class to analyze.
- * @param rules The rules to use for the analysis.
- * @return An IStatus summarizing the results of the analysis.
- */
- public IStatus analyze ( IProject project, IType rootClass, JavaWebServiceRuleSet rules );
-
- /**
- * Returns the JDTResolver in use by this analyzer.
- * The JDTResolver is guaranteed not to be null only
- * after the analyze method has been invoked and before
- * the first rule is visited. This method is intended
- * for use by implementations of IJavaWebServiceRule.
- * @return The JDTResolver in use by this analyzer.
- */
- public JDTResolver getJDTResolver ();
-
- /**
- * Returns the progress monitor in use by this analyzer,
- * or null if no progress monitor is in use.
- * This method is intended for use by implementations
- * of IJavaWebServiceRule.
- * @return The progress monitor in use by this analyzer,
- * or null for none.
- */
- public IProgressMonitor getProgressMonitor ();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceAnalyzer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceAnalyzer.java
deleted file mode 100644
index 115efb770..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceAnalyzer.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20060607 145604 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.rules.JAXRPCRuleSetFactory;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This class provides convenience methods for analyzing
- * compliance of Java service classes and value types to
- * the JAX-RPC 1.1 specification. Typical usage of this
- * class:
- * <code>
- * IType type = JAXRPCWebServiceAnalyzer.asType(myJavaFileResource);
- * JavaWebServiceRuleSet rules = JAXRPCWebServiceAnalyzer.getRuleSet();
- * JAXRPCWebServiceAnalyzer.getRuleEngine().analyze(type,rules,myProgressMonitor);
- * </code>
- * @author cbrealey
- */
-public class JAXRPCWebServiceAnalyzer
-{
- private JavaWebServiceRuleSet ruleSet_;
-
- /**
- * Constructs a new JAX-RPC Web service analyzer,
- * a convenience class wrapped around a
- * JAXRPCWebServiceAnalyzer.
- */
- public JAXRPCWebServiceAnalyzer ()
- {
- ruleSet_ = JAXRPCRuleSetFactory.newRuleSet();
- }
-
- /**
- * Returns the set of rules in use, the contents of
- * which can be manipulated and will be respected by
- * this analyzer. In other words, this method returns a
- * reference to, not a copy of, the set of rules in use.
- * @return The set of rules in use by the analyzer.
- */
- public JavaWebServiceRuleSet getRuleSet ()
- {
- return ruleSet_;
- }
-
- /**
- * Analyzes the Java service class represented by the given
- * JDT type for compliance to the JAX-RPC for compliance to
- * the JAX-RPC specification.
- * Progress monitoring is provided by the given monitor.
- * @param project The project context in which the analysis
- * should take place.
- * @param rootClass The Java service class to analyze.
- * @param monitor The progress monitor to use,
- * or null if monitoring is not desired.
- * @return A status object whose severity, message and
- * child status objects, if any, describe any JAX-RPC
- * rules that may be compromised by the service class.
- * Never returns null.
- */
- public IStatus analyze ( IProject project, IType rootClass, IProgressMonitor monitor )
- {
- IJavaWebServiceRuleEngine engine = new JAXRPCWebServiceRuleEngine(monitor);
- return engine.analyze(project,rootClass,ruleSet_);
- }
-
- /**
- * Analyzes the Java service class represented by the given
- * JDT type for compliance to the JAX-RPC for compliance to
- * the JAX-RPC specification.
- * Progress monitoring is provided by the given monitor.
- * @param project The project context in which the analysis
- * should take place.
- * @param rootClass The fully qualified name of the
- * Java service class to analyze.
- * @param monitor The progress monitor to use,
- * or null if monitoring is not desired.
- * @return A status object whose severity, message and
- * child status objects, if any, describe any JAX-RPC
- * rules that may be compromised by the service class.
- * Never returns null.
- */
- public IStatus analyze ( IProject project, String rootClass, IProgressMonitor monitor )
- {
- try
- {
- IType rootType = asType(rootClass,project);
- if (rootType == null)
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_UNRESOLVED_CLASS,rootClass,project.getName());
- return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,message,null);
- }
- return analyze(project,rootType,monitor);
- }
- catch (JavaModelException e)
- {
- // An exception may be thrown from the call to asType(...),
- // not from the call to analyze(...). Exceptions within the
- // analyze(...) method are captured in the returned IStatus.
- return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e);
- }
- }
-
- /**
- * Analyzes the Java service class represented by the given
- * ".java" compilation unit or ".class" file for compliance
- * to the JAX-RPC specification.
- * Progress monitoring is provided by the given monitor.
- * @param project The project context in which the analysis
- * should take place.
- * @param rootClass The Java service class to analyze.
- * @param monitor The progress monitor to use,
- * or null if monitoring is not desired.
- * @return A status object whose severity, message and
- * child status objects, if any, describe any JAX-RPC
- * rules that may be compromised by the service class.
- * Never returns null.
- */
- public IStatus analyze ( IProject project, IFile rootClass, IProgressMonitor monitor )
- {
- try
- {
- IType rootType = asType(rootClass);
- if (rootType == null)
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_UNRESOLVED_CLASS,rootClass.getFullPath().toString(),project.getName());
- return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,message,null);
- }
- return analyze(project,rootType,monitor);
- }
- catch (JavaModelException e)
- {
- // An exception may be thrown from the call to asType(...),
- // not from the call to analyze(...). Exceptions within the
- // analyze(...) method are captured in the returned IStatus.
- return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e);
- }
- }
-
- /**
- * Returns the Java type represented by the given file,
- * or null if no such type can be clearly determined.
- * @param file The file whose type to infer, usually a
- * ".java" or ".class" file. For ".java" files, this
- * method will return the primary type.
- * @return The inferred JDT Java type.
- * @throws JavaModelException If the given file could not
- * mapped to a JDT IType.
- */
- private static IType asType ( String qname, IProject project )
- throws JavaModelException
- {
- IType type = null;
- IJavaElement javaElement = JavaCore.create(project);
- if (javaElement instanceof IJavaProject)
- {
- IJavaProject javaProject = (IJavaProject)javaElement;
- type = javaProject.findType(qname);
- }
- return type;
- }
- /**
- * Returns the Java type represented by the given file,
- * or null if no such type can be clearly determined.
- * @param file The file whose type to infer, usually a
- * ".java" or ".class" file. For ".java" files, this
- * method will return the primary type.
- * @return The inferred JDT Java type.
- * @throws JavaModelException If the given file could not
- * mapped to a JDT IType.
- */
- private static IType asType ( IFile file )
- throws JavaModelException
- {
- IType type = null;
- IJavaElement javaElement = JavaCore.create(file);
- if (javaElement instanceof ICompilationUnit)
- {
- ICompilationUnit compilationUnit = (ICompilationUnit)javaElement;
- type = compilationUnit.findPrimaryType();
- }
- else if (javaElement instanceof IClassFile)
- {
- IClassFile classFile = (IClassFile)javaElement;
- type = classFile.getType();
- }
- return type;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceRuleEngine.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceRuleEngine.java
deleted file mode 100644
index 33597f06f..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceRuleEngine.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711 149411 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author cbrealey
- * This engine navigated JDT classes according to a JAX-RPC
- * interpretation. The root class is considered to be a
- * candidate JAX-RPC service class, and any non-standard
- * or non-primitive types used by the methods of the service
- * class are considered to be candidates for JAX-RPC value
- * type classes.
- */
-public class JAXRPCWebServiceRuleEngine implements IJavaWebServiceRuleEngine
-{
- /**
- * Creates a new JAX-RPC analysis engine with the given
- * progress monitor.
- * @param progressMonitor The progress monitor for the
- * engine to use, or null if monitoring is not desired.
- */
- public JAXRPCWebServiceRuleEngine ( IProgressMonitor progressMonitor )
- {
- progressMonitor_ = progressMonitor;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine#analyze(org.eclipse.core.resources.IProject, org.eclipse.jdt.core.IType, org.eclipse.jst.ws.internal.conformance.JavaWebServiceRuleSet, org.eclipse.core.runtime.IProgressMonitor)
- */
- public IStatus analyze ( IProject project, IType rootClass, JavaWebServiceRuleSet rules )
- {
- visited_ = new HashSet();
- peanutTrail_ = new Stack();
- resolver_ = new JDTResolver(project,progressMonitor_);
- IStatus status = null;
- rules.init(this);
- try
- {
- analyzeServiceClass(rootClass,rules);
- String inCaseOfFailureMessage = NLS.bind(WSPluginMessages.MSG_JAXRPC11_NOT_COMPLIANT,rootClass.getFullyQualifiedName());
- status = rules.getResults(inCaseOfFailureMessage);
- }
- catch (JavaModelException e)
- {
- status = new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal Error",e);
- }
- return status;
- }
-
- private void analyzeServiceClass ( IType type, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- rules.visitClass(type,peanutTrail_);
- visited_.add(type.getFullyQualifiedName());
- push(type);
- try
- {
- IType[] superClasses = resolver_.getSuperClasses(type);
- IMethod[] methods = resolver_.getPublicMethods(type,superClasses);
- for (int m=0; m<methods.length; m++)
- {
- analyzeMethod(methods[m],rules);
- }
- }
- finally
- {
- pop();
- }
- }
-
- private void analyzeMethod ( IMethod method, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- rules.visitMethod(method,peanutTrail_);
- push(method);
- try
- {
- IType returnType = resolver_.getReturnType(method);
- analyzeDataType(returnType,rules);
- IType[] parameterTypes = resolver_.getParameterTypes(method);
- for (int p=0; p<parameterTypes.length; p++)
- {
- analyzeDataType(parameterTypes[p],rules);
- }
- IType[] exceptionTypes = resolver_.getExceptionTypes(method);
- for (int e=0; e<exceptionTypes.length; e++)
- {
- analyzeExceptionType(exceptionTypes[e],rules);
- }
- }
- finally
- {
- pop();
- }
- }
-
- private void analyzeDataType ( IType type, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- if (type != null && !resolver_.isStandardType(type.getFullyQualifiedName()) && !visited_.contains(type.getFullyQualifiedName()))
- {
- rules.visitClass(type,peanutTrail_);
- visited_.add(type.getFullyQualifiedName());
- push(type);
- try
- {
- IType[] superClasses = resolver_.getSuperClasses(type);
- IField[] fields = resolver_.getPublicFields(type,superClasses);
- for (int f=0; f<fields.length; f++)
- {
- analyzeField(fields[f],rules);
- }
- IJavaBeanProperty[] properties = resolver_.getPublicProperties(type,superClasses);
- for (int p=0; p<properties.length; p++)
- {
- analyzeProperty(properties[p],rules);
- }
- }
- finally
- {
- pop();
- }
- }
- }
-
- private void analyzeField ( IField field, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- if (field != null)
- {
- rules.visitField(field,peanutTrail_);
- push(field);
- try
- {
- //TODO: Get qualified name of the field type
- //and determine if we need to build an IType
- //for it and analyze it.
- IType type = resolver_.getFieldType(field);
- analyzeDataType(type,rules);
- }
- finally
- {
- pop();
- }
- }
- }
-
- private void analyzeProperty ( IJavaBeanProperty property, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- if (property != null)
- {
- rules.visitProperty(property,peanutTrail_);
- push(property);
- try
- {
- IType type = resolver_.getPropertyType(property);
- analyzeDataType(type,rules);
- }
- finally
- {
- pop();
- }
- }
- }
-
- private void analyzeExceptionType ( IType type, JavaWebServiceRuleSet rules )
- throws JavaModelException
- {
- if (type != null && !resolver_.isStandardType(type.getFullyQualifiedName()) && !visited_.contains(type.getFullyQualifiedName()))
- {
- rules.visitException(type,peanutTrail_);
- visited_.add(type.getFullyQualifiedName());
- push(type);
- try
- {
- // We trust java.lang.Exception/Throwable as superclasses
- // for service specific exception classes, therefore we do
- // not try to analyze their properties (some of which would
- // otherwise violate JAX-RPC's rules anyways).
- IType[] superClasses = resolver_.getSuperClasses(type,"java.lang.Exception");
- IJavaBeanProperty[] properties = resolver_.getPublicProperties(type,superClasses);
- for (int p=0; p<properties.length; p++)
- {
- analyzeProperty(properties[p],rules);
- }
- }
- finally
- {
- pop();
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine#getJDTResolver()
- */
- public JDTResolver getJDTResolver ()
- {
- return resolver_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine#getProgressMonitor()
- */
- public IProgressMonitor getProgressMonitor ()
- {
- return progressMonitor_;
- }
-
- /*
- * Pushes a peanut onto the peanut trail.
- */
- private void push ( Object peanut )
- {
- peanutTrail_.push(peanut);
- }
-
- /*
- * Pops a peanut off the peanut trail.
- */
- private void pop ()
- {
- peanutTrail_.pop();
- }
-
- /*
- * The JDTResolver used by this analyzer.
- */
- private JDTResolver resolver_;
-
- /*
- * The progress monitor used by this analyzer.
- */
- private IProgressMonitor progressMonitor_;
-
- /*
- * This set keeps track of the fully qualified names of
- * classes we have visited so that we don't visit the same
- * service class, value type or exception class more than once.
- */
- private Set visited_;
-
- /*
- * This stack keeps a trail of JDT objects back to the
- * service class we began with. This can be useful to
- * visitors that need to inspect the JDT elements that
- * enclose the currently visited element.
- */
- private Stack peanutTrail_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JDTResolver.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JDTResolver.java
deleted file mode 100644
index bdc5748ac..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JDTResolver.java
+++ /dev/null
@@ -1,883 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711 149411 cbrealey@ca.ibm.com - Chris Brealey
- * 20070102 196371 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-
-/**
- * @author cbrealey
- * A JDTResolver provides several convenience methods for
- * navigating references between Java classes, methods,
- * fields and properties. A JDTResolver is constructed
- * for a Java project whose effective classpath will
- * govern the scope of search operations performed by the
- * JDTResolver whenever it needs to convert a signature
- * into a JDT IType object.
- */
-public class JDTResolver
-{
- /**
- * Creates a new JDTResolver for the given project.
- * @param project The project providing the context
- * @param monitor The progress monitor for this resolver
- * to use, or null if progress monitoring is not desired.
- * within which this resolver will search for classes.
- */
- public JDTResolver ( IProject project, IProgressMonitor monitor )
- {
- javaProject_ = JavaCore.create(project);
- monitor_ = monitor;
- }
-
- /**
- * Returns true if and only if the given JDT IType is an interface.
- * @param jdtType The type to analyze.
- * @return True if and only if the given JDT IType is an interface.
- * @throws JavaModelException If the JDT model fails to
- * analyze the given type.
- */
- public boolean isInterface ( IType jdtType )
- throws JavaModelException
- {
- return jdtType.isInterface();
- }
-
- /**
- * Returns true if and only if the given JDT IType is an abstract class.
- * @param jdtType The type to analyze.
- * @return True if and only if the given JDT IType is an abstract class.
- * @throws JavaModelException If the JDT model fails to
- * analyze the given type.
- */
- public boolean isAbstract ( IType jdtType )
- throws JavaModelException
- {
- return Flags.isAbstract(jdtType.getFlags());
- }
-
- /**
- * Returns true if and only if instances of the given JDT IType
- * can be instantiated via a public default constructor. The class
- * must have an explicit public default constructor, or have no
- * explicit constructors at all to meet this criteria.
- * @param jdtType The type to analyze.
- * @return True if and only if instances of the type are
- * public default constructable.
- * @throws JavaModelException If the JDT model fails to
- * analyze the given type.
- */
- public boolean isConstructable ( IType jdtType )
- throws JavaModelException
- {
- IMethod[] methods = jdtType.getMethods();
- int numberOfConstructors = 0;
- for (int m=0; m<methods.length; m++)
- {
- if (methods[m].isConstructor())
- {
- numberOfConstructors++;
- if (methods[m].getNumberOfParameters() == 0 && Flags.isPublic(methods[m].getFlags()))
- {
- return true;
- }
- }
- }
- return numberOfConstructors == 0;
- }
-
- /**
- * Returns true if and only if the given fully qualified
- * type name is a type from the standard JDK, that is,
- * if the given type name belongs under the "java" or
- * "javax" packages.
- * @param typeName The name of the type to check.
- * @return True if and only if the type is a non-primitive,
- * Java standard type.
- */
- public boolean isStandardType ( String typeName )
- {
- return typeName.startsWith("java.") || typeName.startsWith("javax.");
- }
-
- /**
- * Returns true if and only if the given type name is a
- * Java primitive type.
- * @param typeName The name of the type to check.
- * @return True if and only if the type is a Java primitive type.
- */
- public boolean isPrimitiveType ( String typeName )
- {
- for (int i=0; i<primitiveTypes_.length; i++)
- {
- if (primitiveTypes_[i].equals(typeName))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns true if and only if the given fully qualified
- * type name is a Java wrapper type.
- * @param typeName The name of the type to check.
- * @return True if and only if the type is a Java wrapper type.
- */
- public boolean isWrapperType ( String typeName )
- {
- for (int i=0; i<wrapperTypes_.length; i++)
- {
- if (wrapperTypes_[i].equals(typeName))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns true if and only if the given fully qualified
- * type name is a Java primitive or standard type supported
- * by the JAX-RPC specification.
- * @param typeName The name of the type to check.
- * @return True if and only if the type is a Java wrapper type.
- */
- public boolean isJAXRPCStandardType ( String typeName )
- {
- for (int i=0; i<jaxrpcTypes_.length; i++)
- {
- if (jaxrpcTypes_[i].equals(typeName))
- {
- return true;
- }
- }
- if (isWrapperType(typeName) && !"java.lang.Character".equals(typeName))
- {
- return true;
- }
- if (isPrimitiveType(typeName) && !"char".equals(typeName))
- {
- return true;
- }
- return false;
- }
-
- /**
- * Returns an array of zero or more JDT IType objects
- * for the public fields belonging to the given type
- * @param jdtType The type to analyze.
- * @param jdtSuperTypes Any supertypes to analyze,
- * or null to analyze only the <code>jdtType</code>.
- * @return An array of zero or more public field types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given types to satisfy this request.
- */
- public IField[] getPublicFields ( IType jdtType, IType[] jdtSuperClasses )
- throws JavaModelException
- {
- List fieldsList = new LinkedList();
- harvestPublicFields(jdtType,fieldsList);
- if (jdtSuperClasses != null)
- {
- for (int t=0; t<jdtSuperClasses.length; t++)
- {
- harvestPublicFields(jdtSuperClasses[t],fieldsList);
- }
- }
- return (IField[])fieldsList.toArray(new IField[0]);
- }
-
- /**
- * Returns an array of zero or more JDT IMethod objects
- * for the public methods belonging to the given type.
- * @param jdtType The type to analyze.
- * @param jdtSuperTypes Any supertypes to analyze,
- * or null to analyze only the <code>jdtType</code>.
- * @return An array of zero or more public methods.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given types to satisfy this request.
- */
- public IMethod[] getPublicMethods ( IType jdtType, IType[] jdtSuperClasses )
- throws JavaModelException
- {
- List methodsList = new LinkedList();
- harvestPublicMethods(jdtType,methodsList);
- if (jdtSuperClasses != null)
- {
- for (int t=0; t<jdtSuperClasses.length; t++)
- {
- harvestPublicMethods(jdtSuperClasses[t],methodsList);
- }
- }
- return (IMethod[])methodsList.toArray(new IMethod[0]);
- }
-
- /**
- * Returns an array of zero or more JDT IType objects
- * for the public properties (getters and/or setters)
- * belonging to the given type.
- * @param jdtType The type to analyze.
- * @param jdtSuperTypes Any supertypes to analyze,
- * or null to analyze only the <code>jdtType</code>.
- * @return An array of zero or more public property types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given types to satisfy this request.
- */
- public IJavaBeanProperty[] getPublicProperties ( IType jdtType, IType[] jdtSuperClasses )
- throws JavaModelException
- {
- IMethod[] methods = getPublicMethods(jdtType,jdtSuperClasses);
- Map properties = new HashMap();
- for (int m=0; m<methods.length; m++)
- {
- String name = getGetterName(methods[m]);
- if (name != null)
- {
- JavaBeanProperty property = (JavaBeanProperty)properties.get(name);
- if (property == null)
- {
- property = new JavaBeanProperty();
- property.setName(name);
- properties.put(name,property);
- }
- property.setGetter(methods[m]);
- }
- else
- {
- name = getSetterName(methods[m]);
- if (name != null)
- {
- JavaBeanProperty property = (JavaBeanProperty)properties.get(name);
- if (property == null)
- {
- property = new JavaBeanProperty();
- property.setName(name);
- properties.put(name,property);
- }
- property.setSetter(methods[m]);
- }
- }
- }
- return (IJavaBeanProperty[])properties.values().toArray(new JavaBeanProperty[0]);
- }
-
- /**
- * Returns the JDT IType object for the given field.
- * @param jdtField The field to analyze.
- * @return The field type.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given field to satisfy this request.
- */
- public IType getFieldType ( IField jdtField )
- throws JavaModelException
- {
- IJavaElement elem = jdtField.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String signature = jdtField.getTypeSignature();
- String typeName = getTypeNameFromSignature(signature);
- return findType(typeName,ancestor);
- }
-
- /**
- * Returns the type name for the given field.
- * @param jdtField The field to analyze.
- * @return The field type name.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given field to satisfy this request.
- */
- public String getFieldTypeName ( IField jdtField )
- throws JavaModelException
- {
- IJavaElement elem = jdtField.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String signature = jdtField.getTypeSignature();
- String typeName = getTypeNameFromSignature(signature);
- return resolveType(typeName,ancestor);
- }
-
- /**
- * Returns the JDT IType object for the given bean property.
- * @param javaBeanProperty The bean property to analyze.
- * @return The property type.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given bean property to satisfy this request.
- */
- public IType getPropertyType ( IJavaBeanProperty javaBeanProperty )
- throws JavaModelException
- {
- IMethod method = javaBeanProperty.getGetter();
- if (method != null)
- {
- return getReturnType(method);
- }
- else
- {
- method = javaBeanProperty.getSetter();
- if (method != null)
- {
- IType[] parameters = getParameterTypes(method);
- if (parameters.length > 0)
- {
- //
- // It's the last parameter's type we want,
- // for indexed or non-indexed setters.
- //
- return parameters[parameters.length-1];
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the type name for the given bean property.
- * @param javaBeanProperty The bean property to analyze.
- * @return The property type name.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given bean property to satisfy this request.
- */
- public String getPropertyTypeName ( IJavaBeanProperty javaBeanProperty )
- throws JavaModelException
- {
- IMethod method = javaBeanProperty.getGetter();
- if (method != null)
- {
- return getReturnTypeName(method);
- }
- else
- {
- method = javaBeanProperty.getSetter();
- if (method != null)
- {
- String[] parameterTypeNames = getParameterTypeNames(method);
- if (parameterTypeNames.length > 0)
- {
- return parameterTypeNames[0];
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the JDT IType object for the return type
- * of the given method, or null if the method is void.
- * @param jdtMethod The method to analyze.
- * @return The method return type, or null if none.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public IType getReturnType ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String signature = jdtMethod.getReturnType();
- String typeName = getTypeNameFromSignature(signature);
- return findType(typeName,ancestor);
- }
-
- /**
- * Returns the type name for the return type
- * of the given method, or null if the method is void.
- * @param jdtMethod The method to analyze.
- * @return The method return type name, or null if none.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public String getReturnTypeName ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String signature = jdtMethod.getReturnType();
- String typeName = getTypeNameFromSignature(signature);
- return resolveType(typeName,ancestor);
- }
-
- /**
- * Returns an array of zero or more JDT IType objects
- * for the parameters of the given method.
- * @param jdtMethod The method to analyze.
- * @return An array of zero or more parameter types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public IType[] getParameterTypes ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String[] signatures = jdtMethod.getParameterTypes();
- IType[] types = new IType[signatures.length];
- for (int s=0; s<signatures.length; s++)
- {
- String typeName = getTypeNameFromSignature(signatures[s]);
- types[s] = findType(typeName,ancestor);
- }
- return types;
- }
-
- /**
- * Returns an array of zero or more type names
- * for the parameters of the given method.
- * @param jdtMethod The method to analyze.
- * @return An array of zero or more parameter type names.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public String[] getParameterTypeNames ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String[] signatures = jdtMethod.getParameterTypes();
- String[] typeNames = new String[signatures.length];
- for (int s=0; s<signatures.length; s++)
- {
- String typeName = getTypeNameFromSignature(signatures[s]);
- typeNames[s] = resolveType(typeName,ancestor);
- }
- return typeNames;
- }
-
- /**
- * Returns an array of zero or more JDT IType objects
- * for the exceptions thrown by the given method.
- * @param jdtMethod The method to analyze.
- * @return An array of zero or more exception types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public IType[] getExceptionTypes ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String[] signatures = jdtMethod.getExceptionTypes();
- IType[] types = new IType[signatures.length];
- for (int s=0; s<signatures.length; s++)
- {
- String typeName = getTypeNameFromSignature(signatures[s]);
- types[s] = findType(typeName,ancestor);
- }
- return types;
- }
-
- /**
- * Returns an array of zero or more type names
- * for the exceptions thrown by the given method.
- * @param jdtMethod The method to analyze.
- * @return An array of zero or more exception type names.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given method to satisfy this request.
- */
- public String[] getExceptionTypeNames ( IMethod jdtMethod )
- throws JavaModelException
- {
- IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
- IType ancestor = elem instanceof IType ? (IType)elem : null;
- String[] signatures = jdtMethod.getExceptionTypes();
- String[] typeNames = new String[signatures.length];
- for (int s=0; s<signatures.length; s++)
- {
- String typeName = getTypeNameFromSignature(signatures[s]);
- typeNames[s] = resolveType(typeName,ancestor);
- }
- return typeNames;
- }
-
- /**
- * Returns an array of zero or more types representing
- * the superclasses, if any, of the given IType in bottom-up
- * order excluding java.lang.Object.
- * @param jdtType The type to analyze.
- * @return An array of zero or more superclass types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given type to satisfy this request.
- */
- public IType[] getSuperClasses ( IType jdtType )
- throws JavaModelException
- {
- return getSuperClasses(jdtType,"java.lang.Object");
- }
-
- /**
- * Returns an array of zero or more types representing
- * the superclasses, if any, of the given IType.
- * Under normal circumstances, java.lang.Object is included.
- * @param jdtType The type to analyze.
- * @param stopClassName The name of a stop class used to limit
- * the superclasses returned to the caller. If the stop class
- * is null or names a class not found in the hierarchy, all
- * superclasses are returned. Otherwise, only superclasses up
- * to but excluding the stop class are returned.
- * @return An array of zero or more superclass types.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given type to satisfy this request.
- */
- public IType[] getSuperClasses ( IType jdtType, String stopClassName )
- throws JavaModelException
- {
- ITypeHierarchy hierarchy = jdtType.newSupertypeHierarchy(monitor_);
- IType[] allSuperClasses = hierarchy.getAllSuperclasses(jdtType);
- List superClasses = new LinkedList();
- for (int i=0; i<allSuperClasses.length; i++)
- {
- if (allSuperClasses[i].getFullyQualifiedName().equals(stopClassName))
- break;
- superClasses.add(allSuperClasses[i]);
- }
- return (IType[])superClasses.toArray(new IType[0]);
- }
-
- /**
- * Extracts the qualified type name from a JDT signature.
- * @param signature The signature to examine.
- * @return The qualified type name from the signature.
- */
- public String getTypeNameFromSignature ( String signature )
- {
-
- String packageName = Signature.getSignatureQualifier(signature);
- String baseName = Signature.getSignatureSimpleName(signature);
- if (baseName.endsWith("[]")){
- baseName = baseName.substring(0, baseName.indexOf("["));
- }
-
- String typeName = (packageName.trim().equals("")?"":packageName+".") + baseName;
- return typeName;
- }
-
- /**
- * Attempts to resolve an unresolved type name in the
- * context of the given ancestor type (ie. the type
- * acting as the context within which the type name
- * should be resolved).
- * @param typeName The qualified name of the type to find.
- * @param ancestor The type providing the context within
- * which to look up the type.
- * @return The qualified name, or the original type name
- * if it could not be resolved.
- */
- public String resolveType ( String typeName, IType ancestor )
- throws JavaModelException
- {
- if (ancestor != null)
- {
- String[][] matches = ancestor.resolveType(typeName);
- if (matches != null && matches.length > 0)
- {
- StringBuffer qname = new StringBuffer();
- int n = matches[0].length;
- for (int j=0; j<n-1; j++)
- {
- qname.append(matches[0][j]).append(".");
- }
- if (n >= 0)
- {
- qname.append(matches[0][n-1]);
- }
- return qname.toString();
- }
- }
- return typeName;
- }
-
- /**
- * Attempts to find a JDT IType object for the given
- * resolved or unresolved type name in the context of
- * the given ancestor type (ie. the type acting as the
- * context within which the type name should be resolved).
- * @param typeName The qualified name of the type to find.
- * @param ancestor The type providing the context within
- * which to look up the type.
- * @return The IType object of the given qualified name,
- * or null if no type could be found in the workspace.
- */
- public IType findType ( String typeName, IType ancestor )
- throws JavaModelException
- {
- IType type = javaProject_.findType(typeName);
- if (type == null && ancestor != null)
- {
- String[][] matches = ancestor.resolveType(typeName);
- if (matches != null)
- {
- int i=0;
- while (type == null && i<matches.length)
- {
- StringBuffer qname = new StringBuffer();
- int n = matches[i].length;
- for (int j=0; j<n-1; j++)
- {
- qname.append(matches[i][j]).append(".");
- }
- if (n >= 0)
- {
- qname.append(matches[i][n-1]);
- }
- type = javaProject_.findType(qname.toString());
- i++;
- }
- }
- }
- return type;
- }
-
- /**
- * Finds all public, non-constructor IMethods belonging
- * to the given IType and adds them to the given list.
- * @param jdtType The type whose methods are to be harvested.
- * @param list The list to which the harvested methods will be added.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given type to satisfy this request.
- */
- public void harvestPublicMethods ( IType jdtType, List list )
- throws JavaModelException
- {
- IMethod[] methods = jdtType.getMethods();
- for (int m=0; m<methods.length; m++)
- {
- if (!methods[m].isConstructor() && Flags.isPublic(methods[m].getFlags()))
- {
- list.add(methods[m]);
- }
- }
- }
-
- /**
- * Finds all public IFields belonging
- * to the given IType and adds them to the given list.
- * @param jdtType The type whose fields are to be harvested.
- * @param list The list to which the harvested fields will be added.
- * @throws JavaModelException If the JDT engine fails to
- * analyze the given type to satisfy this request.
- */
- public void harvestPublicFields ( IType jdtType, List list )
- throws JavaModelException
- {
- IField[] fields = jdtType.getFields();
- for (int f=0; f<fields.length; f++)
- {
- if (Flags.isPublic(fields[f].getFlags()))
- {
- list.add(fields[f]);
- }
- }
- }
-
- /**
- * If the given method is a getter according to the Bean spec
- * (eg. "MyType getMyProperty ()" or "boolean isMyProperty ()")
- * return the corresponding bean property name (eg. "myProperty"),
- * otherwise, return null.
- * @param method The method to check.
- * @return The property name or none if the method is not a getter.
- */
- public String getGetterName ( IMethod method )
- {
- try
- {
- String methodName = method.getElementName();
- if (methodName.startsWith("get") && methodName.length() > 3)
- {
- String signature = method.getSignature();
- String returnTypeName = Signature.getReturnType(signature);
- //
- // Getters must not be void.
- //
- if (returnTypeName != null && returnTypeName != Signature.SIG_VOID)
- {
- String[] parameterSignatures = method.getParameterTypes();
- //
- // Non-indexed getters must have zero parameters.
- //
- if (parameterSignatures.length == 0)
- {
- return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
- }
- //
- // Indexed getters must have exactly one parameter of type "int".
- //
- else if (parameterSignatures.length == 1)
- {
- String indexTypeName = getTypeNameFromSignature(parameterSignatures[0]);
- if (indexTypeName.equals("int"))
- {
- return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
- }
- }
- }
- }
- else if (methodName.startsWith("is") && methodName.length() > 2)
- {
- String signature = method.getSignature();
- String returnTypeName = Signature.getReturnType(signature);
- //
- // "is" getters must be boolean.
- //
- if (Signature.SIG_BOOLEAN.equals(returnTypeName))
- {
- //
- // "is" getters must have no parameters.
- //
- if (method.getParameterTypes().length == 0)
- {
- return methodName.substring(2,3).toLowerCase() + methodName.substring(3);
- }
- }
- }
- }
- catch (JavaModelException e)
- {
- return null;
- }
- return null;
- }
-
- /**
- * If the given method is a setter according to the Bean spec
- * (eg. "void setMyProperty (MyType)" return the corresponding
- * bean property name (eg. "myProperty"), otherwise, return null.
- * @param method The method to check.
- * @return The property name or none if the method is not a setter.
- */
- public String getSetterName ( IMethod method )
- {
- try
- {
- String methodName = method.getElementName();
- if (methodName.startsWith("set") && methodName.length() > 3)
- {
- String signature = method.getSignature();
- String returnTypeName = Signature.getReturnType(signature);
- //
- // Setters must be void.
- //
- if (Signature.SIG_VOID.equals(returnTypeName))
- {
- String[] parameterSignatures = method.getParameterTypes();
- //
- // Non-indexed setters must have exactly one parameter.
- //
- if (parameterSignatures.length == 1)
- {
- return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
- }
- //
- // Indexed setters must have exactly two parameters,
- // the first of which must be "int".
- //
- else if (parameterSignatures.length == 2)
- {
- if (Signature.SIG_INT.equals(parameterSignatures[0]))
- {
- return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
- }
- }
- }
- }
- }
- catch (JavaModelException e)
- {
- return null;
- }
- return null;
- }
-
- /*
- * The Java project that governs the search scope for this resolver.
- */
- private IJavaProject javaProject_;
-
- /*
- * The progress monitor to use, if any.
- */
- private IProgressMonitor monitor_;
-
- /*
- * The set of Java wrapper types.
- */
- private static String[] wrapperTypes_ = {
- "java.lang.Character",
- "java.lang.Boolean",
- "java.lang.Byte",
- "java.lang.Short",
- "java.lang.Integer",
- "java.lang.Long",
- "java.lang.Float",
- "java.lang.Double"
- };
-
- /*
- * The set of Java primitive types.
- */
- private static String[] primitiveTypes_ = {
- "char",
- "boolean",
- "byte",
- "short",
- "int",
- "long",
- "float",
- "double"
- };
-
- /*
- * The set of JAX-RPC supported Java standard types,
- * excluding primitives and wrapper types.
- */
- private static String[] jaxrpcTypes_ = {
- "boolean",
- "byte",
- "short",
- "int",
- "long",
- "float",
- "double",
- "java.lang.String",
- "java.lang.Boolean",
- "java.lang.Byte",
- "java.lang.Short",
- "java.lang.Integer",
- "java.lang.Long",
- "java.lang.Float",
- "java.lang.Double",
- "java.util.Date",
- "java.util.Calendar",
- "java.math.BigInteger",
- "java.math.BigDecimal",
- "java.net.URI",
- "javax.xml.namespace.QName"
- };
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaBeanProperty.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaBeanProperty.java
deleted file mode 100644
index 529d5529d..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaBeanProperty.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This is a garden variety implementation of IJavaBeanProperty,
- * constructable by default and equipped with getters and setters
- * for the properties of IJavaBeanProperty.
- */
-public class JavaBeanProperty implements IJavaBeanProperty
-{
- private String name_;
- private boolean indexed_;
- private IMethod getter_;
- private IMethod setter_;
- private IMethod indexedGetter_;
- private IMethod indexedSetter_;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getName()
- */
- public String getName ()
- {
- return name_;
- }
-
- /**
- * Sets the "name" property of this Java Bean Property descriptor.
- * @param name The string value to set.
- */
- public void setName ( String name )
- {
- name_ = name;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#isIndexed()
- */
- public boolean isIndexed ()
- {
- return indexed_;
- }
-
- /**
- * Sets the "indexed" property of this Java Bean Property descriptor.
- * @param indexed The boolean value to set.
- */
- public void setIndexed ( boolean indexed )
- {
- indexed_ = indexed;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getGetter()
- */
- public IMethod getGetter ()
- {
- return getter_;
- }
-
- /**
- * Sets the "getter" property of this Java Bean Property descriptor.
- * @param getter The IMethod to set.
- */
- public void setGetter ( IMethod getter )
- {
- getter_ = getter;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getSetter()
- */
- public IMethod getSetter ()
- {
- return setter_;
- }
-
- /**
- * Sets the "setter" property of this Java Bean Property descriptor.
- * @param setter The IMethod to set.
- */
- public void setSetter ( IMethod setter )
- {
- setter_ = setter;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getIndexedGetter()
- */
- public IMethod getIndexedGetter ()
- {
- return indexedGetter_;
- }
-
- /**
- * Sets the "indexedGetter" property of this Java Bean Property descriptor.
- * @param indexedGetter The IMethod to set.
- */
- public void setIndexedGetter ( IMethod indexedGetter )
- {
- indexedGetter_ = indexedGetter;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getIndexedSetter()
- */
- public IMethod getIndexedSetter ()
- {
- return indexedSetter_;
- }
-
- /**
- * Sets the "indexedSetter" property of this Java Bean Property descriptor.
- * @param indexedSetter The IMethod to set.
- */
- public void setIndexedSetter ( IMethod indexedSetter )
- {
- indexedSetter_ = indexedSetter;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getDeclaringType()
- */
- public IType getDeclaringType ()
- {
- IMethod method = getGetter();
- if (method == null) method = getSetter();
- if (method == null) method = getIndexedGetter();
- if (method == null) method = getIndexedSetter();
- return method != null ? method.getDeclaringType() : null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRule.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRule.java
deleted file mode 100644
index 39ffa312d..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRule.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * A basic default implementation of IJavaWebServiceRule.
- */
-public class JavaWebServiceRule implements IJavaWebServiceRule
-{
- protected IJavaWebServiceRuleEngine engine_;
- protected List statusList_;
- protected int id_;
- protected String namespace_;
- protected String name_;
- protected String description_;
-
- protected JavaWebServiceRule ()
- {
- // Not publicly constructable.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getId()
- */
- public int getId ()
- {
- return id_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getNamespace()
- */
- public String getNamespace ()
- {
- return namespace_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getName()
- */
- public String getName ()
- {
- return name_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getDescription()
- */
- public String getDescription ()
- {
- return description_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#init()
- */
- public void init ( IJavaWebServiceRuleEngine engine )
- {
- engine_ = engine;
- statusList_ = new LinkedList();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitException(org.eclipse.jdt.core.IField, java.util.Stack)
- */
- public void visitException ( IType jdtClass, Stack peanutTrail )
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitField(org.eclipse.jdt.core.IField, java.util.Stack)
- */
- public void visitField ( IField jdtField, Stack peanutTrail )
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitProperty(org.eclipse.jdt.core.IMethod, org.eclipse.jdt.core.IMethod, java.util.Stack)
- */
- public void visitProperty ( IJavaBeanProperty beanProperty, Stack peanutTrail )
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
- */
- public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getResults()
- */
- public IStatus getResults ()
- {
- IStatus status = null;
- if (statusList_.size() == 0)
- {
- status = new Status(IStatus.OK,"org.eclipse.jst.ws",0,"",null);
- }
- else
- {
- MultiStatus multiStatus = new MultiStatus("org.eclipse.jst.ws",0,"",null);
- Iterator i = statusList_.iterator();
- while (i.hasNext())
- {
- multiStatus.add((IStatus)i.next());
- }
- status = multiStatus;
- }
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRuleSet.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRuleSet.java
deleted file mode 100644
index f48771487..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRuleSet.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This object manages a set of rules.
- * Rules in the set may be enabled or disabled.
- */
-public class JavaWebServiceRuleSet
-{
- private Set enabledRules_ = new HashSet();
- private Set disabledRules_ = new HashSet();
-
- /**
- * Creates a new, initially empty set of rules.
- */
- public JavaWebServiceRuleSet ()
- {
- // Nothing to do.
- }
-
- /**
- * Creates a new set of rules initialized with those
- * from the given array of <code>rules</code>.
- * @param rules An array of rules to add.
- */
- public JavaWebServiceRuleSet ( IJavaWebServiceRule[] rules )
- {
- addRules(rules);
- }
-
- /**
- * Adds a <code>rule</code> to the set.
- * Rules added to the set are initially enabled.
- * @param rule The rule to add.
- */
- public void addRule ( IJavaWebServiceRule rule )
- {
- enabledRules_.add(rule);
- }
-
- /**
- * Adds several <code>rules</code> to the set.
- * Rules added to the set are initially enabled.
- * @param rules The array of rules to add.
- */
- public void addRules ( IJavaWebServiceRule[] rules )
- {
- enabledRules_.addAll(Arrays.asList(rules));
- }
-
- /**
- * Marks the given <code>rule</code> as disabled or enabled.
- * This method has no effect if the rule is not already in
- * the set, in other words, this method will not have the
- * side effect of adding a rule to the set.
- * @param rule The rule to disable or enable.
- * @param disabled True to disable the rule or false to enable it.
- * @return True if a change in status was actually made.
- */
- public boolean setRuleDisabled ( IJavaWebServiceRule rule, boolean disabled )
- {
- if (disabled)
- {
- if (enabledRules_.remove(rule))
- {
- disabledRules_.add(rule);
- return true;
- }
- }
- else
- {
- if (disabledRules_.remove(rule))
- {
- enabledRules_.add(rule);
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns the number of rules in the set.
- * @return The number of rules in the set.
- */
- public int size ()
- {
- return enabledRules_.size() + disabledRules_.size();
- }
-
- /**
- * Returns the number of enabled rules in the set.
- * @return The number of enabled rules in the set.
- */
- public int numberEnabled ()
- {
- return enabledRules_.size();
- }
-
- /**
- * Returns the number of disabled rules in the set.
- * @return The number of disabled rules in the set.
- */
- public int numberDisabled ()
- {
- return disabledRules_.size();
- }
-
- /**
- * Returns an array of all currently enabled rules from the set.
- * @return An array of all currently enabled rules from the set.
- */
- public IJavaWebServiceRule[] getEnabledRules ()
- {
- return (IJavaWebServiceRule[])enabledRules_.toArray(new IJavaWebServiceRule[0]);
- }
-
- /**
- * Returns an array of all currently disabled rules from the set.
- * @return An array of all currently disabled rules from the set.
- */
- public IJavaWebServiceRule[] getDisabledRules ()
- {
- return (IJavaWebServiceRule[])disabledRules_.toArray(new IJavaWebServiceRule[0]);
- }
-
- /**
- * Initializes all rules in the set by calling
- * their init() methods with the given engine.
- * @param engine The engine initializing
- */
- public void init ( IJavaWebServiceRuleEngine engine )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.init(engine);
- }
- }
-
- /**
- * Visits the "visitClass" method of all rules in the set.
- * @param jdtClass The JDT IType being visited.
- * @param peanutTrail The stack of objects up to the root.
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.visitClass(jdtClass,peanutTrail);
- }
- }
-
- /**
- * Visits the "visitException" method of all rules in the set.
- * @param jdtClass The JDT IType being visited.
- * @param peanutTrail The stack of objects up to the root.
- */
- public void visitException ( IType jdtClass, Stack peanutTrail )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.visitException(jdtClass,peanutTrail);
- }
- }
-
-
- /**
- * Visits the "visitField" method of all rules in the set.
- * @param jdtClass The JDT IField being visited.
- * @param peanutTrail The stack of objects up to the root.
- */
- public void visitField ( IField jdtField, Stack peanutTrail )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.visitField(jdtField,peanutTrail);
- }
- }
-
- /**
- * Visits the "visitProperty" method of all rules in the set.
- * @param jdtClass The IJavaBeanProperty being visited.
- * @param peanutTrail The stack of objects up to the root.
- */
- public void visitProperty ( IJavaBeanProperty beanProperty, Stack peanutTrail )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.visitProperty(beanProperty,peanutTrail);
- }
- }
-
- /**
- * Visits the "visitMethod" method of all rules in the set.
- * @param jdtClass The JDT IMethod being visited.
- * @param peanutTrail The stack of objects up to the root.
- */
- public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
- {
- Iterator i = enabledRules_.iterator();
- while (i.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
- rule.visitMethod(jdtMethod,peanutTrail);
- }
- }
-
- /**
- * Collects the results of all rules in the set together.
- * If one or more warnings or errors are found, returns
- * a status object whose top level message is the root
- * message passed to this message, otherwise, returns a
- * basic "OK" status.
- * @param rootMessage The warning/error message to act as
- * the root message if necessary (ie. if at least one rule
- * in the set reported at least one warning/error).
- * @return The collective status.
- */
- public IStatus getResults ( String rootMessage )
- {
- List list = new LinkedList();
- Iterator e = enabledRules_.iterator();
- while (e.hasNext())
- {
- IJavaWebServiceRule rule = (IJavaWebServiceRule)e.next();
- IStatus status = rule.getResults();
- if (!status.isOK())
- {
- list.add(status);
- }
- }
- if (list.size() > 0)
- {
- MultiStatus multiStatus = new MultiStatus("org.eclipse.jst.ws",0,rootMessage,null);
- Iterator l = list.iterator();
- while (l.hasNext())
- {
- IStatus status = (IStatus)l.next();
- multiStatus.addAll(status);
- }
- return multiStatus;
- }
- else
- {
- return new Status(IStatus.OK,"org.eclipse.jst.ws",0,"",null);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0001.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0001.java
deleted file mode 100644
index 144107980..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0001.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule checks if a service class
- * is public default constructable.
- */
-public class JAXRPCRule0001 extends JavaWebServiceRule
-{
- /**
- * Creates a new instance of this rule.
- */
- public JAXRPCRule0001 ()
- {
- id_ = 1;
- namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
- name_ = null;
- description_ = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- // An empty peanut trail implies this is the root
- // class or JAX-RPC service class.
- if (peanutTrail.size() == 0)
- {
- try
- {
- JDTResolver resolver = engine_.getJDTResolver();
- if (!resolver.isConstructable(jdtClass) || resolver.isInterface(jdtClass) || resolver.isAbstract(jdtClass))
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0001,jdtClass.getFullyQualifiedName());
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- catch (JavaModelException e)
- {
- statusList_.add(new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e));
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0002.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0002.java
deleted file mode 100644
index 7049c3356..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0002.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule checks if a value type class
- * is public default constructable.
- */
-public class JAXRPCRule0002 extends JavaWebServiceRule
-{
- /**
- * Creates a new instance of this rule.
- */
- public JAXRPCRule0002 ()
- {
- id_ = 2;
- namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
- name_ = null;
- description_ = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- // An empty peanut trail implies this is the root class
- // root class or JAX-RPC service class, whereas a non-empty
- // peanut trail implies this is a class from a method, field
- // or property signature. In the former case, remember the
- // qualified name of the type just in case we need it for the
- // latter case.
- if (peanutTrail.size() == 0)
- {
- serviceClassName_ = jdtClass.getFullyQualifiedName();
- }
- else
- {
- try
- {
- JDTResolver resolver = engine_.getJDTResolver();
- String qname = jdtClass.getFullyQualifiedName();
- if (!resolver.isStandardType(qname))
- {
- if (!resolver.isConstructable(jdtClass) || resolver.isInterface(jdtClass) || resolver.isAbstract(jdtClass))
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0002,qname,serviceClassName_);
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- }
- catch (JavaModelException e)
- {
- statusList_.add(new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e));
- }
- }
- }
-
- private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0003.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0003.java
deleted file mode 100644
index bc65bcda5..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0003.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule verifies that a service class has no overloaded methods.
- */
-public class JAXRPCRule0003 extends JavaWebServiceRule
-{
- /**
- * Creates a new instance of this rule.
- */
- public JAXRPCRule0003 ()
- {
- id_ = 3;
- namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
- name_ = null;
- description_ = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#init(org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine)
- */
- public void init ( IJavaWebServiceRuleEngine engine )
- {
- super.init(engine);
- methodNames_ = new HashMap();
- overloadedMethodNames_ = new HashSet();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- //
- // An empty peanut trail implies this is the root
- // class, aka. JAX-RPC service class. Put aside
- // the class name in case visitMethod() needs it.
- //
- if (peanutTrail.size() == 0)
- {
- serviceClassName_ = jdtClass.getFullyQualifiedName();
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
- */
- public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
- {
- //
- // A peanut trail of length one implies this is a method
- // belonging to the root class, aka. JAX-RPC service class.
- //
- if (peanutTrail.size() == 1)
- {
- try
- {
- //
- // If we have encountered this method already but haven't
- // reported the overload condition, report it.
- //
- String methodName = jdtMethod.getElementName();
- String firstParameterSignature = (String)methodNames_.get(methodName);
- String thisParameterSignature = flattenedSignatureOf(jdtMethod);
- if (thisParameterSignature != null)
- {
- if (firstParameterSignature != null)
- {
- //
- // If we have encountered this method's name already,
- // but have not yet determined if it is overloaded,
- // then compare this method's parameter signature with
- // that of the "first signature" of the method name.
- // The moment we find a second signature for a given
- // method name, we have an overload condition.
- //
- if (!overloadedMethodNames_.contains(methodName) && !thisParameterSignature.equals(firstParameterSignature))
- {
- overloadedMethodNames_.add(methodName);
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0003,methodName,serviceClassName_);
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- else
- {
- //
- // If we have recorded no signature for the given method
- // name (ie. we have not encountered the method name yet),
- // then record this one. Any "first signature" will do.
- //
- methodNames_.put(methodName,thisParameterSignature);
- }
- }
- }
- catch (JavaModelException e)
- {
- // Do nothing.
- }
- }
- }
-
- /*
- * Grabs the types of the parameters of the given method
- * and flattens then into a single string sufficient to
- * distinguish between overloaded vs. overridden methods.
- */
- private String flattenedSignatureOf ( IMethod jdtMethod )
- throws JavaModelException
- {
- String[] signatures = engine_.getJDTResolver().getParameterTypeNames(jdtMethod);
- StringBuffer flattenedSignature = new StringBuffer();
- for (int s=0; s<signatures.length; s++)
- {
- flattenedSignature.append(signatures[s]).append(",");
- }
- return flattenedSignature.toString();
- }
-
- private Map methodNames_;
- private Set overloadedMethodNames_;
- private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0005.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0005.java
deleted file mode 100644
index c66cf7a51..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0005.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule verifies that the methods of a service class
- * uses only JAX-RPC supported types.
- */
-public class JAXRPCRule0005 extends JavaWebServiceRule
-{
- /**
- * Creates a new instance of this rule.
- */
- public JAXRPCRule0005 ()
- {
- id_ = 5;
- namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
- name_ = null;
- description_ = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#init(org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine)
- */
- public void init ( IJavaWebServiceRuleEngine engine )
- {
- super.init(engine);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- //
- // An empty peanut trail implies this is the root
- // class, aka. JAX-RPC service class. Put aside
- // the class name in case visitMethod() needs it.
- //
- if (peanutTrail.size() == 0)
- {
- serviceClassName_ = jdtClass.getFullyQualifiedName();
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
- */
- public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
- {
- //
- // A peanut trail of length one implies this is a method
- // belonging to the root class, aka. JAX-RPC service class.
- //
- if (peanutTrail.size() == 1)
- {
- try
- {
- String methodName = jdtMethod.getElementName();
- //
- // Check the method return type for compliance.
- // Any Java primitive or standard ("java." or "javax.") type
- // that is not supported by JAX-RPC will get flagged.
- // Any non-primitive or non-standard type is presumed to be a
- // potential value type and is bypassed since the rule engine
- // will navigate into the potential value type's class.
- //
- JDTResolver resolver = engine_.getJDTResolver();
- String returnTypeName = resolver.getReturnTypeName(jdtMethod);
- if ((resolver.isPrimitiveType(returnTypeName) || resolver.isStandardType(returnTypeName)) && !resolver.isJAXRPCStandardType(returnTypeName))
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0005,new String[] {methodName,serviceClassName_,returnTypeName});
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- //
- // Check the method parameter types for compliance.
- // Same comment as above, only applied to the method's parameters.
- //
- String[] parameterTypeNames = resolver.getParameterTypeNames(jdtMethod);
- for (int p=0; p<parameterTypeNames.length; p++)
- {
- if ((resolver.isPrimitiveType(parameterTypeNames[p]) || resolver.isStandardType(parameterTypeNames[p])) && !resolver.isJAXRPCStandardType(parameterTypeNames[p]))
- {
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0005,new String[] {methodName,serviceClassName_,parameterTypeNames[p]});
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- }
- catch (JavaModelException e)
- {
- // Do nothing.
- }
- }
- }
-
- private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0006.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0006.java
deleted file mode 100644
index 407afd319..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0006.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty;
-import org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule verifies that the fields and properties of a
- * value type class uses only JAX-RPC supported types.
- */
-public class JAXRPCRule0006 extends JavaWebServiceRule
-{
- /**
- * Creates a new instance of this rule.
- */
- public JAXRPCRule0006 ()
- {
- id_ = 6;
- namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
- name_ = null;
- description_ = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#init(org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine)
- */
- public void init ( IJavaWebServiceRuleEngine engine )
- {
- super.init(engine);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
- */
- public void visitClass ( IType jdtClass, Stack peanutTrail )
- {
- //
- // An empty peanut trail implies this is the root
- // class, aka. JAX-RPC service class. Put aside
- // the class name in case visitMethod() needs it.
- //
- if (peanutTrail.size() == 0)
- {
- serviceClassName_ = jdtClass.getFullyQualifiedName();
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
- */
- public void visitField ( IField jdtField, Stack peanutTrail )
- {
- //
- // A peanut trail of length greater than one implies this is a
- // field belonging to a class other than the root (aka. JAX-RPC
- // service) class, namely a presumed value type class.
- //
- if (peanutTrail.size() > 1)
- {
- try
- {
- //
- // Any Java primitive or standard ("java." or "javax.") type
- // that is not supported by JAX-RPC will get flagged.
- // Any non-primitive or non-standard type is presumed to be a
- // potential value type and is bypassed since the rule engine
- // will navigate into the potential value type's class.
- //
- JDTResolver resolver = engine_.getJDTResolver();
- String fieldTypeName = resolver.getFieldTypeName(jdtField);
- if ((resolver.isPrimitiveType(fieldTypeName) || resolver.isStandardType(fieldTypeName)) && !resolver.isJAXRPCStandardType(fieldTypeName))
- {
- //
- // The field pretty much MUST be declared in a type or
- // we would not have gotten here. Still, best to be safe.
- //
- IType valueType = jdtField.getDeclaringType();
- if (valueType != null)
- {
- String valueTypeClassName = valueType.getFullyQualifiedName();
- String fieldName = jdtField.getElementName();
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0006,new String[] {fieldName,valueTypeClassName,serviceClassName_,fieldTypeName});
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- }
- catch (JavaModelException e)
- {
- // Do nothing.
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitProperty(org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty, java.util.Stack)
- */
- public void visitProperty ( IJavaBeanProperty property, Stack peanutTrail )
- {
- //
- // A peanut trail of length greater than one implies this is a
- // property belonging to a class other than the root (aka. JAX-RPC
- // service) class, namely a presumed value type class.
- //
- if (peanutTrail.size() > 1)
- {
- try
- {
- //
- // Any Java primitive or standard ("java." or "javax.") type
- // that is not supported by JAX-RPC will get flagged.
- // Any non-primitive or non-standard type is presumed to be a
- // potential value type and is bypassed since the rule engine
- // will navigate into the potential value type's class.
- //
- JDTResolver resolver = engine_.getJDTResolver();
- String propertyTypeName = resolver.getPropertyTypeName(property);
- if ((resolver.isPrimitiveType(propertyTypeName) || resolver.isStandardType(propertyTypeName)) && !resolver.isJAXRPCStandardType(propertyTypeName))
- {
- //
- // The field pretty much MUST be declared in a type or
- // we would not have gotten here. Still, best to be safe.
- //
- IType valueType = property.getDeclaringType();
- if (valueType != null)
- {
- String valueTypeClassName = valueType.getFullyQualifiedName();
- String propertyName = property.getName();
- String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0006,new String[] {propertyName,valueTypeClassName,serviceClassName_,propertyTypeName});
- statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
- }
- }
- }
- catch (JavaModelException e)
- {
- // Do nothing.
- }
- }
- }
-
- private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRuleSetFactory.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRuleSetFactory.java
deleted file mode 100644
index 0f1c7a63b..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRuleSetFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060419 132905 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRuleSet;
-
-/**
- * A factory that produces a JavaWebServiceRuleSet
- * for the JAX-RPC 1.1 specification.
- */
-public class JAXRPCRuleSetFactory
-{
- private JAXRPCRuleSetFactory ()
- {
- // Not publicly constructable.
- }
-
- /**
- * Returns a set of rules for analyzing Java classes
- * for compliance to the rules of JAX-RPC 1.1.
- * @return A set of JAX-RPC 1.1 analysis rules.
- */
- public static JavaWebServiceRuleSet newRuleSet ()
- {
- JavaWebServiceRuleSet set = new JavaWebServiceRuleSet();
- set.addRule(new JAXRPCRule0001());
- set.addRule(new JAXRPCRule0002());
- set.addRule(new JAXRPCRule0003());
- set.addRule(new JAXRPCRule0005());
- set.addRule(new JAXRPCRule0006());
- return set;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
deleted file mode 100644
index a14cf9aa5..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216 127138 pmoogk@ca.ibm.com - Peter Moogk
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-import com.ibm.icu.util.StringTokenizer;
-
-
-public class PersistentScenarioContext extends PersistentContext implements ScenarioContext
-{
- public PersistentScenarioContext()
- {
- super(WebServicePlugin.getInstance());
- }
-
- public void load()
- {
- ScenarioDefaults defaults = new ScenarioDefaults();
- String[] ids = defaults.getWebServiceTestIds();
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ids.length; i++)
- {
- if (i != 0) sb.append(",");
- sb.append(ids[i]);
- }
- String nonJavaTestService = defaults.getNonJavaTestServiceDefault();
- setDefaultStringIfNoDefault(PREFERENCE_WEBSERVICE_TEST_TYPES, sb.toString());
- setDefaultStringIfNoDefault(PREFERENCE_NON_JAVA_TEST_SERVICE, nonJavaTestService);
-
- setDefaultStringIfNoDefault(PREFERENCE_CLIENT_WEBSERVICE_TYPE, defaults.webserviceClientTypeDefault() );
- setDefaultStringIfNoDefault(PREFERENCE_WEBSERVICE_TYPE, defaults.webserviceTypeIdDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_GENERATE_PROXY, defaults.generateProxyDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER, defaults.launchWebserviceExplorerDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_INSTALL_WEBSERVICE, defaults.installWebserviceDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_INSTALL_CLIENT, defaults.installClientDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_START_WEBSERVICE, defaults.startWebserviceDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_TEST_WEBSERVICE, defaults.testWebserviceDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_MONITOR_WEBSERVICE, defaults.getMonitorWebServiceDefault());
- setDefaultBooleanIfNoDefault(PREFERENCE_LAUNCH_SAMPLE, defaults.launchSample() );
-
- setDefaultIntIfNoDefault(PREFERENCE_GENERATE_WEBSERVICE, defaults.serviceGenerationDefault()); //jvh
- setDefaultIntIfNoDefault(PREFERENCE_GENERATE_CLIENT, defaults.clientGenerationDefault());
- }
-
- public String[] getNonJavaTestService()
- {
- WebServiceTestRegistry registry = WebServiceTestRegistry.getInstance();
- String[] ids = getWebServiceTestIds();
- Vector newTestCases = new Vector();
- for (int i = 0; i < ids.length; i++)
- {
- WebServiceTestExtension wse = (WebServiceTestExtension) registry
- .getWebServiceExtensionsById(ids[i]);
- if (wse != null && wse.testWSDL())
- newTestCases.addElement(wse.getLabel());
- }
- String[] wsdlTestArray = new String[newTestCases.size()];
- Enumeration e = newTestCases.elements();
- int i = 0;
- while(e.hasMoreElements()){
- wsdlTestArray[i] = (String)e.nextElement();
- i++;
- }
-
- return wsdlTestArray;
- }
-
- public void setWebServiceTestIds(String[] ids)
- {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ids.length; i++)
- {
- if (i != 0) sb.append(",");
- sb.append(ids[i]);
- }
- setValue(PREFERENCE_WEBSERVICE_TEST_TYPES, sb.toString());
- }
-
- public String[] getWebServiceTestIds()
- {
- StringTokenizer st = new StringTokenizer(
- getValueAsString(PREFERENCE_WEBSERVICE_TEST_TYPES), ",");
- String[] s = new String[st.countTokens()];
- for (int i = 0; i < s.length; i++) {
- // 154543: we have to continue to interpret the old label style preferences
- s[i] = WebServiceTestRegistry.getInstance().labelToId(st.nextToken());
- }
- return s;
- }
-
- public void setWebServiceTestTypes(String[] ids)
- {
- // 154543: deprecated, noop
- }
-
- public String[] getWebServiceTestTypes()
- {
- WebServiceTestRegistry registry = WebServiceTestRegistry.getInstance();
- String[] ids = getWebServiceTestIds();
- Vector labels = new Vector();
- for (int i = 0; i < ids.length; i++)
- {
- WebServiceTestExtension wse = (WebServiceTestExtension) registry
- .getWebServiceExtensionsById(ids[i]);
- if (wse != null)
- labels.addElement(wse.getLabel());
- }
- String[] s = new String[labels.size()];
- labels.copyInto(s);
- return s;
- }
-
- public ScenarioContext copy()
- {
- TransientScenarioContext context = new TransientScenarioContext();
- context.setWebServiceTestIds(getWebServiceTestIds());
- context.setWebServiceTestTypes(getWebServiceTestTypes());
- context.setNonJavaTestService(getNonJavaTestService());
-
- context.setClientWebServiceType( getClientWebServiceType() );
- context.setWebServiceType( getWebServiceType() );
- context.setLaunchWebServiceExplorer( getLaunchWebServiceExplorer() );
- context.setStartWebService( getStartWebService() );
- context.setGenerateProxy( getGenerateProxy() );
- context.setTestWebService( getTestWebService() );
- context.setMonitorWebService(getMonitorWebService());
- context.setLaunchSampleEnabled( isLaunchSampleEnabled() );
-
- return context;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getClientWebServiceType()
- */
- public String getClientWebServiceType()
- {
- return getValueAsString(PREFERENCE_CLIENT_WEBSERVICE_TYPE);
- }
-
- public String getClientWebServiceTypeDefault()
- {
- return getDefaultString(PREFERENCE_CLIENT_WEBSERVICE_TYPE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getGenerateProxy()
- */
- public boolean getGenerateProxy()
- {
- return getValueAsBoolean(PREFERENCE_GENERATE_PROXY);
- }
-
- public boolean getGenerateProxyDefault()
- {
- return getDefaultBoolean(PREFERENCE_GENERATE_PROXY);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchWebServiceExplorer()
- */
- public boolean getLaunchWebServiceExplorer()
- {
- return getValueAsBoolean(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER);
- }
-
- public boolean getLaunchWebServiceExplorerDefault()
- {
- return getDefaultBoolean(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getStartWebService()
- */
- public boolean getStartWebService()
- {
- return getValueAsBoolean(PREFERENCE_START_WEBSERVICE);
- }
-
- public boolean getStartWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_START_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getInstallWebService()
- */
- public boolean getInstallWebService()
- {
- return getValueAsBoolean(PREFERENCE_INSTALL_WEBSERVICE);
- }
-
- public boolean getInstallWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_INSTALL_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getInstallWebService()
- */
- public boolean getInstallClient()
- {
- return getValueAsBoolean(PREFERENCE_INSTALL_CLIENT);
- }
-
- public boolean getInstallClientDefault()
- {
- return getDefaultBoolean(PREFERENCE_INSTALL_CLIENT);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getTestWebService()
- */
- public boolean getTestWebService()
- {
- return getValueAsBoolean(PREFERENCE_TEST_WEBSERVICE);
- }
-
- public boolean getTestWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_TEST_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getWebServiceType()
- */
- public String getWebServiceType()
- {
- return getValueAsString(PREFERENCE_WEBSERVICE_TYPE);
- }
-
- public String getWebServiceTypeDefault()
- {
- return getDefaultString(PREFERENCE_WEBSERVICE_TYPE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setClientWebServiceType(java.lang.String)
- */
- public void setClientWebServiceType(String value)
- {
- setValue( PREFERENCE_CLIENT_WEBSERVICE_TYPE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setGenerateProxy(boolean)
- */
- public void setGenerateProxy(boolean value)
- {
- setValue( PREFERENCE_GENERATE_PROXY, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchWebServiceExplorer(boolean)
- */
- public void setLaunchWebServiceExplorer(boolean value)
- {
- setValue( PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setInstallWebService(boolean)
- */
- public void setInstallWebService(boolean value)
- {
- setValue( PREFERENCE_INSTALL_WEBSERVICE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setInstallWebService(boolean)
- */
- public void setInstallClient(boolean value)
- {
- setValue( PREFERENCE_INSTALL_CLIENT, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setStartWebService(boolean)
- */
- public void setStartWebService(boolean value)
- {
- setValue( PREFERENCE_START_WEBSERVICE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setTestWebService(boolean)
- */
- public void setTestWebService(boolean value)
- {
- setValue( PREFERENCE_TEST_WEBSERVICE, value);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setWebServiceType(java.lang.String)
- */
- public void setWebServiceType(String value)
- {
- setValue( PREFERENCE_WEBSERVICE_TYPE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getMonitorWebService()
- */
- public boolean getMonitorWebService()
- {
- return getValueAsBoolean(PREFERENCE_MONITOR_WEBSERVICE);
- }
-
- public boolean getMonitorWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_MONITOR_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setMonitorWebService(boolean)
- */
- public void setMonitorWebService(boolean value)
- {
- setValue(PREFERENCE_MONITOR_WEBSERVICE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchSampleEnabledDefault()
- */
- public boolean getLaunchSampleEnabledDefault()
- {
- return getDefaultBoolean(PREFERENCE_LAUNCH_SAMPLE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#isLaunchSampleEnabled()
- */
- public boolean isLaunchSampleEnabled()
- {
- return getValueAsBoolean(PREFERENCE_LAUNCH_SAMPLE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchSampleEnabled(boolean)
- */
- public void setLaunchSampleEnabled(boolean value)
- {
- setValue( PREFERENCE_LAUNCH_SAMPLE, value);
- }
-
- //jvh
- public int getGenerateWebService()
- {
- return getValueAsInt(PREFERENCE_GENERATE_WEBSERVICE);
- }
-
- public int getGenerateWebServiceDefault()
- {
- return getDefaultInt(PREFERENCE_GENERATE_WEBSERVICE);
- }
-
- public void setGenerateWebService(int value)
- {
- setValue(PREFERENCE_GENERATE_WEBSERVICE, value);
- }
-
- public int getGenerateClientDefault()
- {
- return getDefaultInt(PREFERENCE_GENERATE_CLIENT);
- }
-
- public int getGenerateClient()
- {
- return getValueAsInt(PREFERENCE_GENERATE_CLIENT);
- }
-
- public void setGenerateClient(int value)
- {
- setValue(PREFERENCE_GENERATE_CLIENT, value);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java
deleted file mode 100644
index 542b1ed62..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentUDDIPreferenceContext extends PersistentContext implements UDDIPreferenceContext
-{
- public PersistentUDDIPreferenceContext()
- {
- super(WebServicePlugin.getInstance());
- }
-
- public void load()
- {
- setDefault(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER, UDDIPreferenceDefaults.getUddiCatDataColumnDelimiter());
- setDefault(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER, UDDIPreferenceDefaults.getUddiCatDataStringDelimiter());
- }
-
- public void setUddiCatDataColumnDelimiter(String delimiter)
- {
- setValue(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER, delimiter);
- }
-
- public String getUddiCatDataColumnDelimiter()
- {
- return getValueAsString(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER);
- }
-
- public void setUddiCatDataStringDelimiter(String delimiter)
- {
- setValue(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER, delimiter);
- }
-
- public String getUddiCatDataStringDelimiter()
- {
- return getValueAsString(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
deleted file mode 100644
index 517d66102..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-public interface ScenarioContext
-{
- public final String PREFERENCE_WEBSERVICE_TEST_TYPES = "webServiceTestTypes";
-
- public final String PREFERENCE_NON_JAVA_TEST_SERVICE= "nonJavaTestService";
-
- public final String PREFERENCE_WEBSERVICE_TYPE = "webServiceType";
-
- public final String PREFERENCE_START_WEBSERVICE = "startWebService";
-
- public final String PREFERENCE_INSTALL_WEBSERVICE = "installWebService";
-
- public final String PREFERENCE_INSTALL_CLIENT = "installClient";
-
- public final String PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER = "launchWebServiceExplorer";
-
- public final String PREFERENCE_GENERATE_PROXY = "generateProxy";
-
- public final String PREFERENCE_CLIENT_WEBSERVICE_TYPE = "clientWebServiceType";
-
- public final String PREFERENCE_TEST_WEBSERVICE = "testWebService";
-
- public final String PREFERENCE_MONITOR_WEBSERVICE = "monitorWebService";
-
- public final String PREFERENCE_LAUNCH_SAMPLE = "launchSample";
-
- public final String PREFERENCE_GENERATE_WEBSERVICE = "generateWebService"; //jvh
- public final String PREFERENCE_GENERATE_CLIENT = "generateClient"; //jvh
-
- public final static int WS_TEST=0;
- public final static int WS_START=1;
- public final static int WS_INSTALL=2;
- public final static int WS_DEPLOY=3;
- public final static int WS_ASSEMBLE=4;
- public final static int WS_DEVELOP=5;
- public final static int WS_NONE=6;
-
- public String[] getWebServiceTestIds();
- public void setWebServiceTestIds(String[] ids);
-
- public String[] getWebServiceTestTypes();
- public void setWebServiceTestTypes(String[] testTypes);
-
- public String[] getNonJavaTestService();
-
- public String getWebServiceType();
- public String getWebServiceTypeDefault();
- public void setWebServiceType( String value );
-
- public boolean getInstallWebService();
- public boolean getInstallWebServiceDefault();
- public void setInstallWebService( boolean value );
-
- public boolean getInstallClient();
- public boolean getInstallClientDefault();
- public void setInstallClient( boolean value );
-
- public boolean getStartWebService();
- public boolean getStartWebServiceDefault();
- public void setStartWebService( boolean value );
-
- public boolean getLaunchWebServiceExplorer();
- public boolean getLaunchWebServiceExplorerDefault();
- public void setLaunchWebServiceExplorer( boolean value );
-
- public boolean getGenerateProxy();
- public boolean getGenerateProxyDefault();
- public void setGenerateProxy( boolean value );
-
- public String getClientWebServiceType();
- public String getClientWebServiceTypeDefault();
- public void setClientWebServiceType( String value );
-
- public boolean getTestWebService();
- public boolean getTestWebServiceDefault();
- public void setTestWebService( boolean value );
-
- public boolean getMonitorWebService();
- public boolean getMonitorWebServiceDefault();
- public void setMonitorWebService(boolean value);
-
- public boolean isLaunchSampleEnabled();
- public boolean getLaunchSampleEnabledDefault();
- public void setLaunchSampleEnabled( boolean value );
-
- public int getGenerateWebServiceDefault();
- public int getGenerateWebService();
- public void setGenerateWebService(int value);
-
- public int getGenerateClientDefault();
- public int getGenerateClient();
- public void setGenerateClient(int value);
-
- public ScenarioContext copy();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
deleted file mode 100644
index af4e151c3..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-
-
-
-public class ScenarioDefaults
-{
-
-
- public String[] getWebServiceTestIds()
- {
- //we will set the home grown sample as the first choice
- WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
-
- LabelsAndIds labelsandids = testRegistry.getLabelsAndIDs();
- String[] ids = labelsandids.getIds_();
-
- String[] newIds = new String[ids.length];
- int index = -1;
- for(int i = 0;i<ids.length;i++){
- if(ids[i].equals("org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"))
- index = i;
- }
- if(index != -1){
- newIds[0] = ids[index];
- int j = 1;
- for(int i = 0;i<ids.length;i++){
- if(i != index){
- newIds[j] = ids[i];
- j++;
- }
- }
- }
- else return ids;
-
- return newIds;
- }
-
- public String getNonJavaTestServiceDefault()
- {
- return "Web Services Explorer";
- }
-
- public String webserviceTypeIdDefault()
- {
- return "0/org.eclipse.jst.ws.wsImpl.java";
- }
-
- public int serviceGenerationDefault()
- {
- return ScenarioContext.WS_START;
- }
-
- public int clientGenerationDefault()
- {
- return ScenarioContext.WS_NONE;
- }
-
- public boolean startWebserviceDefault()
- {
- return true;
- }
-
- public boolean installWebserviceDefault()
- {
- return true;
- }
-
- public boolean installClientDefault()
- {
- return true;
- }
-
- public boolean launchWebserviceExplorerDefault()
- {
- return false;
- }
-
- public boolean generateProxyDefault()
- {
- return false;
- }
-
- public String webserviceClientTypeDefault()
- {
- return "org.eclipse.jst.ws.client.type.java";
- }
-
- public boolean testWebserviceDefault()
- {
- return false;
- }
-
- public boolean getMonitorWebServiceDefault()
- {
- return false;
- }
-
- public boolean launchSample()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
deleted file mode 100644
index dece9897c..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-public class TransientScenarioContext implements ScenarioContext
-{
- private String[] webServiceTestIds;
- private String[] webServiceTestTypes;
- private String[] nonJavaTestService;
- private String webServiceType_;
- private boolean installWebService_;
- private boolean installClient_;
- private boolean startWebService_;
- private boolean launchWebServiceExplorer_;
- private boolean generateProxy_;
- private String clientWebServiceType_;
- private boolean testWebService_;
- private boolean monitorWebService;
- private boolean launchSample_;
- private int generateWebService_; //jvh
- private int generateClient_; //jvh
-
- private ScenarioDefaults defaults = new ScenarioDefaults();
-
- public TransientScenarioContext () {}
-
- public String[] getNonJavaTestService()
- {
- return nonJavaTestService;
- }
-
- public void setNonJavaTestService(String[] nonJavaTestService)
- {
- this.nonJavaTestService = nonJavaTestService;
- }
-
- public void setWebServiceTestIds(String[] webServiceTestIds) {
- this.webServiceTestIds = webServiceTestIds;
- }
-
- public String[] getWebServiceTestIds() {
- return webServiceTestIds;
- }
-
- public void setWebServiceTestTypes(String[] webServiceTestTypes)
- {
- this.webServiceTestTypes = webServiceTestTypes;
- }
-
- public String[] getWebServiceTestTypes()
- {
- return webServiceTestTypes;
- }
-
- public ScenarioContext copy() {
- TransientScenarioContext context = new TransientScenarioContext();
- context.setWebServiceTestIds(getWebServiceTestIds());
- context.setWebServiceTestTypes(getWebServiceTestTypes());
- context.setNonJavaTestService(getNonJavaTestService());
-
- context.setWebServiceType( getWebServiceType() );
- context.setClientWebServiceType( getClientWebServiceType() );
- context.setGenerateProxy( getGenerateProxy() );
- context.setLaunchWebServiceExplorer( getLaunchWebServiceExplorer() );
- context.setInstallWebService( getInstallWebService() );
- context.setInstallClient( getInstallClient() );
- context.setStartWebService( getStartWebService() );
- context.setTestWebService( getTestWebService() );
- context.setMonitorWebService(getMonitorWebService());
- context.setLaunchSampleEnabled( isLaunchSampleEnabled() );
- context.setGenerateWebService(getGenerateWebService()); //jvh
- return context;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getClientWebServiceType()
- */
- public String getClientWebServiceType()
- {
- return clientWebServiceType_;
- }
-
- public String getClientWebServiceTypeDefault(){ return defaults.webserviceClientTypeDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getGenerateProxy()
- */
- public boolean getGenerateProxy()
- {
- return generateProxy_;
- }
-
- public boolean getGenerateProxyDefault(){ return defaults.generateProxyDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchWebServiceExplorer()
- */
- public boolean getLaunchWebServiceExplorer()
- {
- return launchWebServiceExplorer_;
- }
-
- public boolean getLaunchWebServiceExplorerDefault(){ return defaults.launchWebserviceExplorerDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getInstallWebService()
- */
- public boolean getInstallWebService()
- {
- return installWebService_;
- }
-
- public boolean getInstallWebServiceDefault(){ return defaults.installWebserviceDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getInstallWebService()
- */
- public boolean getInstallClient()
- {
- return installClient_;
- }
-
- public boolean getInstallClientDefault(){ return defaults.installClientDefault(); }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getStartWebService()
- */
- public boolean getStartWebService()
- {
- return startWebService_;
- }
-
- public boolean getStartWebServiceDefault(){ return defaults.startWebserviceDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getTestWebService()
- */
- public boolean getTestWebService()
- {
- return testWebService_;
- }
-
- public boolean getTestWebServiceDefault(){ return defaults.testWebserviceDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getWebServiceType()
- */
- public String getWebServiceType()
- {
- return webServiceType_;
- }
-
- public String getWebServiceTypeDefault(){ return defaults.webserviceTypeIdDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setClientWebServiceType(java.lang.String)
- */
- public void setClientWebServiceType(String value)
- {
- clientWebServiceType_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setGenerateProxy(boolean)
- */
- public void setGenerateProxy(boolean value)
- {
- generateProxy_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchWebServiceExplorer(boolean)
- */
- public void setLaunchWebServiceExplorer(boolean value)
- {
- launchWebServiceExplorer_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setInstallWebService(boolean)
- */
- public void setInstallWebService(boolean value)
- {
- installWebService_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setInstallWebService(boolean)
- */
- public void setInstallClient(boolean value)
- {
- installClient_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setStartWebService(boolean)
- */
- public void setStartWebService(boolean value)
- {
- startWebService_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setTestWebService(boolean)
- */
- public void setTestWebService(boolean value)
- {
- testWebService_ = value;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setWebServiceType(java.lang.String)
- */
- public void setWebServiceType(String value)
- {
- webServiceType_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getMonitorWebService()
- */
- public boolean getMonitorWebService()
- {
- return monitorWebService;
- }
-
- public boolean getMonitorWebServiceDefault()
- {
- return defaults.getMonitorWebServiceDefault();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setMonitorWebService(boolean)
- */
- public void setMonitorWebService(boolean value)
- {
- monitorWebService = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchSampleEnabledDefault()
- */
- public boolean getLaunchSampleEnabledDefault()
- {
- return defaults.launchSample();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#isLaunchSampleEnabled()
- */
- public boolean isLaunchSampleEnabled()
- {
- return launchSample_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchSampleEnabled(boolean)
- */
- public void setLaunchSampleEnabled(boolean value)
- {
- launchSample_ = value;
- }
-
- public void setGenerateWebService(int value)
- {
- generateWebService_ = value;
- }
-
- public int getGenerateWebServiceDefault()
- {
- return defaults.serviceGenerationDefault();
- }
-
- public int getGenerateWebService()
- {
- return generateWebService_;
- }
-
- public int getGenerateClientDefault()
- {
- return defaults.clientGenerationDefault();
- }
-
- public int getGenerateClient()
- {
- return generateClient_;
- }
-
- public void setGenerateClient(int value)
- {
- generateClient_ = value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
deleted file mode 100644
index a24addb41..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-public interface UDDIPreferenceContext
-{
- /*
- * This constant String is used to lookup the column delimiter for user-defined UDDI
- * Category data.
- */
- public static final String PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER = "uddiCatDataColumnDelimiter";
-
- /*
- * This constant String is used to lookup the string delimiter for user-defined UDDI
- * Category data.
- */
- public static final String PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER = "uddiCatDataStringDelimiter";
-
- public void setUddiCatDataColumnDelimiter(String delimiter);
- public String getUddiCatDataColumnDelimiter();
- public void setUddiCatDataStringDelimiter(String delimiter);
- public String getUddiCatDataStringDelimiter();
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
deleted file mode 100644
index 39eba91a8..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-public class UDDIPreferenceDefaults
-{
- public static final String getUddiCatDataColumnDelimiter()
- {
- return "#";
- }
-
- public static final String getUddiCatDataStringDelimiter()
- {
- return "\"";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
deleted file mode 100644
index 4bd0f64e4..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 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
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.data;
-
-public class LabelsAndIds
-{
- private String[] labels_;
- private String[] ids_;
-
- /**
- * @return Returns the ids_.
- */
- public String[] getIds_()
- {
- return ids_;
- }
- /**
- * @param ids_ The ids_ to set.
- */
- public void setIds_(String[] ids_)
- {
- this.ids_ = ids_;
- }
- /**
- * @return Returns the labels_.
- */
- public String[] getLabels_()
- {
- return labels_;
- }
- /**
- * @param labels_ The labels_ to set.
- */
- public void setLabels_(String[] labels_)
- {
- this.labels_ = labels_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
deleted file mode 100644
index 25b44417c..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.data;
-
-public class TypeRuntimeServer
-{
- private String typeId_ = "";
- private String runtimeId_ = "";
- private String serverId_ = "";
- private String serverInstanceId_;
-
- /**
- * @return Returns the runtimeId_.
- */
- public String getRuntimeId()
- {
- return runtimeId_;
- }
- /**
- * @param runtimeId_ The runtimeId_ to set.
- */
- public void setRuntimeId(String runtimeId_)
- {
- this.runtimeId_ = runtimeId_;
- }
- /**
- * @return Returns the serverId_.
- */
- public String getServerId()
- {
- return serverId_;
- }
- /**
- * @param serverId_ The serverId_ to set.
- */
- public void setServerId(String serverId_)
- {
- this.serverId_ = serverId_;
- }
- /**
- * @return Returns the serverInstanceId_.
- */
- public String getServerInstanceId()
- {
- return serverInstanceId_;
- }
- /**
- * @param serverInstanceId_ The serverInstanceId_ to set.
- */
- public void setServerInstanceId(String serverInstanceId_)
- {
- this.serverInstanceId_ = serverInstanceId_;
- }
- /**
- * @return Returns the typeId_.
- */
- public String getTypeId()
- {
- return typeId_;
- }
- /**
- * @param typeId_ The typeId_ to set.
- */
- public void setTypeId(String typeId_)
- {
- this.typeId_ = typeId_;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString()
- {
- return "type(" + typeId_ + ") runtime(" + runtimeId_ + ") factory(" + serverId_ + ") servInstId(" + serverInstanceId_ + ")";
- }
-
- public boolean equals(Object object)
- {
- if (object != null && object instanceof TypeRuntimeServer)
- {
- TypeRuntimeServer trs = (TypeRuntimeServer)object;
- String trsTypeId = trs.getTypeId();
- String trsRuntimeId = trs.getRuntimeId();
- String trsServerId = trs.getServerId();
- String trsServerInstanceId = trs.getServerInstanceId();
-
- boolean typeIdsMatch = ((typeId_ == null) && (trsTypeId == null)) || ((typeId_ != null) && (typeId_.equals(trsTypeId)));
- if (!typeIdsMatch) return false;
- boolean runtimeIdsMatch = ((runtimeId_ == null) && (trsRuntimeId == null)) || ((runtimeId_ != null) && (runtimeId_.equals(trsRuntimeId)));
- if (!runtimeIdsMatch) return false;
- boolean serverIdsMatch = ((serverId_ == null) && (trsServerId == null)) || ((serverId_ != null) && (serverId_.equals(trsServerId)));
- if (!serverIdsMatch) return false;
- boolean serverInstanceIdsMatch = ((serverInstanceId_ == null) && (trsServerInstanceId == null)) || ((serverInstanceId_ != null) && (serverInstanceId_.equals(trsServerInstanceId)));
- if (!serverInstanceIdsMatch) return false;
-
- return true;
- }
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
deleted file mode 100644
index e5b134ef9..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.dialog;
-
-/**
-* Constants for status dialogs
-*/
-public interface IStatusDialogConstants {
-
- /*
- * Button ID for the "Yes" button
- */
- public static final int YES_ID = 2;
- /*
- * Button ID for the "Yes to all" button
- */
- public static final int YES_TO_ALL_ID = 4;
- /*
- * Button ID for the "Cancel" button
- */
- public static final int CANCEL_ID = 1;
- /*
- * Button ID for the "OK" button
- */
- public static final int OK_ID = 0;
- /*
- * Button ID for the "Details" button
- */
- public static final int DETAILS_ID = 13;
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java
deleted file mode 100644
index 69c691046..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-* All Extensions with exectutable extensions should implement this
-* to fit our framework
-*/
-public interface WebServiceExecutable
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /**
- *Returns a wizard fragment for this exention type
- *
- */
- public AbstractDataModelOperation getFinishCommand();
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
deleted file mode 100644
index 286a9a13b..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
-* This represents an extension in the plugin registry
-* It job is to act as a proxy to the iconfigelement
-*/
-public interface WebServiceExtension
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * If the extension has code that needs to be executed or a fragment added
- * @return WebServiceExecutable this interface holds executable code and a
- * fragment
- */
- public Object getWebServiceExecutableExtension();
-
- /**
- * This is the config element that holds the extension info
- * @param IConfigurationElement Extension element
- */
- public void setConfigElement(IConfigurationElement configElement);
-
- /**
- * If the extension has code that
- * @return IConfigurationElement Extension element
- */
- public IConfigurationElement getConfigElement();
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
deleted file mode 100644
index 60720d448..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-
-
-
-
-
-/**
-* This represents an extension in the plugin registry
-* It job is to act as a proxy to the iconfigelement
-*/
-public class WebServiceExtensionImpl implements WebServiceExtension
-{
-
- private ILog log_;
-
- /*
- * The ConfigElement that holds extension info
- */
- protected IConfigurationElement configElement_;
-
- /*
- * The extension executable
- */
- protected WebServiceExecutable webServiceExecutable_;
-
-
- public WebServiceExtensionImpl(IConfigurationElement configElement)
- {
- configElement_ = configElement;
- log_ = EnvironmentService.getEclipseLog();
- }
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * If the extension has code that needs to be executed or a fragment added
- * @return WebServiceExecutable this interface holds executable code and a
- * fragment
- */
- public Object getWebServiceExecutableExtension()
- {
- if(webServiceExecutable_ != null) return webServiceExecutable_;
-
- try{
- return configElement_.createExecutableExtension("class");
- }catch (CoreException e){
- log_.log(ILog.ERROR, 5029, this, "getWebServiceExecutableExtension",e);
- }
-
- return null;
- }
-
- /**
- * This is the config element that holds the extension info
- * @param IConfigurationElement Extension element
- */
- public void setConfigElement(IConfigurationElement configElement)
- {
- configElement_ = configElement;
- }
-
- /**
- * This is the config element that holds the extension info
- * @return IConfigurationElement Extension element
- */
- public IConfigurationElement getConfigElement()
- {
- return configElement_;
- }
-
- /**
- * The name of the extension being used
- * @return String name of this extension
- */
- public String getName()
- {
- return getConfigElement().getAttribute( "name" );
- }
-
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
deleted file mode 100644
index afc1d0721..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-
-/**
-* Returns the names of the extensions for a given extension-point
-* also returns the extension objects
-*
-*/
-public interface WebServiceExtensionRegistry
-{
-
- /**
- * Returns the names of all registered extensions
- * @return The names of all registered extensions.
- */
- public String[] getWebServiceExtensionNames ();
-
- /**
- * Returns the extension object of the given name
- *@return WebServiceExtension object
- */
- public WebServiceExtension getWebServiceExtensionsByName( String name);
-
- /**
- * Returns All extention objects in this registry
- *@return WebServiceExtension objects
- */
- public WebServiceExtension[] getWebServiceExtensions();
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
deleted file mode 100644
index 46bea11f7..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-
-
-/**
-* This is a generic registry which sets up general code in handling
-* IConfigElements for an extension
-*/
-public abstract class WebServiceExtensionRegistryImpl implements WebServiceExtensionRegistry
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- protected Hashtable nameExtensionTable_;
- protected Vector id_;
- protected Vector label_;
- private LabelsAndIds labelsandids_;
-
- public WebServiceExtensionRegistryImpl()
- {
- nameExtensionTable_ = new Hashtable();
- label_ = new Vector();
- id_ = new Vector();
- loadExtensions();
- }
-
- /**
- * Children registries will have different extension types
- * @return WebserviceExtension holds a config elem
- * for that extension capable of creating an executable file
- */
- public abstract WebServiceExtension createWebServiceExtension(IConfigurationElement configElement);
-
- /**
- * Children must implement how they get the IConfigurationElement[]
- * @return IConfigurationElement[] an array of elements particular to that
- * extension
- */
- public abstract IConfigurationElement[] getConfigElements();
-
- /*
- * Loads WebServiceExtensions for WebServiceClientTest into this registry.
- * This is done by querying the plugin registry for all extensions
- * that extend webServiceClientTest
- */
- protected void loadExtensions ()
- {
- IConfigurationElement[] config = getConfigElements();
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- String label = elem.getAttribute( "label" );
- String id = elem.getAttribute( "id" );
- WebServiceExtension webServiceExtension = createWebServiceExtension(elem);
- nameExtensionTable_.put(label,webServiceExtension);
- label_.add(label);
- id_.add(id);
- }
- }
-
- /**
- * Returns the names of all registered extensions
- * @return The names of all registered extensions.
- */
- public String[] getWebServiceExtensionNames ()
- {
- return (String[])nameExtensionTable_.keySet().toArray( new String[0] );
- }
-
- /**
- * Return the names and Ids
- */
- public LabelsAndIds getLabelsAndIDs()
- {
- labelsandids_ = new LabelsAndIds();
- labelsandids_.setLabels_((String[])label_.toArray( new String[0] ));
- labelsandids_.setIds_((String[])id_.toArray( new String[0] ));
- return labelsandids_;
- }
-
- /**
- * Returns the extension object of the given name
- * @return WebServiceExtension object
- */
- public WebServiceExtension getWebServiceExtensionsByName( String name)
- {
- return (WebServiceExtension)nameExtensionTable_.get(name);
- }
-
- /**
- * Returns All extention objects in this registry
- *@return WebServiceExtension objects
- */
- public WebServiceExtension[] getWebServiceExtensions()
- {
- return (WebServiceExtension[])nameExtensionTable_.values().toArray( new WebServiceExtension[0] );
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
deleted file mode 100644
index 9fb367ebb..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-
-public interface JavaProxyTestCommand extends WebServiceTestFinishCommand
-{
-
- /**
- * This holds an info class that comes from user input or some calcilations that needs to be
- * used for the finish
- */
-
- public void setJspFolder(String jspFolder);
-
- public void setRunClientTest(boolean runClientTest);
-
- public void setSampleProject(String sampleProject);
-
- public void setProxyBean(String proxyBean);
-
- public void setSetEndpointMethod(String setEndpointMethod);
-
- public void setClientProject(String clientProject);
-
- public void setMethods(BooleanSelection[] methods);
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
deleted file mode 100644
index 8317253b7..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-public interface WSDLTestFinishCommand extends WebServiceTestFinishCommand
-{
- public void setServiceProject(String serverProject);
- public void setWsdlServiceURL(String wsdlURI);
- public void setExternalBrowser(boolean external);
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java
deleted file mode 100644
index 257ef4e08..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060816 104870 kathy@ca.ibm.com - Kathy Chan
- * 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtensionImpl;
-
-
-
-
-/**
-* This represents an extension in the plugin registry
-* It job is to act as a proxy to the iconfigelement
-* In particular it holds a client test extension element
-*/
-public class WebServiceTestExtension extends WebServiceExtensionImpl
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private List supportedRuntimes_ = new ArrayList();
-
- public WebServiceTestExtension(IConfigurationElement configElement)
- {
- super(configElement);
-
- String runtimesList = getConfigElement().getAttribute("supportedClientRuntimes");
-
- addRuntimes(runtimesList);
- }
-
- /**
- * Adds a list of space delimited runtime IDs.
- *
- * @param runtimesList The list of runtime IDs.
- */
- public void addRuntimes(String runtimesList) {
-
- if (runtimesList == null)
- return;
-
- String[] runtimes = runtimesList.split("\\s+");
-
- for (int i = 0; i < runtimes.length; i++) {
- if (runtimes[i].length() > 0)
- supportedRuntimes_.add(runtimes[i]);
- }
- }
-
- /**
- * Will this testClient generate code
- * @return boolean true if codegen needed
- */
- public boolean isCodeGenNeeded()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "codeGenerated" )).booleanValue();
- }
-
- /**
- * Use the default Folder Provided by us
- * @return boolean true if no special folder requires
- */
- public boolean useDefaultCodeGenFolder()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "defaultcodegenfolder" )).booleanValue();
- }
-
- /**
- * Use Special Folder for generated code
- * @return String special folder name
- */
- public String getCodeGenFolder()
- {
- return getConfigElement().getAttribute( "codegenfolder" );
- }
-
- public boolean isDefaultJAXRPC()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "isdefaultjaxrpc" )).booleanValue();
- }
-
- /**
- * Do we need to launch something
- * @return Boolean if true launch codegen
- */
- public boolean isLaunchRequired()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "launchRequired" )).booleanValue();
- }
-
- /**
- * Do we need the methods for the proxy
- * @return boolean true if proxy methods needed
- */
- public boolean areMethodsNeeded()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "methodsneeded" )).booleanValue();
- }
-
- /**
- * Does this test machine need a server
- * @return boolean true if a server is required
- */
- public boolean isServerNeeded()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "serverRequired" )).booleanValue();
- }
-
- /**
- * Use the Default Server chosen by the wizard
- * @return boolean true if the default server is wanted
- */
- public boolean useDefaultServer()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "defaultserver" )).booleanValue();
- }
-
- /**
- * Use the Default Server chosen by the wizard
- * @return boolean true if the default server is wanted
- */
- public String useServer()
- {
- return getConfigElement().getAttribute( "useserver" );
- }
-
- public boolean testWSDL()
- {
- String wsdl = getConfigElement().getAttribute( "testWSDL" );
- if(wsdl.equals("yes") || wsdl.equals("true"))
- return true;
-
- return false;
- }
-
- public boolean testJavaProxy()
- {
- String javaProxy = getConfigElement().getAttribute( "testJavaProxy" );
- if(javaProxy == null) return false;
- if(javaProxy.equals("yes") || javaProxy.equals("true"))
- return true;
-
- return false;
- }
-
- /**
- * Returns the id attribute of this WebServiceTestExtension
- *
- * @return The value of the id attribute.
- */
- public String getId() {
- return getConfigElement().getAttribute( "id" );
- }
-
- /**
- * Returns the label attribute of this WebServiceTestExtension
- *
- * @return The value of the label attribute.
- */
- public String getLabel() {
- return getConfigElement().getAttribute( "label" );
- }
-
- /**
- * Does this extension allow extenders to restrict the runtimes that are supported?
- *
- * @return The value of the allowRunimesRestriction attribute, false if not present.
- */
- public boolean allowClientRuntimesRestriction() {
- return Boolean.valueOf(getConfigElement().getAttribute( "allowClientRuntimesRestriction" )).booleanValue();
- }
-
- /**
- * Determines if this WebServiceTestExtension supports the give client runtime ID.
- *
- * @return true if the client runtime ID is supported, false otherwise.
- */
- public boolean supportsRuntime(String runtimeId) {
-
- if (!allowClientRuntimesRestriction() || supportedRuntimes_.isEmpty())
- return true;
-
- return supportedRuntimes_.contains(runtimeId);
- }
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java
deleted file mode 100644
index c11e9d056..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import java.util.List;
-import org.eclipse.wst.server.core.IServer;
-
-public interface WebServiceTestFinishCommand
-{
-
- /**
- * If the command needs a server this is the chosen
- * client serverID
- * @param sampleServerTypeID
- */
- public void setServerTypeID(String serviceServerTypeID);
-
- /**
- * This is the IServer if required
- * @param sampleExistingServer
- */
- public void setExistingServer(IServer serviceExistingServer);
-
- /**
- * This is the endpoints if monitor service is enabled
- * @param endpoints
- */
- public void setEndpoint(List endpoints);
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
deleted file mode 100644
index 8cfeccc03..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20070314 154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtension;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl;
-
-public class WebServiceTestRegistry extends WebServiceExtensionRegistryImpl
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /*
- * This is a singleton becasue it was decided that the memory foot print
- * is not as expensive as the time taken retrieving the data
- *
- */
-
-
- private static WebServiceTestRegistry wstr;
-
- public static WebServiceTestRegistry getInstance()
- {
- if(wstr == null) wstr = new WebServiceTestRegistry();
- return wstr;
- }
-
- private WebServiceTestRegistry()
- {
- super();
- }
-
- /**
- * Helper method to "join" an existing value and a new value together by
- * a space in between. Handles special case when either value is null.
- *
- * @param existingValue The existing value
- * @param newValue The new value
- * @return If eiter the existing or new value is null, simply returns the
- * new value as is (which could be null). Otherwise returns the value joined
- * by a space.
- */
- private String genNewValue(String existingValue, String newValue) {
-
- if (existingValue == null || newValue == null)
- return newValue;
-
- return existingValue + " " + newValue;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl#loadExtensions()
- */
- protected void loadExtensions ()
- {
- // keep track of the support runtimes for each test facility ID
- Hashtable supportedClientRuntimes = new Hashtable();
-
- IConfigurationElement[] config = getConfigElements();
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- String label = elem.getAttribute( "label" );
- String id = elem.getAttribute( "id" );
-
- // label is found, hence we have a master extension element
- if (label != null) {
- WebServiceExtension webServiceExtension = createWebServiceExtension(elem);
- nameExtensionTable_.put(id,webServiceExtension);
- label_.add(label);
- id_.add(id);
- }
-
- // slave extension element, which only has the id and supportedClientRuntimes attributes
- else {
- String existingValue = (String) supportedClientRuntimes.get(id);
- String newValue = genNewValue(existingValue, elem.getAttribute("supportedClientRuntimes"));
-
- if (newValue != null)
- supportedClientRuntimes.put(id, newValue);
- }
- }
-
- // merge any supportedClientRuntimes attributes from the slave elements back to the master elements
-
- Iterator iter = nameExtensionTable_.values().iterator();
-
- while (iter.hasNext()) {
- WebServiceTestExtension webServiceTestExtension = (WebServiceTestExtension) iter.next();
-
- // skip if the extension does not allow restriction on the supported client runtimes
- if (webServiceTestExtension.allowClientRuntimesRestriction()) {
- String id = webServiceTestExtension.getId();
- webServiceTestExtension.addRuntimes((String) supportedClientRuntimes.get(id));
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl#getWebServiceExtensionNames()
- */
- public String[] getWebServiceExtensionNames() {
- return (String[])label_.toArray( new String[0] );
- }
-
- /**
- * Return the ID corresponding to the label.
- * @param label The label.
- * @return The ID corresponding to the label, or if the label parameter is not a label
- * (must be already an ID), it is returned.
- */
- public String labelToId(String label) {
- int labelIndex = label_.indexOf(label);
- if (labelIndex == -1)
- return label;
- return (String) id_.elementAt(labelIndex);
- }
-
- /**
- * Returns the WebServiceExtension with the given ID.
- * @param id The ID.
- * @return The WebServiceExtension object.
- */
- public WebServiceExtension getWebServiceExtensionsById(String id) {
- return (WebServiceExtension) nameExtensionTable_.get(id);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl#getWebServiceExtensionsByName(java.lang.String)
- */
- public WebServiceExtension getWebServiceExtensionsByName(String name) {
- return getWebServiceExtensionsById(labelToId(name));
- }
-
- /**
- * Children registries will have different extension types
- * @return WebserviceExtension holds a config elem
- * for that extension capable of creating an executable file
- */
- public WebServiceExtension createWebServiceExtension(IConfigurationElement configElement)
- {
- return new WebServiceTestExtension(configElement);
- }
-
- /**
- * Children must implement how they get the IConfigurationElement[]
- * @return IConfigurationElement[] an array of elements particular to that
- * extension
- */
- public IConfigurationElement[] getConfigElements()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "tester");
- return config;
- }
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
deleted file mode 100644
index b520d136a..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.context.PersistentScenarioContext;
-import org.eclipse.jst.ws.internal.context.PersistentUDDIPreferenceContext;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.UDDIPreferenceContext;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the bulk of the Web Services runtime.
-* Only the graphical user interface portion of the runtime is
-* found elsewhere - in the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServicePlugin extends Plugin
-{
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServicePlugin instance_;
-
- private PersistentResourceContext resourceContext_;
- private PersistentScenarioContext scenarioContext_;
- private PersistentUDDIPreferenceContext uddiPreferenceContext;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServicePlugin()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin.
- * @return The WebServicePlugin singleton.
- */
- public static WebServicePlugin getInstance ()
- {
- return instance_;
- }
-
- protected void initializeDefaultPluginPreferences()
- {
- ((PersistentUDDIPreferenceContext) getUDDIPreferenceContext()).load();
- }
-
- public ResourceContext getResourceContext()
- {
- if (resourceContext_ == null)
- resourceContext_ = PersistentResourceContext.getInstance();
- return resourceContext_;
- }
-
- public ScenarioContext getScenarioContext()
- {
- if (scenarioContext_ == null)
- {
- scenarioContext_ = new PersistentScenarioContext();
- scenarioContext_.load();
- }
-
- return scenarioContext_;
- }
-
- public UDDIPreferenceContext getUDDIPreferenceContext()
- {
- if (uddiPreferenceContext == null)
- uddiPreferenceContext = new PersistentUDDIPreferenceContext();
- return uddiPreferenceContext;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaClientInfo.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaClientInfo.java
deleted file mode 100644
index 919002b0b..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaClientInfo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060620 147864 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.wsrt;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-/**
- * This subclass of WebServiceClientInfo adds properties
- * relevant to descriptors of Java Web service clients.
- */
-public class WebServiceJavaClientInfo extends WebServiceClientInfo
-{
- private IType jdtType_;
-
- /**
- * Returns the JDT IType of the primary Java proxy class
- * of a Web service client, or null if no such class has
- * been located.
- * @return The JDT IType of the Java client proxy class.
- */
- public IType getType ()
- {
- return jdtType_;
- }
-
- /**
- * Sets the JDT IType of the primary Java proxy class
- * of a Web service client.
- * @param jdtType The JDT IType of the Java client proxy class.
- */
- public void setType ( IType jdtType )
- {
- jdtType_ = jdtType;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaInfo.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaInfo.java
deleted file mode 100644
index 66d9ec99b..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaInfo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060620 147864 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.wsrt;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-/**
- * This subclass of WebServiceInfo adds properties
- * relevant to descriptors of Java Web services.
- */
-public class WebServiceJavaInfo extends WebServiceInfo
-{
- private IType jdtType_;
-
- /**
- * Returns the JDT IType of the primary Java implementation
- * class of a Web service, or null if no such class has
- * been located.
- * @return The JDT IType of the Java implementation class.
- */
- public IType getType ()
- {
- return jdtType_;
- }
-
- /**
- * Sets the JDT IType of the primary Java implementation
- * class of a Web service.
- * @param jdtType The JDT IType of the Java implementation class.
- */
- public void setType ( IType jdtType )
- {
- jdtType_ = jdtType;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/.classpath b/bundles/org.eclipse.wst.command.env.core/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.command.env.core/.cvsignore b/bundles/org.eclipse.wst.command.env.core/.cvsignore
deleted file mode 100644
index 8b68b0547..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-envcore.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.wst.command.env.core/.project b/bundles/org.eclipse.wst.command.env.core/.project
deleted file mode 100644
index 6327deaaa..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.command.env.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index eede846b0..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:37:21 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 1d7a235d2..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:34 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 15d3ca810..000000000
--- a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env.core
-Bundle-Version: 1.0.204.qualifier
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.internal.env.core;x-internal:=true,
- org.eclipse.wst.command.internal.env.core.common;x-internal:=true,
- org.eclipse.wst.command.internal.env.core.context;x-internal:=true,
- org.eclipse.wst.command.internal.env.core.data;x-internal:=true,
- org.eclipse.wst.command.internal.env.core.fragment;x-internal:=true,
- org.eclipse.wst.command.internal.env.core.registry;x-internal:=true,
- org.eclipse.wst.command.internal.env.core.selection;x-internal:=true,
- org.eclipse.wst.command.internal.env.core.uri;x-internal:=true
-Require-Bundle: org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.200,2.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.wst.command.env.core/about.html b/bundles/org.eclipse.wst.command.env.core/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.wst.command.env.core/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.command.env.core/build.properties b/bundles/org.eclipse.wst.command.env.core/build.properties
deleted file mode 100644
index 64b82c6a2..000000000
--- a/bundles/org.eclipse.wst.command.env.core/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-###############################################################################
-bin.includes = *.jar,\
- .,\
- META-INF/,\
- plugin.properties,\
- about.html
-src.includes = component.xml
-source.. = src/
-output.. = bin/
-
diff --git a/bundles/org.eclipse.wst.command.env.core/component.xml b/bundles/org.eclipse.wst.command.env.core/component.xml
deleted file mode 100644
index 7c458f7de..000000000
--- a/bundles/org.eclipse.wst.command.env.core/component.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.command">
- <component-depends unrestricted="true">
- </component-depends>
- <plugin id="org.eclipse.wst.command.env" fragment="false"/>
- <plugin id="org.eclipse.wst.command.env.core" fragment="false"/>
- <plugin id="org.eclipse.wst.command.env.ui" fragment="false"/>
-</component>
diff --git a/bundles/org.eclipse.wst.command.env.core/plugin.properties b/bundles/org.eclipse.wst.command.env.core/plugin.properties
deleted file mode 100644
index c71709d6d..000000000
--- a/bundles/org.eclipse.wst.command.env.core/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Environment Command Framework (core)
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java
deleted file mode 100644
index 8ad8dec72..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * This interface is used to create Command objects.
- *
- */
-public interface CommandFactory
-{
- /**
- *
- * @return returns a created Command object.
- */
- public AbstractDataModelOperation create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java
deleted file mode 100644
index 4b946d299..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-/**
- * CommandManagers help manage the lifecycle of Commands.
- */
-public interface CommandManager
-{
- /**
- * Returns true if this CommandManager is capable of undoing
- * Commands. Some CommandManagers and Environments may be of
- * a sort that will never undo() Commands. Command.execute()
- * methods should take advantage of this method to optimize
- * out any caching logic whenever this method returns false.
- */
- public boolean isUndoEnabled ();
-
- // There's probably more, like factory methods for creating
- // Undo/Redo stacks and stuff like that.
-
- public DataMappingRegistry getMappingRegistry();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties
deleted file mode 100644
index c11d8c020..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070418 177005 pmoogk@ca.ibm.com - Peter Moogk
-###############################################################################
-
-#
-# Common Messages
-#
-MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occurred.
-
-TITLE_WARNING=Warning:
-TITLE_ERROR=Error:
-TITLE_INFO=Info:
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCoreMessages.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCoreMessages.java
deleted file mode 100644
index 94581af68..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCoreMessages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EnvironmentCoreMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.wst.command.internal.env.core.EnvironmentCore";//$NON-NLS-1$
-
- private EnvironmentCoreMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_UNEXPECTED_ERROR;
- public static String TITLE_WARNING;
- public static String TITLE_ERROR;
- public static String TITLE_INFO;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EnvironmentCoreMessages.class);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java
deleted file mode 100644
index 182a28b10..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core;
-
-import java.util.Iterator;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- *
- * This class is used to return a sequence of Commands.
- *
- */
-public interface ICommandFactory extends Iterator
-{
- /**
- *
- * @return returns the next Command in the sequence.
- */
- public AbstractDataModelOperation getNextCommand();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java
deleted file mode 100644
index 75fdc4a52..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core;
-
-import java.util.Vector;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class SimpleCommandFactory implements ICommandFactory
-{
- private Vector commands_;
- private int index_;
-
- public SimpleCommandFactory( Vector commands )
- {
- commands_ = commands;
- index_ = 0;
- }
-
- public AbstractDataModelOperation getNextCommand()
- {
- return (AbstractDataModelOperation)next();
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean hasNext()
- {
- return index_ < commands_.size();
- }
-
- public Object next()
- {
- return commands_.elementAt(index_++);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java
deleted file mode 100644
index c612cf769..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-/**
- * This interface defines a boolean condition that can be evaluated for any object.
- */
-public interface Condition
-{
- /**
- * This returns whether the given object passes this condition.
- */
- public boolean evaluate();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java
deleted file mode 100644
index fafa804c8..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-/**
- * This interface can be used when a conditional object needs to be returned.
-**/
-public interface Evaluate
-{
- /**
- * @return returns an object based on some evaluated condition.
- **/
- public Object evaluate();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java
deleted file mode 100644
index c72cd47bd..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import java.text.MessageFormat;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-/**
- * This class provides a convienent way to access resource bundles and
- * retieve translated strings.
- *
- *
- */
-public class MessageUtils
-{
- private ResourceBundle resource_;
-
- private static Hashtable bundles_ = new Hashtable();
-
- /**
- *
- * @param bundleId the resource bundle ID.
- * @param object the class loader for this object will be used to retrieve
- * the resource bundle.
- */
- public MessageUtils( String bundleId, Object object )
- {
- this( bundleId, object.getClass().getClassLoader() );
- }
-
- /**
- *
- * @param bundleId the resource bundle ID.
- * @param loader the class loader that will be used to retrieve
- * the resource bundle.
- */
- public MessageUtils( String bundleId, ClassLoader loader )
- {
- resource_ = (ResourceBundle)bundles_.get( bundleId );
-
- if( resource_ == null )
- {
- resource_ = ResourceBundle.getBundle( bundleId, Locale.getDefault(), loader );
- bundles_.put( bundleId, resource_ );
- }
- }
-
- /**
- *
- * @param key the key for the string to retrieve.
- * @return returns the translated string.
- */
- public String getMessage ( String key )
- {
- String value = key;
-
- try
- {
- value = resource_.getString( key );
- }
- catch( Throwable exc )
- {
- }
-
- return value;
- }
-
- /**
- *
- * @param key the key for the string to retrieve.
- * @param args These arguments will be substituted into the translated string.
- * @return returns the translated string with any substitutions.
- */
- public String getMessage ( String key, Object[] args )
- {
- return MessageFormat.format( getMessage(key),args );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java
deleted file mode 100644
index 4028caa12..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public class ProgressUtils
-{
- static public void report( IProgressMonitor monitor, String message )
- {
- if( monitor != null )
- {
- monitor.beginTask( message, IProgressMonitor.UNKNOWN );
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java
deleted file mode 100644
index 29224f4a9..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import org.eclipse.wst.common.environment.uri.IURI;
-
-/**
- * Carries position information within a resource.
- */
-public interface Range
-{
- public static final int UNKNOWN = -1;
-
- /**
- * Returns the identifier of the resource the range applies to.
- */
- public IURI getURI ();
-
- /**
- * Returns the index, zero-indexed, of the first line
- * of the range.
- */
- public int getStartingLineNumber ();
-
- /**
- * Returns the index, zero-indexed, of the first character
- * of the range relative to the beginning of the line.
- */
- public int getStartingCharNumberInLine ();
-
- /**
- * Returns the index, zero-indexed, of the first character
- * of the range relative to the beginning of the file.
- */
- public int getStartingCharNumberInURI ();
-
- /**
- * Returns the index, zero-indexed, of the last line
- * of the range.
- */
- public int getEndingLineNumber ();
-
- /**
- * Returns the offset, zero-indexed, of the last character
- * of the range relative to the beginning of the line.
- */
- public int getEndingCharNumberInLine ();
-
- /**
- * Returns the index, zero-indexed, of the last character
- * of the range relative to the beginning of the file.
- */
- public int getEndingCharNumberInURI ();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java
deleted file mode 100644
index 7f460baf5..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import java.util.Vector;
-
-/**
- * This Vector makes the protected method removeRange public.
- *
- */
-public class RangeVector extends Vector
-{
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 4048793476659230773L;
-
- public void removeRange( int start, int end )
- {
- super.removeRange( start, end );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java
deleted file mode 100644
index a03a57201..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.command.internal.env.core.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-public class StatusUtils
-{
- public static IStatus errorStatus( String errorMessage )
- {
- return new Status( IStatus.ERROR, "id", 0, errorMessage, null );
- }
-
- public static IStatus errorStatus( Throwable exc )
- {
- String message = exc.getMessage();
-
- return new Status( IStatus.ERROR, "id", 0, message == null ? "" : message, exc );
- }
-
- public static IStatus errorStatus( String message, Throwable exc )
- {
- return new Status( IStatus.ERROR, "id", 0, message, exc );
- }
-
- public static MultiStatus multiStatus( String message, IStatus[] children, Throwable exc )
- {
- return new MultiStatus( "id", 0, children, message, exc );
- }
-
- public static MultiStatus multiStatus( String message, IStatus[] children )
- {
- return new MultiStatus( "id", 0, children, message, null );
- }
-
- public static IStatus warningStatus( String warningMessage )
- {
- return new Status( IStatus.WARNING, "id", 0, warningMessage, null );
- }
-
- public static IStatus warningStatus( String warningMessage, Throwable exc )
- {
- return new Status( IStatus.WARNING, "id", 0, warningMessage, exc );
- }
-
- public static IStatus infoStatus( String infoMessage )
- {
- return new Status( IStatus.INFO, "id", 0, infoMessage, null );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java
deleted file mode 100644
index e9726a0b5..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-/**
- * This interface provides a way to get and set preference information.
- *
- */
-public interface Context
-{
- /**
- * Loads the preference data into this Context object.
- *
- */
- public void load();
-
- /**
- * Sets the default for a boolean preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setDefault (String name, boolean value);
-
- /**
- * Sets the default for a string preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setDefault (String name, String value);
-
- /**
- * Sets the default for a int preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setDefault (String name, int value);
-
- /**
- * Sets the value for a string preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setValue (String name, String value);
-
- /**
- * Sets the value for a boolean preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setValue (String name, boolean value);
-
- /**
- * Sets the value for a int preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setValue (String name, int value);
-
- /**
- * Gets the value for a string preference.
- * @param name the preference name.
- * @return the preference value.
- */
- public String getValueAsString ( String name);
-
- /**
- * Gets the value for a boolean preference.
- * @param name the preference name.
- * @return the preference value.
- */
- public boolean getValueAsBoolean ( String name);
-
- /**
- * Gets the value for a int preference.
- * @param name the preference name.
- * @return the preference value.
- */
- public int getValueAsInt ( String name);
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java
deleted file mode 100644
index 405c75a6a..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-public interface ResourceContext
-{
- /**
- * This constant string is used to lookup the overwrite files general preference from
- * the plugins local preferences store.
- **/
- public static final String PREFERENCE_OVERWRITE = "filesOverwrite";
-
- /**
- * This constant string is used to lookup the create folders general preference from
- * the plugins local preferences store.
- **/
- public static final String PREFERENCE_CREATE_FOLDERS = "createFolders";
-
- /**
- * This constant string is used to lookup the checkout files general preference from
- * the plugins local preferences store.
- **/
- public static final String PREFERENCE_CHECKOUT = "filesCheckout";
-
- /**
- *
- * @param enable set whether overwriting of files is enabled.
- */
- public void setOverwriteFilesEnabled ( boolean enable);
-
- /**
- *
- * @return returns whether overwriting of files is enabled.
- */
- public boolean isOverwriteFilesEnabled();
-
- /**
- *
- * @param enable set whether creation of folders is enabled.
- */
- public void setCreateFoldersEnabled( boolean enable);
-
- /**
- *
- * @return returns whether creation of folders is enabled.
- */
- public boolean isCreateFoldersEnabled();
-
- /**
- *
- * @param enable sets whether automatic checkout of files is enabled.
- */
- public void setCheckoutFilesEnabled( boolean enable);
-
- /**
- *
- * @return returns whether automatic checkout of files is enabled.
- */
- public boolean isCheckoutFilesEnabled();
-
- /**
- *
- * @return returns a copy of this ResourceContext.
- */
- public ResourceContext copy();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java
deleted file mode 100644
index 5f134419b..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-public class ResourceDefaults
-{
- private static final boolean PREFERENCE_OVERWRITE_DEFAULT = false;
- private static final boolean PREFERENCE_CREATE_FOLDERS_DEFAULT = true;
- private static final boolean PREFERENCE_CHECKOUT_DEFAULT = false;
-
- /**
- *
- * @return returns the default setting for overwriting files.
- */
- public static boolean getOverwriteFilesDefault ()
- {
- return PREFERENCE_OVERWRITE_DEFAULT;
- }
-
- /**
- *
- * @return returns the default setting ofr creating folders.
- */
- public static boolean getCreateFoldersDefault ()
- {
- return PREFERENCE_CREATE_FOLDERS_DEFAULT;
- }
-
- /**
- *
- * @return returns the default setting for checking out files.
- */
- public static boolean getCheckoutFilesDefault()
- {
- return PREFERENCE_CHECKOUT_DEFAULT;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java
deleted file mode 100644
index fb0ba3f6d..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.context;
-
-/**
- * This class implements a ResourceContext interface where the state
- * of the context data is transient.
- *
- */
-public class TransientResourceContext implements ResourceContext
-{
- private boolean overWriteFiles;
- private boolean createFolders;
- private boolean checkOutFiles;
-
- public TransientResourceContext() {
- setOverwriteFilesEnabled(ResourceDefaults.getOverwriteFilesDefault());
- setCreateFoldersEnabled(ResourceDefaults.getCreateFoldersDefault());
- setCheckoutFilesEnabled(ResourceDefaults.getCheckoutFilesDefault());
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setOverwriteFilesEnabled(boolean)
- */
- public void setOverwriteFilesEnabled(boolean enable) {
- overWriteFiles = enable;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isOverwriteFilesEnabled()
- */
- public boolean isOverwriteFilesEnabled() {
- return overWriteFiles;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setCreateFoldersEnabled(boolean)
- */
- public void setCreateFoldersEnabled(boolean enable) {
- createFolders = enable;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isCreateFoldersEnabled()
- */
- public boolean isCreateFoldersEnabled() {
- return createFolders;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setCheckoutFilesEnabled(boolean)
- */
- public void setCheckoutFilesEnabled(boolean enable) {
- checkOutFiles = enable;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isCheckoutFilesEnabled()
- */
- public boolean isCheckoutFilesEnabled() {
- return checkOutFiles;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#copy()
- */
- public ResourceContext copy() {
- ResourceContext cc = new TransientResourceContext();
- cc.setOverwriteFilesEnabled(isOverwriteFilesEnabled());
- cc.setCreateFoldersEnabled(isCreateFoldersEnabled());
- cc.setCheckoutFilesEnabled(isCheckoutFilesEnabled());
- return cc;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/BeanModifier.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/BeanModifier.java
deleted file mode 100644
index d56fc66c0..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/BeanModifier.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-public interface BeanModifier {
-
- /**
- * Performs modification on bean properties using data provided
- * @param bean The bean to be modified
- * @param propertyHolder The data to use to make the modification
- */
- public void modify(Object bean, Object propertyHolder);
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/ClassEntry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/ClassEntry.java
deleted file mode 100644
index 41e5c5664..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/ClassEntry.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060313 130958 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core.data;
-
-import java.util.Vector;
-
-public class ClassEntry
-{
- // A list of getter methods for a particular class.
- public Vector getterList_;
-
- // A list of setter methods for a particular class.
- public Vector setterList_;
-
- // A list of instance objects for this class. Only the last entry
- // should be looked at.
- private Vector objectList_ = new Vector();
-
- // A list of Interger objects that represent an ordering of objects.
- // The number of entries in the objectList vector and the orderList vector
- // should be the same. Each entry in the objectList vector is
- // corelated with each entry in the orderList vector.
- private Vector orderList_ = new Vector();
-
- public void addObject( Object object, int order )
- {
- objectList_.add(object);
- orderList_.add( new Integer(order) );
- }
-
- public Object getLastObject()
- {
- Object result = null;
-
- if( objectList_.size() > 0 )
- {
- result = objectList_.lastElement();
- }
-
- return result;
- }
-
- public int getLastOrder()
- {
- int result = -1;
-
- if( orderList_.size() > 0 )
- {
- result = ((Integer)orderList_.lastElement()).intValue();
- }
-
- return result;
- }
-
- public void removeObject( Object object )
- {
- int removalIndex = objectList_.indexOf(object);
-
- if( removalIndex != -1 )
- {
- objectList_.remove(removalIndex);
- orderList_.remove(removalIndex);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java
deleted file mode 100644
index e7ffe03f8..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060313 130958 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-
-
-public class DataFlowManager
-{
- private DataMappingRegistryImpl registry_;
- private Hashtable classTable_;
- private int order_;
- private IEnvironment environment_;
-
- public DataFlowManager( DataMappingRegistryImpl registry, IEnvironment environment )
- {
- registry_ = registry;
- classTable_ = new Hashtable();
- order_ = 0;
- environment_ = environment;
- }
-
- public DataMappingRegistry getMappingRegistry()
- {
- return registry_;
- }
-
- // Remove this instance object from the mapping table.
- public void unprocess( Object object )
- {
- String objectType = object.getClass().getName();
- ClassEntry classEntry = (ClassEntry)classTable_.get( objectType );
-
- if( classEntry != null )
- {
- classEntry.removeObject(object);
- }
- }
-
- // Add this object to our mapping table and call the setters
- // that have corresponding getter objects.
- public void process( Object object )
- {
- // Add this object to the classTable_ if required.
- String objectType = object.getClass().getName();
- ClassEntry classEntry = (ClassEntry)classTable_.get( objectType );
-
- environment_.getLog().log(ILog.INFO, "data", 5004, this, "process", "Processing: " + objectType );
-
- if( classEntry == null )
- {
- classEntry = new ClassEntry();
- classTable_.put( objectType, classEntry );
- }
-
- classEntry.addObject(object, order_++ );
-
- // Now process the setters for this object
- Vector ruleEntries = registry_.getRuleEntries( objectType );
-
- if( ruleEntries != null )
- {
- if( classEntry.setterList_ == null )
- {
- classEntry.setterList_ = getSetterList( object );
- }
-
- // For each setter in this object try to find a rule.
- for( int setterIndex = 0; setterIndex < classEntry.setterList_.size(); setterIndex++ )
- {
- ObjectMethod currentObjectMethod = new ObjectMethod();
- Method setterMethod = (Method)classEntry.setterList_.elementAt( setterIndex );
- RuleEntry currentRuleEntry = null;
-
- currentObjectMethod.order = -1;
-
- // Find rules that match this setter. Note: there can be more than one rule
- // that matches this setter. In this case we use the most recent, which is
- // defined by the order field.
- for( int index = 0; index < ruleEntries.size(); index++ )
- {
- RuleEntry ruleEntry = (RuleEntry)ruleEntries.elementAt( index );
-
- if( setterMethod.getName().equals( "set" + ruleEntry.targetProperty_ ) )
- {
- // We found a setter for this rule. Now find the getter method.
- // Note: getGetterMethod always returns a value, but if there is no
- // getters available it will set the order to -1.
- ObjectMethod getter = getGetterMethod( ruleEntry.sourceType_, ruleEntry.sourceProperty_ );
-
- if( getter.order == -1 )
- {
- environment_.getLog().log(ILog.INFO , "data", 5005, this, "process", " >>No getter found for property: " + setterMethod.getName());
- }
-
- if( currentObjectMethod.order < getter.order )
- {
- // We found a more recent getter.
- currentObjectMethod = getter;
- currentRuleEntry = ruleEntry;
- }
- }
- }
-
- if( currentObjectMethod.order != -1 )
- {
- invokeMethod( currentObjectMethod.object,
- currentObjectMethod.method,
- object,
- setterMethod,
- currentRuleEntry.transformer_ );
- }
- else
- {
- environment_.getLog().log(ILog.INFO, "data", 5006, this, "process", " >>No rule found for setter: " + setterMethod.getName() );
- }
- }
- }
- }
-
- /**
- * Find all the setters for this object and return a vector of them.
- *
- * @param object
- * @return
- */
- private Vector getSetterList( Object object )
- {
- Vector result = new Vector();
-
- Method[] methods = object.getClass().getMethods();
-
- for( int index = 0; index < methods.length; index++ )
- {
- Method method = methods[index];
- boolean isPublic = Modifier.isPublic( method.getModifiers() );
- Class returnType = method.getReturnType();
-
- if( isPublic &&
- returnType == Void.TYPE &&
- method.getParameterTypes().length == 1 &&
- method.getName().startsWith( "set" ))
- {
- method.setAccessible( true );
- result.add( method );
- }
- }
-
- return result;
- }
-
- private ObjectMethod getGetterMethod( String sourceType, String sourceProperty )
- {
- ClassEntry classEntry = (ClassEntry)classTable_.get( sourceType );
- ObjectMethod getterFound = new ObjectMethod();
-
- // Indicate that there is no getter yet.
- getterFound.order = -1;
-
- if( classEntry != null )
- {
- Object lastObject = classEntry.getLastObject();
-
- if( lastObject != null )
- {
- if( classEntry.getterList_ == null )
- {
- // Build the getter list.
- classEntry.getterList_ = getGetterList( lastObject );
- }
-
- for( int index = 0; index < classEntry.getterList_.size(); index++ )
- {
- Method getter = (Method)classEntry.getterList_.elementAt( index );
-
- if( getter.getName().equals( "get" + sourceProperty ))
- {
- getterFound.order = classEntry.getLastOrder();
- getterFound.method = getter;
- getterFound.object = lastObject;
- break;
- }
- }
- }
- }
-
- return getterFound;
- }
-
- private Vector getGetterList( Object object )
- {
- Vector result = new Vector();
-
- Method[] methods = object.getClass().getMethods();
-
- for( int index = 0; index < methods.length; index++ )
- {
- Method method = methods[index];
- boolean isPublic = Modifier.isPublic( method.getModifiers() );
- Class returnType = method.getReturnType();
-
- if( isPublic &&
- returnType != Void.TYPE &&
- method.getParameterTypes().length == 0 &&
- method.getName().startsWith( "get" ))
- {
- method.setAccessible( true );
- result.add( method );
- }
- }
-
- return result;
- }
-
- private void invokeMethod( Object sourceObject,
- Method sourceMethod ,
- Object clientObject,
- Method clientMethod,
- Transformer transformer)
- {
- Object data = null;
-
- try
- {
- data = sourceMethod.invoke( sourceObject, new Object[0] );
- }
- catch( InvocationTargetException exc )
- {
- exc.printStackTrace();
- // pgm Need to externalize this string.
- throw new IllegalArgumentException( "Provider \"" + sourceObject.getClass().getName() +
- "\" threw an exception." );
- }
- catch( IllegalAccessException exc )
- {
- exc.printStackTrace();
- // pgm Need to externalize this string.
- throw new IllegalArgumentException( "Provider \"" + sourceObject.getClass().getName() +
- "\" threw an exception." );
- }
-
- environment_.getLog().log(ILog.INFO, "data", 5007, this, "invokeMethod "," Setting prop: " + clientMethod.getName() + " data=" + data + " from: " + sourceObject.getClass().getName() );
-
-
- if( transformer != null )
- {
- data = transformer.transform( data );
- }
-
- try
- {
- clientMethod.invoke( clientObject, new Object[]{ data } );
- }
- catch( InvocationTargetException exc )
- {
- exc.printStackTrace();
- // pgm Need to externalize this string.
- throw new IllegalArgumentException( "Client \"" + clientObject.getClass().getName() +
- "\" threw an exception." );
- }
- catch( IllegalAccessException exc )
- {
- exc.printStackTrace();
- // pgm Need to externalize this string.
- throw new IllegalArgumentException( "Client \"" + clientObject.getClass().getName() +
- "\" threw an exception." );
- }
- }
-
- private class ObjectMethod
- {
- public Object object;
- public Method method;
- public int order;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java
deleted file mode 100644
index 220373139..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-public interface DataMappingRegistry
-{
- /**
- * This method adds a data mapping from a source object to a target
- * object. When the sourceObject is encountered by the framework the
- * sourceProperty will be called and the data will be passed to the
- * targetProperty in the targetObject. If a transformer object is
- * specified the sourceObject is transformed before being passed to
- * the target object.
- *
- * @param sourceType The source object.
- * @param sourceProperty The source property.
- * @param targetType The target object.
- * @param targetProperty The target property.
- * @param transformer The transformer object that transforms the
- * the source object.
- */
- public void addMapping( Class sourceType,
- String sourceProperty,
- Class targetType,
- String targetProperty,
- Transformer transformer );
-
- /**
- * This method is equivalent to the above with targetProperty the same
- * as the sourceProperty and with the transformer set to null.
- *
- * @param sourceType The source object.
- * @param sourceProperty The source property.
- * @param targetType The target object.
- */
- public void addMapping( Class sourceType,
- String sourceProperty,
- Class targetType );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java
deleted file mode 100644
index e1a5f2e7d..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-
-public class DataMappingRegistryImpl implements DataMappingRegistry
-{
- private Hashtable rulesTable_ = new Hashtable();
-
- public Vector getRuleEntries( String targetType )
- {
- return (Vector)rulesTable_.get( targetType );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class, java.lang.String, org.eclipse.wst.command.internal.env.core.data.Transformer)
- */
- public void addMapping( Class sourceType, String sourceProperty,
- Class targetType, String targetProperty,
- Transformer transformer)
- {
- Vector ruleEntries = (Vector)rulesTable_.get( targetType.getName() );
- RuleEntry ruleEntry = null;
-
- if( ruleEntries == null )
- {
- ruleEntries = new Vector();
- rulesTable_.put( targetType.getName(), ruleEntries );
- }
-
- // Find the rule entry
- for( int index = 0; index < ruleEntries.size(); index++ )
- {
- RuleEntry newEntry = (RuleEntry)ruleEntries.elementAt( index );
-
- if( sourceProperty.equals( newEntry.sourceProperty_ ) &&
- sourceType.equals( newEntry.sourceType_ ) &&
- targetProperty.equals( newEntry.targetProperty_ ) )
- {
- // The entry already exists
- ruleEntry = newEntry;
- break;
- }
- }
-
- if( ruleEntry == null )
- {
- // The rule didn't exist already so we will create a new one.
- ruleEntry = new RuleEntry(sourceType.getName(), sourceProperty, targetProperty, transformer );
- ruleEntries.add( ruleEntry );
- }
- else
- {
- // Just update the transformer.
- ruleEntry.transformer_ = transformer;
- }
- }
-
- //ruleEntries_.
-// String sourceClass = sourceType.getName();
-// String targetClass = targetType.getName();
-// Vector entries = (Vector)ruleEntries_.get( sourceClass );
-// RuleEntry ruleEntry = null;
-//
-// if( entries != null )
-// {
-// // Check to see if this mapping already exists.
-// for( int index = 0; index < entries.size(); index++ )
-// {
-// RuleEntry foundEntry = (RuleEntry)entries.elementAt( index );
-//
-// if( sourceProperty.equals( foundEntry.sourceProperty_ ) &&
-// targetType.equals( foundEntry.targetType_ ) &&
-// targetProperty.equals( foundEntry.targetProperty_ ) )
-// {
-// ruleEntry = foundEntry;
-// ruleEntry.transformer_ = transformer;
-// }
-// }
-//
-// // There is an existing vector for this sourceClass, but it didn't
-// // contain this new rule so we will add it in.
-// if( ruleEntry == null )
-// {
-// ruleEntry = new RuleEntry( sourceProperty, targetClass, targetProperty, transformer );
-// entries.add( ruleEntry );
-// }
-// }
-// else
-// {
-// // We need to create a new vector for this sourceClass.
-// entries = new Vector();
-// ruleEntry = new RuleEntry( sourceProperty, targetClass, targetProperty, transformer );
-// entries.add( ruleEntry );
-// ruleEntries_.put( sourceClass, entries );
-// }
-// }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class)
- */
- public void addMapping(Class sourceType, String sourceProperty, Class targetType)
- {
- addMapping( sourceType, sourceProperty, targetType, sourceProperty, null );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java
deleted file mode 100644
index 0b90901d6..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-
-public class RuleEntry
-{
- public String sourceType_;
- public String sourceProperty_;
- public String targetProperty_;
- public Transformer transformer_;
-
-
- public RuleEntry( String sourceType,
- String sourceProperty,
- String targetProperty,
- Transformer transformer )
- {
- sourceType_ = sourceType;
- sourceProperty_ = sourceProperty;
- targetProperty_ = targetProperty;
- transformer_ = transformer;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java
deleted file mode 100644
index 0880a65ca..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-/**
- * This interface is used to transform an object from one class to another.
- *
- */
-public interface Transformer
-{
- /*
- * @return returns a transformed object based on the input value.
- */
- public Object transform( Object value );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java
deleted file mode 100644
index 5ad067780..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-
-/**
- * This class is used as the base class for other standard fragment classes.
- *
-**/
-public abstract class AbstractCommandFragment implements CommandFragment
-{
- private CommandFactory commandFactory_;
- private String id_;
- private boolean doNotRunInTransaction_ = false;
-
- /**
- * Copy constructor.
- * @param fragment
- */
- protected AbstractCommandFragment( AbstractCommandFragment fragment )
- {
- commandFactory_ = fragment.commandFactory_;
- id_ = fragment.id_;
- }
-
- /**
- * Creates a new AbstractCommandFragment.
- *
- * @param command the executable command for this fragment.
- **/
- public AbstractCommandFragment( CommandFactory commandFactory, String id )
- {
- commandFactory_ = commandFactory;
- id_ = id;
- }
-
- public String getId()
- {
- return id_;
- }
-
- public void setId( String id )
- {
- id_ = id;
- }
-
- /**
- * Gets executable command associated with this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFactory getCommandFactory()
- {
- return commandFactory_;
- }
-
- /**
- * This method is called retrieve the data mappings for this command fragment.
- */
- public void registerDataMappings( DataMappingRegistry registry )
- {
- // The default behaviour is not to add any entries to the registry.
- }
-
- /**
- *
- * @return If the commands for this fragment should not be run within a transaction then
- * this method should return true. If the fragment does not care if it is run in a transaction
- * or not it should return false.
- */
- public boolean doNotRunInTransaction()
- {
- return doNotRunInTransaction_;
- }
-
- /**
- * Sets the run in transaction property.
- * @param doNotRunInTransaction
- */
- public void setDoNotRunInTransaction( boolean doNotRunInTransaction )
- {
- doNotRunInTransaction_ = doNotRunInTransaction;
- }
-
- /**
- * All fragments need to be cloneable.
- **/
- abstract public Object clone();
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java
deleted file mode 100644
index b56b368f5..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-
-
-/**
- * This class returns either the true fragment or the false fragment
- * based on the response from the condition object.
-**/
-public class BooleanFragment extends AbstractCommandFragment
-{
- private CommandFragment trueFragment_;
- private CommandFragment falseFragment_;
- private Condition condition_;
-
- /**
- * Create a BooleanFragment with default values.
- *
- */
- public BooleanFragment()
- {
- this( null, null, new Condition()
- {
- public boolean evaluate()
- {
- return true;
- }
- },
- null, "" );
- }
-
- /**
- *
- * @param trueFragment The fragment chosen if the condition is true.
- * @param falseFragment The fragment chosen if the condition is false.
- * @param condition The condition.
- */
- public BooleanFragment( CommandFragment trueFragment,
- CommandFragment falseFragment,
- Condition condition )
- {
- this( trueFragment, falseFragment, condition, null, "" );
- }
-
- /**
- * Creates a new BooleanFragment.
- *
- * @param trueFragment returned if condition is true.
- * @param falseFragment returned if condition is false.
- * @param condition the condition for this fragment.
- * @param state the state passed to the condition.
- * @param command the exectable command for this fragment.
- **/
- public BooleanFragment( CommandFragment trueFragment,
- CommandFragment falseFragment,
- Condition condition,
- CommandFactory commandFactory,
- String id )
- {
- super( commandFactory, id );
-
- trueFragment_ = trueFragment;
- falseFragment_ = falseFragment;
- condition_ = condition;
- }
-
- /**
- * Copy constructor.
- * @param frag
- */
- protected BooleanFragment( BooleanFragment frag )
- {
- this( null,
- null,
- frag.condition_,
- frag.getCommandFactory(),
- frag.getId() );
-
- // Now we have to clone in the true and false
- // fragments.
- trueFragment_ = (CommandFragment)trueFragment_.clone();
- falseFragment_ = (CommandFragment)falseFragment_.clone();
- }
-
- /**
- * Makes a copy of the CommandFragment.
- *
- * @return returns a copy of this fragment.
- **/
- public Object clone()
- {
- return new BooleanFragment( this );
- }
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment()
- {
- return condition_.evaluate() ? trueFragment_ : falseFragment_;
- }
-
- /**
- * Gets the next child fragment for this fragment.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment( CommandFragment fragment )
- {
- return null;
- }
-
- /**
- * Sets the condition.
- * @param condition
- */
- public void setCondition( Condition condition )
- {
- condition_ = condition;
- }
-
- /**
- * Sets the true fragment.
- * @param fragment
- */
- public void setTrueFragment( CommandFragment fragment )
- {
- trueFragment_ = fragment;
- }
-
- /**
- * Sets the false fragment.
- * @param fragment
- */
- public void setFalseFragment( CommandFragment fragment )
- {
- falseFragment_ = fragment;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java
deleted file mode 100644
index 92c772a5e..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.Evaluate;
-
-
-/**
- * This class returns a fragment from a list of fragments based
- * on the object returned from the Evaluate object.
-**/
-public class ChoiceFragment extends AbstractCommandFragment
-{
- private Hashtable fragmentTable_;
- private Evaluate evaluate_;
-
- /**
- * Create a clone with new a new hashtable.
- **/
- protected ChoiceFragment( ChoiceFragment frag )
- {
- super( frag.getCommandFactory(), frag.getId() );
-
- evaluate_ = frag.evaluate_;
- fragmentTable_ = new Hashtable();
-
- Enumeration keys = frag.fragmentTable_.keys();
-
- // Clone the fragments in the table.
- while( keys.hasMoreElements() )
- {
- Object key = keys.nextElement();
- fragmentTable_.put( key, ((CommandFragment)frag.fragmentTable_.get(key)).clone() );
- }
- }
-
- public ChoiceFragment( Object[] keys,
- CommandFragment[] fragments )
- {
- this( keys, fragments, null, null, "" );
- }
-
- public ChoiceFragment( Object[] keys,
- CommandFragment[] fragments,
- Evaluate evaluate )
- {
- this( keys, fragments, evaluate, null, "" );
- }
-
- public void setEvaluate( Evaluate evaluate )
- {
- evaluate_ = evaluate;
- }
-
- /**
- * Constructs a choice fragment. The key at index X is mapped to
- * to the fragment at index X.
- *
- * @param keys these keys must be unique as determined by the equals method.
- * They are used to identify which fragment to return.
- * @param fragments these are the fragments to be returned. Null is not allowed
- * as an entry in the array.
- * @param evaluate the object returned by this evaluate object is used
- * as the key to locate a fragment.
- * @param state the state passed to evaluate.
- **/
- public ChoiceFragment( Object[] keys,
- CommandFragment[] fragments,
- Evaluate evaluate,
- CommandFactory commandFactory,
- String id )
- {
- super( commandFactory, id );
-
- evaluate_ = evaluate;
- fragmentTable_ = new Hashtable();
-
- if( keys == null || fragments == null || keys.length != fragments.length )
- {
- throw new IllegalArgumentException( "Bad keys or fragments." );
- }
- else
- {
- // Create the fragment table.
- for( int index = 0; index < keys.length; index++ )
- {
- fragmentTable_.put( keys[index], fragments[index] );
- }
- }
- }
-
- /**
- * Makes a copy of the CommandFragment.
- *
- * @return returns a copy of this fragment.
- **/
- public Object clone()
- {
- return new ChoiceFragment( this );
- }
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment()
- {
- Object key = evaluate_.evaluate();
- CommandFragment fragment = (CommandFragment)fragmentTable_.get(key);
-
- if( fragment == null )
- {
- throw new IllegalArgumentException( "Key not found in table. Key=" + key );
- }
-
- return fragment;
- }
-
- /**
- * Gets the next child fragment for this fragment.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment( CommandFragment fragment )
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java
deleted file mode 100644
index 19075ac57..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public abstract class CommandFactoryFragment implements CommandFragment
-{
- private Vector commands_;
-
- /**
- * Subclasses should override this method and return
- * an CommandFactory.
- * @return
- */
- public abstract ICommandFactory getICommandFactory();
-
- /**
- * All wizard fragments need to be cloneable.
- **/
- public abstract Object clone();
-
- protected CommandFactoryFragment( CommandFactoryFragment frag )
- {
- commands_ = frag.commands_;
- }
-
- public CommandFactoryFragment()
- {
- }
-
- /**
- *
- * @return Returns a unique identifier for this fragment.
- */
- public String getId()
- {
- return "";
- }
-
- /**
- * Gets executable command associated with this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFactory getCommandFactory()
- {
- return null;
- }
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment()
- {
- CommandFragment result = null;
-
- commands_ = createCommands();
-
- if( commands_.size() > 0 )
- {
- result = (ChildFragment)commands_.elementAt(0);
- }
-
- return result;
- }
-
- /**
- * Gets the next child fragment for this fragment.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment( CommandFragment fragment )
- {
- CommandFragment result = null;
-
- if( commands_ != null && fragment instanceof ChildFragment )
- {
- ChildFragment child = (ChildFragment)fragment;
-
- int index = child.index_;
-
- if( index != -1 )
- {
- index++;
-
- if( index < commands_.size() )
- {
- result = (CommandFragment)commands_.elementAt( index );
- }
- }
- }
-
- return result;
- }
-
- /*
- * This method is called to retrieve the data mappings for this command fragment.
- */
- public void registerDataMappings( DataMappingRegistry registry )
- {
- }
-
- /**
- *
- * @return If the commands for this fragment should not be run within a transaction then
- * this method should return true. If the fragment does not care if it is run in a transaction
- * or not it should return false.
- */
- public boolean doNotRunInTransaction()
- {
- return false;
- }
-
- private Vector createCommands()
- {
- Vector commands = new Vector();
- ICommandFactory factory = getICommandFactory();
- int index = 0;
-
- while( factory != null && factory.hasNext() )
- {
- AbstractDataModelOperation command = factory.getNextCommand();
-
- commands.add( new ChildFragment( command, index++ ) );
- }
-
- return commands;
- }
-
- private class ChildFragment extends SimpleFragment
- {
- int index_;
-
- public ChildFragment( AbstractDataModelOperation command, int index )
- {
- super( command, command.getID() );
- index_ = index;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java
deleted file mode 100644
index d6762a989..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-
-/**
- * This interface describes a list of interruptable commands. The
- * order of this list of commands is defined by the getFirstSubFragment and
- * getNextSubFragment methods.
-**/
-public interface CommandFragment extends Cloneable
-{
- /**
- *
- * @return Returns a unique identifier for this fragment.
- */
- public String getId();
-
- /**
- * Gets executable command associated with this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFactory getCommandFactory();
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment();
-
- /**
- * Gets the next child fragment for this fragment.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment( CommandFragment fragment );
-
- /*
- * This method is called to retrieve the data mappings for this command fragment.
- */
- public void registerDataMappings( DataMappingRegistry registry );
-
- /**
- *
- * @return If the commands for this fragment should not be run within a transaction then
- * this method should return true. If the fragment does not care if it is run in a transaction
- * or not it should return false.
- */
- public boolean doNotRunInTransaction();
-
- /**
- * All wizard fragments need to be cloneable.
- **/
- public Object clone();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
deleted file mode 100644
index 95116999b..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060223 129232 pmoogk@ca.ibm.com - Peter Moogk
- * 20060313 130958 pmoogk@ca.ibm.com - Peter Moogk
- * 20061011 159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
- * 20070323 175800 pmoogk@ca.ibm.com - Peter Moogk
- * 20070730 197144 pmoogk@ca.ibm.com - Peter Moogk, Pass progress monitor to undo commands.
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.EnvironmentCoreMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-/**
- * The CommandFragmentEngine provides a convienent way to traverse CommandFragments
- * and possiblity execute its associate Command.
- */
-public class CommandFragmentEngine implements CommandManager
-{
- private Stack commandStack_;
- private FragmentListener undoFragmentListener_;
- private FragmentListener nextFragmentListener_;
- private FragmentListener afterExecuteFragmentListener_;
- private FragmentListener peekFragmentListener_;
- private DataFlowManager dataManager_;
- private IEnvironment environment_;
- private IStatus lastStatus_;
-
- /**
- * Creates a CommandFragmentEngine.
- *
- * @param startFragment the root fragment where traversal will begin.
- * @param dataManager the data manager containing all of the data mappings.
- * @param environment the environment.
- */
- public CommandFragmentEngine( CommandFragment startFragment, DataFlowManager dataManager, IEnvironment environment )
- {
- SequenceFragment root = new SequenceFragment();
- root.add( startFragment );
-
- commandStack_ = new Stack();
-
- addToStack( root, -1 );
- addToStack( startFragment, 0 );
-
- dataManager_ = dataManager;
- environment_ = environment;
- }
-
- public String toString()
- {
- String newline = System.getProperty("line.separator");
- StringBuffer buffer = new StringBuffer();
-
- buffer.append(newline);
- buffer.append("Command stack start:");
- buffer.append(newline);
-
- for( int index = 0; index < commandStack_.size(); index++ )
- {
- CommandListEntry entry = (CommandListEntry)commandStack_.elementAt(index);
- entry.dump(buffer, index);
- }
-
- buffer.append("Command start end:");
- buffer.append(newline);
-
- return buffer.toString();
- }
-
- /**
- * @return returns the Data mapping registry.
- */
- public DataMappingRegistry getMappingRegistry()
- {
- return dataManager_.getMappingRegistry();
- }
-
- /**
- *
- * @return the Status from the last Command executed.
- */
- public IStatus getLastStatus()
- {
- return lastStatus_;
- }
-
- /**
- */
- public boolean isUndoEnabled()
- {
- return true;
- }
-
- /**
- * Sets the next fragment listener for this engine. This listener will be
- * called for each fragment that is traversed in moveForwardToNextStop operation.
- *
- * @param listener the fragment listener.
- */
- public void setNextFragmentListener( FragmentListener listener )
- {
- nextFragmentListener_ = listener;
- }
-
- public void setAfterExecuteFragmentListener( FragmentListener listener )
- {
- afterExecuteFragmentListener_ = listener;
- }
-
- /**
- * Sets the next fragment listener for this engine. This listener will be
- * called for each fragment that is traversed in peekForwardToNextStop operation.
- *
- * @param listener the fragment listener.
- */
- public void setPeekFragmentListener( FragmentListener listener )
- {
- peekFragmentListener_ = listener;
- }
-
- /**
- * Sets the peek fragment listener for this engine. This listener will be
- * called for each fragment that is traversed in undoToLastStop operation.
- *
- * @param listener the fragment listener.
- */
- public void setUndoFragmentListener( FragmentListener listener )
- {
- undoFragmentListener_ = listener;
- }
-
- /**
- * Traverse the CommandFragments starting with the CommandFragment on the
- * top of the command fragment stack. The operation does NOT change the
- * command fragment stack and does not execute any command associated with
- * a CommandFragment.
- */
- public void peekForwardToNextStop()
- {
- CommandListEntry topEntry = (CommandListEntry)commandStack_.lastElement();
- int parentIndex = topEntry.parentIndex_;
- CommandFragment childFragment = topEntry.fragment_;
- boolean continueLoop = navigateChildFragments( childFragment, false );
-
- while( parentIndex != -1 && continueLoop )
- {
- CommandListEntry parentEntry = (CommandListEntry)commandStack_.elementAt( parentIndex );
- CommandFragment parentFragment = parentEntry.fragment_;
- CommandFragment nextFragment = parentFragment.getNextSubFragment( childFragment );
-
- if( nextFragment == null )
- {
- // There are no more sibling fragments to navigate so we will pop up to the parent
- // an continue navigation there.
- parentIndex = parentEntry.parentIndex_;
- childFragment = parentFragment;
- }
- else
- {
- if( navigateChildFragments( nextFragment, true ) )
- {
- // We are continuing to navigate. This time we want to traverse the sibling
- // of nextFragment.
- childFragment = nextFragment;
- }
- else
- {
- // We are stopping our navigation.
- continueLoop = false;
- }
- }
- }
- }
-
-
- /**
- * Traverse the CommandFragments starting with the CommandFragment on the
- * top of the command fragment stack. This operation does change the
- * command fragment stack and does execute any command associated with
- * a CommandFragment.
- */
- public void moveForwardToNextStop( IProgressMonitor monitor )
- {
- CommandListEntry topEntry = (CommandListEntry)commandStack_.lastElement();
- int parentIndex = topEntry.parentIndex_;
- CommandFragment currentFragment = topEntry.fragment_;
- boolean continueExecute = visitTop( monitor );
- CommandFragment childFragment = currentFragment.getFirstSubFragment();
-
- // If the current fragment has child fragments we need to traverse these children.
- while( childFragment != null && continueExecute )
- {
- parentIndex = commandStack_.size() - 1;
- addToStack( childFragment, parentIndex );
- continueExecute = visitTop( monitor );
- currentFragment = childFragment;
- childFragment = currentFragment.getFirstSubFragment();
- }
-
- // The previous while loop has guaranteed that currentFragment has no
- // child fragments. This while loop assumes this to be the case.
- while( parentIndex != -1 && continueExecute )
- {
- CommandListEntry parentEntry = (CommandListEntry)commandStack_.elementAt( parentIndex );
- CommandFragment parentFragment = parentEntry.fragment_;
- CommandFragment nextFragment = null;
-
- if( currentFragment == null )
- {
- nextFragment = parentFragment.getFirstSubFragment();
- }
- else
- {
- nextFragment = parentFragment.getNextSubFragment( currentFragment );
- }
-
- if( nextFragment == null )
- {
- // There are no more sibling fragments to navigate so we will pop up to the parent
- // and continue navigation there.
- parentIndex = parentEntry.parentIndex_;
- currentFragment = parentFragment;
- }
- else
- {
- // We have a new fragment that we need to add to the top of the stack.
- addToStack( nextFragment, parentIndex );
- parentIndex = commandStack_.size() - 1;
- continueExecute = visitTop( monitor );
- currentFragment = null;
- }
- }
- }
-
- /**
- *
- * @return returns true if the there is not longer any elements on the stack. Note:
- * that last two entries are always left on the stack.
- */
- public boolean undoToLastStop( IProgressMonitor monitor )
- {
- CommandListEntry topEntry = (CommandListEntry)commandStack_.lastElement();
-
- if( topEntry.fragmentStopped_ && !topEntry.beforeExecute_ )
- {
- // Normally the command at the top of the stack has not been executed. If
- // it has been execute, it means that we tried to execute and it failed.
- // The first command in the command stack failed. Therefore, we should
- // only undo this command.
- performUndo( topEntry, monitor );
- return topEntry.parentIndex_ == 0;
- }
-
- performUndo( topEntry, monitor );
-
- while( topEntry.parentIndex_ != 0 )
- {
- commandStack_.pop();
- topEntry = (CommandListEntry)commandStack_.lastElement();
-
- performUndo( topEntry, monitor );
-
- if( topEntry.fragmentStopped_ )
- {
- break;
- }
- }
-
- return topEntry.parentIndex_ == 0;
- }
-
- private void performUndo( CommandListEntry entry, IProgressMonitor monitor )
- {
- if( entry.parentIndex_ == 0 ) return;
-
- AbstractDataModelOperation cmd = entry.command_;
-
- try
- {
- if( cmd != null )
- {
- if( cmd.canUndo() && !entry.beforeExecute_ )
- {
- cmd.undo( monitor, null );
- }
-
- dataManager_.unprocess( cmd );
- }
- }
- catch( Exception exc )
- {
- exc.printStackTrace();
- }
-
- entry.beforeExecute_ = true;
- undoFragmentListener_.notify( entry.fragment_ );
- }
-
- private boolean navigateChildFragments( CommandFragment fragment, boolean visitCurrent )
- {
- boolean continueNavigate = true;
- CommandFragment childFrag = null;
-
- if( visitCurrent )
- {
- continueNavigate = peekFragmentListener_.notify( fragment );
- dataManager_.process( fragment );
- }
-
- childFrag = fragment.getFirstSubFragment();
-
- while( childFrag != null && continueNavigate )
- {
- continueNavigate = navigateChildFragments( childFrag, true );
- childFrag = fragment.getNextSubFragment( childFrag );
- }
-
- return continueNavigate;
- }
-
- private boolean visitTop( IProgressMonitor monitor )
- {
- CommandListEntry entry = (CommandListEntry)commandStack_.lastElement();
- boolean continueNavigate = nextFragmentListener_.notify( entry.fragment_ );
-
- if( continueNavigate )
- {
- // Call the setters for this fragment.
- dataManager_.process( entry.fragment_ );
-
- // Add any rules to the mapping registry before we execute the command.
- entry.fragment_.registerDataMappings( dataManager_.getMappingRegistry() );
-
- lastStatus_ = runCommand( entry, monitor );
-
- if( afterExecuteFragmentListener_ != null )
- {
- continueNavigate = afterExecuteFragmentListener_.notify( entry.fragment_ );
-
- if( !continueNavigate )
- {
- // The after execution listener has indicated that execution should stop.
- // Therefore, we will upgrade the severity of the last status to ERROR.
- lastStatus_ = new Status( IStatus.ERROR,
- lastStatus_.getPlugin(),
- lastStatus_.getCode(),
- lastStatus_.getMessage(),
- lastStatus_.getException() );
- }
- }
-
- if( continueNavigate && lastStatus_.getSeverity() == IStatus.ERROR ) continueNavigate = false;
- }
-
- if( !continueNavigate ) entry.fragmentStopped_ = true;
-
- return continueNavigate;
- }
-
- private void addToStack( CommandFragment fragment, int parentIndex )
- {
- CommandListEntry entry = new CommandListEntry( fragment, parentIndex );
- commandStack_.push( entry );
- }
-
- // Subclasses can do initialization before the execution of a command here
- protected IStatus initBeforeExecute( AbstractDataModelOperation operation )
- {
- return Status.OK_STATUS;
- }
-
- private IStatus runCommand( CommandListEntry entry, IProgressMonitor monitor )
- {
- CommandFactory factory = entry.fragment_.getCommandFactory();
- IStatus status = Status.OK_STATUS;
-
- if( factory != null )
- {
- AbstractDataModelOperation cmd = factory.create();
-
- entry.command_ = cmd;
-
- if( cmd != null )
- {
- try
- {
- dataManager_.process( cmd );
-
- status = initBeforeExecute( cmd );
-
- environment_.getLog().log(ILog.INFO, "command", 5001, this, "runCommand", "Executing: " + cmd.getClass().getName());
-
- cmd.setEnvironment( environment_ );
- status = cmd.execute( monitor, null );
-
- entry.beforeExecute_ = false;
- }
- catch( Throwable exc )
- {
- IStatus unexpectedError = StatusUtils.errorStatus( exc );
- MultiStatus parentStatus = new MultiStatus( "id", 0, new IStatus[]{unexpectedError},
- EnvironmentCoreMessages.MSG_ERROR_UNEXPECTED_ERROR, null );
- environment_.getStatusHandler().reportError( parentStatus );
- status = unexpectedError;
- }
- finally
- {
- String message = "Ok";
-
- if( status.getSeverity() == Status.ERROR )
- {
- message = "Error: " + status.getMessage();
- }
-
- environment_.getLog().log(ILog.INFO, "command", 5001, this, "runCommand", "Execution status: " + message );
- }
- }
- }
-
- return status;
- }
-
- private class CommandListEntry
- {
- public CommandListEntry( CommandFragment fragment, int parentIndex )
- {
- fragment_ = fragment;
- parentIndex_ = parentIndex;
- fragmentStopped_ = false;
- beforeExecute_ = true;
- }
-
- public AbstractDataModelOperation command_;
- public CommandFragment fragment_;
- public int parentIndex_;
- public boolean fragmentStopped_;
- public boolean beforeExecute_;
-
- public void dump( StringBuffer buffer, int index )
- {
- String newline = System.getProperty("line.separator");
- String line = " " + index + "- frag: " + fragment_.getId() + " parIndex: " + parentIndex_ + " stop: " + fragmentStopped_ + " beforeExecute: " + beforeExecute_ ;
- buffer.append(line);
- buffer.append(newline);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java
deleted file mode 100644
index 323c963cc..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-/**
- * This interface provides a way to create CommandFragments.
- *
- */
-public interface CommandFragmentFactory
-{
- /**
- *
- * @return returns a created CommandFragment object.
- */
- public CommandFragment create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java
deleted file mode 100644
index 159fb6b26..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-public interface CommandFragmentFactoryFactory
-{
- /**
- * The framework calls this method to get the CommandFragmentFactory
- * for a particular extension.
- *
- * @return Creates a CommandFragmentFactory.
- */
- public CommandFragmentFactory create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java
deleted file mode 100644
index 19173f1c2..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Hashtable;
-import org.eclipse.wst.command.internal.env.core.registry.CommandRegistry;
-
-
-public class ExtensionFragment extends AbstractCommandFragment
-{
- private String[] ids_;;
- private CommandRegistry extensionRegistry_;
- private Hashtable fragments_;
-
- /**
- * The default constructor
- *
- */
- public ExtensionFragment()
- {
- super( null, "" );
- fragments_ = new Hashtable();
- }
-
- /**
- * Copy constructor.
- * @param Fragment the fragment to copy
- */
- protected ExtensionFragment( ExtensionFragment fragment )
- {
- super( fragment );
-
- ids_ = fragment.ids_;
- extensionRegistry_ = fragment.extensionRegistry_;
- fragments_ = fragment.fragments_;
- }
-
- /**
- *
- * @param ids Sets the IDs for this extension fragment.
- */
- public void setExtensionIds( String[] ids )
- {
- ids_ = ids;
- }
-
- /**
- *
- * @param registry Sets the registry for this extension fragment.
- */
- public void setExtensionRegistry( CommandRegistry registry )
- {
- extensionRegistry_ = registry;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#getFirstSubFragment()
- */
- public CommandFragment getFirstSubFragment()
- {
- CommandFragmentFactoryFactory factory = extensionRegistry_.getFactoryFactory( ids_ );
-
- if( factory == null ) return null;
-
- CommandFragment fragment = (CommandFragment)fragments_.get( factory );
-
- if( fragment == null )
- {
- fragment = factory.create().create();
- fragments_.put( factory, fragment );
- }
-
- return fragment;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#getNextSubFragment(org.eclipse.wst.command.internal.env.core.fragment.CommandFragment)
- */
- public CommandFragment getNextSubFragment(CommandFragment fragment)
- {
- return null;
- }
-
- /**
- * @see java.lang.Object#clone()
- */
- public Object clone()
- {
- return new ExtensionFragment( this );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java
deleted file mode 100644
index f0de7e8a6..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-/**
- * This interface should be implement for code that needs to listen to fragments
- * that are being traverse by the CommandFragmentEngine.
- *
- */
-public interface FragmentListener
-{
- /*
- * Notifies this listener that a commandFragment is being visited during
- * a traversal.
- */
- public boolean notify( CommandFragment commandFragment );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java
deleted file mode 100644
index 503b1a18e..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-/**
- * This interface can be used when a conditional object needs to be returned.
-**/
-public interface LoopCondition
-{
- /**
- * Evaluates a loop condition.
- *
- * @param loop the loop fragment that is being evaluated.
- * @param fragment the child fragment of the loop
- * under evaluation. Note: fragment can be null.
- * @return returns an object based on some evaluated condition.
- **/
- public boolean evaluate( LoopFragment loop, CommandFragment fragment );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java
deleted file mode 100644
index 23971a0ce..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.RangeVector;
-
-
-/**
- * This class returns a dynamically determined number of
- * fragments. This loop will return the fragment parameter
- * as long as the stopCondition evaluates to false. Otherwise,
- * null is returned.
-**/
-public class LoopFragment extends AbstractCommandFragment
-{
- private LoopCondition stopCondition_;
- private CommandFragment fragment_;
- private RangeVector fragmentHistory_;
-
- /**
- * Copy contructor for this fragment.
- **/
- protected LoopFragment( LoopFragment fragment )
- {
- this( fragment.fragment_,
- fragment.stopCondition_,
- fragment.getCommandFactory(),
- fragment.getId() );
- }
-
- public LoopFragment( CommandFragment fragment,
- LoopCondition stopCondition )
- {
- this( fragment, stopCondition, null, "" );
- }
-
- /**
- * @param fragment the fragment that will be returned by the loop.
- * @param stopCondition when false the fragment will be returned,
- * otherwise null is returned.
- * @param state the state passed to the condition.
- * @param command the executable command for this fragment.
- **/
- public LoopFragment( CommandFragment fragment,
- LoopCondition stopCondition,
- CommandFactory commandFactory,
- String id )
- {
- super( commandFactory, id );
-
- fragment_ = fragment;
- stopCondition_ = stopCondition;
- fragmentHistory_ = new RangeVector();
- }
-
- /**
- * Makes a copy of the CommandFragment.
- *
- * @return returns a copy of this fragment.
- **/
- public Object clone()
- {
- return new LoopFragment( this );
- }
-
- /**
- * Returns the index of the fragment
- *
- * @param fragment the fragment to search.
- * @return the index of this fragment.
- **/
- public int indexOf( CommandFragment fragment )
- {
- return fragmentHistory_.indexOf( fragment );
- }
-
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment()
- {
- return getNextSubFragment( null );
- }
-
- /**
- * Gets the next child fragment for this fragment.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment( CommandFragment frag )
- {
- CommandFragment nextFrag = null;
-
- if( stopCondition_.evaluate( this, frag ) )
- {
- // The stop condition has been met.
- // Do nothing.
- }
- else
- {
- int fragIndex = indexOf( frag );
-
- // Note: when fragment == null the fragIndex
- // should be -1. Therefore, if there
- // is already a first fragment in
- // fragmentHistory that will be returned.
- if( fragIndex + 1 < fragmentHistory_.size() )
- {
- // We have a copy of the fragment already.
- nextFrag = (CommandFragment)(fragmentHistory_.elementAt( fragIndex + 1 ));
- }
- else
- {
- nextFrag = (CommandFragment)(fragment_.clone());
- fragmentHistory_.add( nextFrag );
- }
- }
-
- return nextFrag;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java
deleted file mode 100644
index 210ce6b5b..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-
-
-/**
- * This class implements a sequence of CommandFragments.
-**/
-public class SequenceFragment extends AbstractCommandFragment
-{
- private List fragmentList_;
-
- protected SequenceFragment( SequenceFragment frag )
- {
- super( frag.getCommandFactory(), frag.getId() );
-
- fragmentList_ = new Vector();
-
- for( int index = 0; index < frag.fragmentList_.size(); index++ )
- {
- Object newFrag = ((CommandFragment)frag.fragmentList_.get(index)).clone();
- fragmentList_.add( newFrag );
- }
- }
-
- public SequenceFragment( CommandFragment[] fragments,
- CommandFactory commandFactory,
- String id )
- {
- super( commandFactory, id );
-
- if( fragments != null )
- {
- fragmentList_ = Arrays.asList( fragments );
- }
- else
- {
- fragmentList_ = new Vector();
- }
- }
-
- public SequenceFragment()
- {
- super( null, "" );
-
- fragmentList_ = new Vector();
- }
-
- /**
- * Appends a fragment to the sequence.
- **/
- public void add( CommandFragment fragment )
- {
- fragmentList_.add( fragment );
- }
-
- /**
- * Makes a copy of the CommandFragment.
- *
- * @return returns a copy of this fragment.
- **/
- public Object clone()
- {
- return new SequenceFragment( this );
- }
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment()
- {
- CommandFragment fragment = null;
-
- if( fragmentList_ == null || fragmentList_.size() == 0 )
- {
- fragment = null;
- }
- else
- {
- fragment = (CommandFragment)( fragmentList_.get(0) );
- }
-
- return fragment;
- }
-
- /**
- * Gets the next child fragment for this fragment.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment( CommandFragment fragment )
- {
- int index = fragmentList_.indexOf( fragment );
-
- if( index == -1 )
- {
- throw new IllegalArgumentException( "Fragment not found in sequence.");
- }
- else
- {
- index++;
-
- if( index >= fragmentList_.size() )
- {
- // There is nothing following this fragment so return null;
- return null;
- }
- else
- {
- // Return the next fragment.
- return (CommandFragment)(fragmentList_.get( index ));
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java
deleted file mode 100644
index 1e3eba841..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.env.core.CommandFactory;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * This class implements an empty of WizardFragment.
-**/
-public class SimpleFragment extends AbstractCommandFragment
-{
- public SimpleFragment()
- {
- this( (CommandFactory)null, "" );
- }
-
- public SimpleFragment( String id )
- {
- this( (CommandFactory)null, id );
- }
-
- public SimpleFragment( final AbstractDataModelOperation operation, String id )
- {
- super( new CommandFactory()
- {
- public AbstractDataModelOperation create()
- {
- return operation;
- }
- }, id );
- }
-
- public SimpleFragment( CommandFactory commandFactory, String id )
- {
- super( commandFactory, id );
- }
-
- /**
- * Copy constructor for fragment.
- **/
- protected SimpleFragment( SimpleFragment fragment )
- {
- super( fragment.getCommandFactory(), fragment.getId() );
- }
-
- /**
- * All wizard fragments need to be cloneable.
- **/
- public Object clone()
- {
- return new SimpleFragment( this );
- }
-
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment(){ return null; }
-
- /**
- * Gets the next child fragment for this fragment.
- * Since this is a simple fragment, there is no next fragment
- * so we will always return null.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment( CommandFragment fragment ){ return null; }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java
deleted file mode 100644
index 4e6ef87b8..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.registry;
-
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory;
-
-/**
- * This interface provides a way to create a CommandFragmentFactoryFactory
- * from an array of ids.
- *
- */
-public interface CommandRegistry
-{
- /**
- * Creates a CommandFragmentFactoryFactory from an array of ids.
- *
- * @param ids the ids.
- * @return the CommandFragmentFactoryFactory object.
- */
- public CommandFragmentFactoryFactory getFactoryFactory( String[] ids );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java
deleted file mode 100644
index 96805a005..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-/**
- * This class combines a string with a boolean value. This is
- * useful for storing the state data for a boolean selection list.
- */
-package org.eclipse.wst.command.internal.env.core.selection;
-
-public class BooleanSelection
-{
- private String value_;
- private boolean selected_;
-
- public BooleanSelection( String value, boolean selected )
- {
- value_ = value;
- selected_ = selected;
- }
-
- /**
- *
- * @return Get the string value.
- */
- public String getValue()
- {
- return value_;
- }
-
- /**
- *
- * @return Get the boolean value for this string.
- */
- public boolean isSelected()
- {
- return selected_;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java
deleted file mode 100644
index ac33c6e79..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-/**
- * This transformer class selects a string at a particular level
- * in a SelectionListChoices class.
- */
-public class ChoicesToString implements Transformer
-{
- private int level_;
-
- public ChoicesToString( int level )
- {
- level_ = level;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object)
- */
- public Object transform( Object value )
- {
- SelectionListChoices choices = (SelectionListChoices)value;
-
- for( int index = 0; index < level_; index++ )
- {
- choices = choices.getChoice();
- }
-
- return choices.getList().getSelection();
- }
-
- public SelectionList transform( SelectionListChoices choices )
- {
- return (SelectionList)transform( (Object)choices );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java
deleted file mode 100644
index b6ec71c74..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-import java.util.Vector;
-
-/**
- * This is a Dynamic version of the SelectionListChoices class.
- */
-public class DynamicList
-{
- private Vector stringList_ = new Vector();
- private Vector dynamicListVectorList_ = new Vector();
-
- /**
- * Adds an entry into the dynamic list.
- *
- * @param values the string values that lead to the target.
- * @param target the target.
- */
- public void add( String[] values, Object target )
- {
- DynamicList currentList = this;
-
- for( int index = 0; index < values.length; index++ )
- {
- String value = values[index];
- int length = currentList.stringList_.size();
- int foundIndex = -1;
-
- // Find the string in the current list.
- for( int searchIndex = 0; searchIndex < length; searchIndex++ )
- {
- String string = (String)currentList.stringList_.elementAt( searchIndex );
-
- if( string.equals( value ) )
- {
- foundIndex = searchIndex;
- break;
- }
- }
-
- if( foundIndex == -1 )
- {
- // We have a new string so add it to the list.
- currentList.stringList_.add( value );
- currentList.dynamicListVectorList_.add( new DynamicList() );
- foundIndex = length;
- }
-
- currentList = (DynamicList)currentList.dynamicListVectorList_.elementAt( foundIndex );
- }
-
- currentList.dynamicListVectorList_.add( target );
- }
-
- /**
- *
- * @return returns a SelectionListChoices object from this DynamicList
- * object.
- */
- public SelectionListChoices toListChoices()
- {
- SelectionList list = new SelectionList( (String[])stringList_.toArray( new String[0] ), 0);
- int length = dynamicListVectorList_.size();
- Vector vector = new Vector();
-
- for( int index = 0; index < length; index++ )
- {
- Object obj = dynamicListVectorList_.elementAt(index);
-
- if( obj instanceof DynamicList )
- {
- vector.add( ((DynamicList)obj).toListChoices() );
- }
- else
- {
- vector.add( obj );
- }
- }
-
- return new SelectionListChoices( list, vector );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java
deleted file mode 100644
index 4085773ea..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-/**
- * This class stores a list strings along with a selectionIndex which
- * stores the current string that selected. There is also a selection
- * value. If this value is one of the strings in the the string list
- * then selectionIndex will contain the index of this string. If it
- * is not in the list then the selectionValue string will contain this
- * value and selectionIndex will be set to -1. This class can be
- * used to store the state data for a Combo box.
- */
-public class SelectionList
-{
- private int selectionIndex_;
- private String[] list_;
- private String selectionValue_;
-
- public SelectionList( String[] list, int selectionIndex )
- {
- list_ = list;
- selectionIndex_ = selectionIndex;
- }
-
- /**
- * Sets the selection value for this object.
- *
- * @param value the value.
- */
- public void setSelectionValue( String value )
- {
- selectionValue_ = value;
- selectionIndex_ = -1;
-
- for( int index = 0; index < list_.length; index++ )
- {
- if( value.equals( list_[index] ) )
- {
- selectionIndex_ = index;
- break;
- }
- }
- }
-
- /*
- * @return returns the string list.
- */
- public String[] getList()
- {
- return list_;
- }
-
- /*
- * Sets the currently selected string in the list.
- */
- public void setIndex( int index )
- {
- selectionIndex_ = index;
- selectionValue_ = null;
- }
-
- /*
- * @return returns the index of the current string. The value
- * will be -1 if the selection value is not in the string list.
- */
- public int getIndex()
- {
- return selectionIndex_;
- }
-
- /*
- * @return returns the current string selection for this object.
- */
- public String getSelection()
- {
- if( selectionValue_ != null ) return selectionValue_;
-
- if( selectionIndex_ == -1 || selectionIndex_ > list_.length-1 )
- {
- return "";
- }
- else
- {
- return list_[ selectionIndex_ ];
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java
deleted file mode 100644
index 3c210bd9e..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.selection;
-
-import java.util.Vector;
-
-/*
- * This class can be used to store a hierarchy of SelectionList
- * objects.
- */
-public class SelectionListChoices
-{
- private SelectionList selectionList_;
- private Vector choices_;
- private SelectionList newValueSelectionList_;
-
- /**
- *
- * @param list The selection list.
- * @param choices This is a vector of SelectionListChoies and can be
- * null if there are no choices. This index of list
- * is used to index into choices. If index is -1 then
- * the newValueSelectionList is used.
- */
- public SelectionListChoices( SelectionList list, Vector choices )
- {
- selectionList_ = list;
- choices_ = choices;
-
- newValueSelectionList_ = new SelectionList( new String[0], -1 );
- }
-
- public SelectionListChoices( SelectionList list, Vector choices, SelectionList newList )
- {
- this( list, choices );
- newValueSelectionList_ = newList;
- }
-
- /**
- * @return returns the current Selection list.
- */
- public SelectionList getList()
- {
- return selectionList_;
- }
-
- /**
- *
- * @return returns the choices for this object.
- */
- public Vector getChoices()
- {
- return choices_;
- }
-
- /**
- *
- * @param level the level in the hierarchy where we want to get the choices.
- * @return returns a vector of SelectionListChoices.
- */
- public Vector getChoicesAtLevel( int level )
- {
- SelectionListChoices choices = this;
-
- for( int index = 0; index < level; index++ )
- {
- choices = choices.getChoice();
- }
-
- return choices.getChoices();
- }
-
- /**
- *
- * @return returns the current SelectionListChoice
- */
- public SelectionListChoices getChoice()
- {
- int selectionIndex = selectionList_.getIndex();
- SelectionListChoices result = null;
-
- if( selectionIndex == -1 )
- {
- result = new SelectionListChoices( newValueSelectionList_, null );
- }
- else if( choices_ != null && choices_.size() != 0 )
- {
- result = (SelectionListChoices)choices_.elementAt( selectionIndex );
- }
-
- return result;
- }
-
- /**
- *
- * @param index the index of the choice we want.
- * @return returns the SelectionListChoice at the index specified.
- */
- public SelectionListChoices getChoice(int index)
- {
- SelectionListChoices result = null;
- if (index < 0 || index >= getList().getList().length)
- {
- result = new SelectionListChoices( newValueSelectionList_, null );
- }
- else
- {
- result = (SelectionListChoices)choices_.elementAt( index );
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java
deleted file mode 100644
index e8a550633..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.uri;
-
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.environment.uri.IURI;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public abstract class NativeFileCommand extends AbstractDataModelOperation
-{
- protected String name;
-
- protected String description;
-
- protected IURI[] urisToRead;
-
- protected IURI[] urisToWrite;
-
- protected NativeFileCommand ()
- {
- this(null,null);
- }
-
- protected NativeFileCommand ( String name, String description )
- {
- this.name = name;
- this.description = description;
- }
-
- public String getName ()
- {
- return name;
- }
-
- public String getDescription ()
- {
- return description;
- }
-
- public void setURIsToRead ( IURI[] urisToRead )
- {
- this.urisToRead = urisToRead;
- }
-
- public IURI[] getURIsToRead ()
- {
- return urisToRead;
- }
-
- public void setURIsToWrite ( IURI[] urisToWrite )
- {
- this.urisToWrite = urisToWrite;
- }
-
- public IURI[] getURIsToWrite ()
- {
- return urisToWrite;
- }
-
- public IStatus execute ( IProgressMonitor monitor, IAdaptable adaptable )
- {
- File[] filesToRead = getFiles(urisToRead);
- File[] filesToWrite = getFiles(urisToWrite);
- preProcess(filesToRead,filesToWrite);
- IStatus status = execute(filesToRead,filesToWrite);
- postProcess(filesToRead,filesToWrite);
- return status;
- }
-
- public abstract IStatus execute ( File[] filesToRead, File[] filesToWrite );
-
- private void preProcess ( File[] filesToRead, File[] filesToWrite )
- {
- // TBD.
- }
-
- private void postProcess ( File[] filesToRead, File[] filesToWrite )
- {
- // TBD.
- }
-
- private File[] getFiles ( IURI[] uris )
- {
- List list = new LinkedList();
- if (uris != null)
- {
- for (int i=0; i<uris.length; i++)
- {
- if (uris[i].isAvailableAsFile())
- {
- try
- {
- list.add(uris[i].asFile());
- }
- catch (URIException e)
- {
- }
- }
- }
- }
- return (File[])list.toArray(new File[0]);
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/.classpath b/bundles/org.eclipse.wst.command.env.ui/.classpath
deleted file mode 100644
index ce7393340..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.command.env.ui/.cvsignore b/bundles/org.eclipse.wst.command.env.ui/.cvsignore
deleted file mode 100644
index c28c7a78c..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-envui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.wst.command.env.ui/.project b/bundles/org.eclipse.wst.command.env.ui/.project
deleted file mode 100644
index ceb0b3793..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.command.env.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d87aee152..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:37:28 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index cbae875a4..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:30 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 66746879a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env.ui; singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.wst.command.internal.env.ui.plugin.EnvUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.internal.env.ui;x-internal:=true,
- org.eclipse.wst.command.internal.env.ui.common;x-internal:=true,
- org.eclipse.wst.command.internal.env.ui.dialog;x-internal:=true,
- org.eclipse.wst.command.internal.env.ui.eclipse;x-internal:=true,
- org.eclipse.wst.command.internal.env.ui.plugin;x-internal:=true,
- org.eclipse.wst.command.internal.env.ui.preferences;x-internal:=true,
- org.eclipse.wst.command.internal.env.ui.registry;x-internal:=true,
- org.eclipse.wst.command.internal.env.ui.widgets;x-internal:=true,
- org.eclipse.wst.command.internal.env.ui.widgets.popup;x-internal:=true
-Require-Bundle: org.eclipse.wst.command.env.core;bundle-version="[1.0.203,2.0.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.wst.command.env.ui/about.html b/bundles/org.eclipse.wst.command.env.ui/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.command.env.ui/build.properties b/bundles/org.eclipse.wst.command.env.ui/build.properties
deleted file mode 100644
index 74d7e4984..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = plugin.xml,\
- *.jar,\
- .,\
- META-INF/,\
- icons/,\
- plugin.properties,\
- about.html
-source.. = src/
-output.. = bin/
-src.includes = schema/
diff --git a/bundles/org.eclipse.wst.command.env.ui/icons/full/obj16/ant_buildfile.gif b/bundles/org.eclipse.wst.command.env.ui/icons/full/obj16/ant_buildfile.gif
deleted file mode 100644
index 6df3469e5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/icons/full/obj16/ant_buildfile.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.command.env.ui/icons/full/wizban/newantfiles_wiz.png b/bundles/org.eclipse.wst.command.env.ui/icons/full/wizban/newantfiles_wiz.png
deleted file mode 100644
index 9623c4fd2..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/icons/full/wizban/newantfiles_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.command.env.ui/plugin.properties b/bundles/org.eclipse.wst.command.env.ui/plugin.properties
deleted file mode 100644
index 66b704b95..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-# 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Environment Command Framework (GUI)
-PLUGIN_PROVIDER=Eclipse.org
-
-WIDGET_REGISTRY_NAME=Widget contributor registry
-
-PLUGIN_XP_ANT_WIZARD_NAME=Ant Files
-PLUGIN_XP_ANT_WIZARD_DESC=Create Ant script and properties files in the workspace.
-
-LABEL_ANT_EXTENTION=Ant Extention \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.ui/plugin.xml b/bundles/org.eclipse.wst.command.env.ui/plugin.xml
deleted file mode 100644
index 69772396a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-<extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%PLUGIN_XP_ANT_WIZARD_NAME"
- icon="icons/full/obj16/ant_buildfile.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.wst.command.internal.env.ui.dialog.AntFileImportWizard"
- id="org.eclipse.wst.command.env.ui.AntFileImportWizard">
- <description>
- %PLUGIN_XP_ANT_WIZARD_DESC
- </description>
- </wizard>
- </extension>
-
- <!-- The following extension point is internal and likely to be removed in a future release. -->
- <extension-point id="widgetRegistry" name="%WIDGET_REGISTRY_NAME" schema="schema/widgetRegistry.exsd"/>
-
- <!-- Ant File Extensions beginning -->
-
- <extension-point id="antfiles" name="%LABEL_ANT_EXTENTION"/>
-
-
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd b/bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd
deleted file mode 100644
index 596cc7c33..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.command.env.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.command.env.ui" id="widgetRegistry" name="Widget Registry"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="widgetFactory"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="widgetFactory">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="insertBeforeCommandId" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUI.properties b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUI.properties
deleted file mode 100644
index 9395c2313..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUI.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060509 119296 pmoogk@ca.ibm.com - Peter Moogk
-# 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews
-# 20080326 223829 kathy@ca.ibm.com - Kathy Chan
-# 20080402 222094 kathy@ca.ibm.com - Kathy Chan, Update properties file.
-###############################################################################
-
-BUTTON_SHOW_ALL_DIALOGS=&Show All
-BUTTON_HIDE_ALL_DIALOGS=&Hide All
-CHECKBOX_DO_NOT_SHOW_DIALOG_AGAIN=Do not show me this dialog box again.
-
-TOOLTIP_PPAD_PAGE=Control to show/hide the dialogs that appear when a pop-up action is executed.
-TOOLTIP_DO_NOT_SHOW_DIALOG_AGAIN=To allow this dialog to show again, enable from preference - dialogs.
-TOOLTIP_PPAD_BUTTON_SHOW_ALL=Show all dialogs.
-TOOLTIP_PPAD_BUTTON_HIDE_ALL=Hide all dialogs and execute pop-up actions.
-TOOLTIP_PPAD_COMBO_RUNTIME=The runtime you require ant templates for.
-TOOLTIP_PPAD_COMBO_SCENARIO=The scenario you require ant templates for.
-
-WIZARD_TITLE_ANT=Create Ant Files
-WIZARD_PAGE_TITLE_ANT=Create Web Service Ant files
-WIZARD_PAGE_DESC_ANT=Select workspace folder for Ant script and properties files
-MSG_STATUS_COPYING_ANT_FILES=Copying web services Ant files
-MSG_ERR_COPYING_ANT_FILES=Error encountered copying Ant files
-MSG_ERR_ANT_FILES_NOT_FOUND=Ant file not found at {0}
-MSG_WARNING_FILE_EXISTS=The file {0} exists. Do you want to overwrite?
-DIALOG_TITLE_OVERWRITE=Confirm Overwrite
-
-MSG_ERROR_WIZARD_ID_NOT_FOUND=IWAB0013E Could not find wizard id: {0}
-MSG_ERROR_OPERATION_TIMED_OUT=Operation timed out.
-
-LABEL_RUNTIMES_LIST=Web service runtime:
-LABEL_SERVERS_LIST=Web service type:
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUIMessages.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUIMessages.java
deleted file mode 100644
index 96849bcd5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/EnvironmentUIMessages.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060509 119296 pmoogk@ca.ibm.com - Peter Moogk
- * 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080402 222094 kathy@ca.ibm.com - Kathy Chan, Update properties file.
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EnvironmentUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.wst.command.internal.env.ui.EnvironmentUI";//$NON-NLS-1$
-
- private EnvironmentUIMessages() {
- // Do not instantiate
- }
-
- public static String BUTTON_SHOW_ALL_DIALOGS;
- public static String BUTTON_HIDE_ALL_DIALOGS;
- public static String CHECKBOX_DO_NOT_SHOW_DIALOG_AGAIN;
- public static String TOOLTIP_PPAD_PAGE;
- public static String TOOLTIP_DO_NOT_SHOW_DIALOG_AGAIN;
- public static String TOOLTIP_PPAD_BUTTON_SHOW_ALL;
- public static String TOOLTIP_PPAD_BUTTON_HIDE_ALL;
- public static String TOOLTIP_PPAD_COMBO_RUNTIME;
- public static String TOOLTIP_PPAD_COMBO_SCENARIO;
- public static String MSG_ERROR_WIZARD_ID_NOT_FOUND;
- public static String WIZARD_TITLE_ANT;
- public static String WIZARD_PAGE_TITLE_ANT;
- public static String WIZARD_PAGE_DESC_ANT;
- public static String MSG_STATUS_COPYING_ANT_FILES;
- public static String MSG_ERR_COPYING_ANT_FILES;
- public static String MSG_ERR_ANT_FILES_NOT_FOUND;
- public static String MSG_WARNING_FILE_EXISTS;
- public static String DIALOG_TITLE_OVERWRITE;
- public static String MSG_ERROR_OPERATION_TIMED_OUT;
- public static String LABEL_RUNTIMES_LIST;
- public static String LABEL_SERVERS_LIST;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EnvironmentUIMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/common/LabelsAndIds.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/common/LabelsAndIds.java
deleted file mode 100644
index b8fb89f02..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/common/LabelsAndIds.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/**
- */
-package org.eclipse.wst.command.internal.env.ui.common;
-
-import java.util.Vector;
-
-public class LabelsAndIds
-{
- private Vector labels_ = new Vector();
- private Vector ids_ = new Vector();
-
-
- public void add(String id, String label){
- ids_.add(id);
- labels_.add(label);
- }
-
- public String getId(int index){
- return (String)ids_.get(index);
- }
-
- /**
- * @return Returns the ids_.
- */
- public String[] getIds()
- {
- String[] stringArray = new String[ids_.size()];
- ids_.copyInto(stringArray);
- return stringArray;
- }
-
- public String[] getLabels()
- {
- String[] stringArray = new String[ids_.size()];
- labels_.copyInto(stringArray);
- return stringArray;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/common/TimedOperation.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/common/TimedOperation.java
deleted file mode 100644
index 8012dcb38..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/common/TimedOperation.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060504 119296 pmoogk@ca.ibm.com - Peter Moogk
- * 20060822 154750 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.common;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.AbstractOperation;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-
-public class TimedOperation implements IUndoableOperation
-{
- private AbstractOperation operation;
- private int timeout;
- private IProgressMonitor tempMonitor;
- private IAdaptable tempInfo;
- private IStatus returnStatus;
- private boolean operationComplete;
- private String timeOutMessage;
-
- public TimedOperation( AbstractOperation operation, int timeout, String timeOutMessage )
- {
- this.operation = operation;
- this.timeout = timeout;
- this.timeOutMessage = timeOutMessage;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info)
- {
- Thread executeThread = new Thread( new OperationRunnable() );
-
- returnStatus = Status.OK_STATUS;
- tempMonitor = monitor;
- tempInfo = info;
- operationComplete = false;
- executeThread.start();
-
- synchronized( operation )
- {
- while( !operationComplete )
- {
- try
- {
- operation.wait(timeout);
- }
- catch( InterruptedException exc )
- {
- String message = exc.getMessage();
- Status errorStatus = new Status( IStatus.ERROR,"id", 0, message == null ? "" : message, exc );
- executeThread.interrupt();
- return errorStatus;
- }
-
- if( !operationComplete )
- {
- // We timed out, since the execution thread hasn't set operationComplete
- // to true.
- Status errorStatus = new Status( IStatus.ERROR,"id", 0, EnvironmentUIMessages.MSG_ERROR_OPERATION_TIMED_OUT, null);
- Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- boolean waitMore = MessageDialog.openConfirm(shell, EnvironmentUIMessages.MSG_ERROR_OPERATION_TIMED_OUT, timeOutMessage );
-
- if( !waitMore )
- {
- executeThread.interrupt();
- operationComplete = true;
- return errorStatus;
- }
- }
- }
- }
-
- // We completed successfully. Therefore return the status set in the forked
- // thread.
- return returnStatus;
- }
-
- private class OperationRunnable implements Runnable
- {
- public void run()
- {
- try
- {
- returnStatus = operation.execute(tempMonitor, tempInfo);
- }
- catch( Throwable exc )
- {
- String message = exc.getMessage();
-
- returnStatus = new Status( IStatus.ERROR,"id", 0, message == null ? "" : message, exc );
- }
- finally
- {
- synchronized( operation )
- {
- operationComplete = true;
- operation.notify();
- }
- }
- }
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return operation.redo(monitor, info);
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return operation.undo(monitor, info);
- }
- public IUndoContext[] getContexts()
- {
- return operation.getContexts();
- }
-
- public boolean hasContext(IUndoContext context)
- {
- return operation.hasContext(context);
- }
-
- public void addContext(IUndoContext context)
- {
- operation.addContext(context);
- }
-
- public boolean canExecute()
- {
- return operation.canExecute();
- }
-
- public boolean canRedo()
- {
- return operation.canRedo();
- }
-
- public boolean canUndo()
- {
- return operation.canUndo();
- }
-
- public void dispose()
- {
- operation.dispose();
- }
-
- public String getLabel()
- {
- return operation.getLabel();
- }
-
- public void removeContext(IUndoContext context)
- {
- operation.removeContext(context);
- }
-
- public void setLabel(String name)
- {
- operation.setLabel(name);
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntExtension.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntExtension.java
deleted file mode 100644
index 7c34ea9c8..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntExtension.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/**
- */
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class AntExtension {
-
- private String label_;
- private String runtime_;
- private String scenario_;
- private String id_;
- private String runtimeID_;
- private String plugin_;
- private String path_;
- private String wsgenpath_;
- private IConfigurationElement element_;
-
- public AntExtension(IConfigurationElement element)
- {
- element_ = element;
- }
-
- public String getLabel()
- {
- if (label_==null)
- {
- label_ = element_.getAttribute("label");
- }
- return label_;
- }
-
- public String getRuntimeLabel()
- {
- if (runtime_==null)
- {
- runtime_ = element_.getAttribute("runtimelabel");
- }
- return runtime_;
- }
-
- public String getScenarioLabel()
- {
- if (scenario_==null)
- {
- scenario_ = element_.getAttribute("scenariolabel");
- }
- return scenario_;
- }
-
- public String getID()
- {
- if (id_==null)
- {
- id_ = element_.getAttribute("id");
- }
- return id_;
- }
-
- public String getRuntimeID()
- {
- if (runtimeID_==null)
- {
- runtimeID_ = element_.getAttribute("runtimeid");
- }
- return runtimeID_;
- }
-
- public String getPlugin()
- {
- if (plugin_==null)
- {
- plugin_ = element_.getAttribute("pluginlocation");
- }
- return plugin_;
- }
-
- public String getPath()
- {
- if (path_==null)
- {
- path_ = element_.getAttribute("path");
- }
- return path_;
- }
-
- public String getWSGenPath()
- {
- if (wsgenpath_==null)
- {
- wsgenpath_ = element_.getAttribute("wsgenpath");
- }
- return wsgenpath_;
- }
-
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntExtensionCreation.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntExtensionCreation.java
deleted file mode 100644
index 4974f112c..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntExtensionCreation.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/**
- */
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.env.ui.common.LabelsAndIds;
-
-public class AntExtensionCreation {
-
- private Hashtable antExtentions_;
- private static AntExtensionCreation antExtensionC_;
- private Hashtable runtimeStructs_ = null;
-
-
- public static AntExtensionCreation getInstance(){
- if(antExtensionC_ == null){
- antExtensionC_ = new AntExtensionCreation();
- }
- return antExtensionC_;
- }
-
- public void createExtensions()
- {
- antExtentions_ = new Hashtable();
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- //Load by reading all extensions to org.eclipse.wst.command.env.ui.antfiles
- IConfigurationElement[] antExts = reg.getConfigurationElementsFor("org.eclipse.wst.command.env.ui", "antfiles");
-
- for(int idx=0; idx<antExts.length; idx++)
- {
- IConfigurationElement elem = antExts[idx];
- if (elem.getName().equals("antfiles"))
- {
- AntExtension ae = new AntExtension(elem);
- antExtentions_.put(elem.getAttribute("id"), ae);
- }
- }
- }
-
- public void createRuntimes(){
- Enumeration antExtsEnum = antExtentions_.elements();
- runtimeStructs_ = new Hashtable();
-
- while(antExtsEnum.hasMoreElements()){
- AntExtension antExt = (AntExtension)antExtsEnum.nextElement();
- RuntimeStruct rs = (RuntimeStruct)runtimeStructs_.get(antExt.getRuntimeID());
- if(rs == null){
- rs = new RuntimeStruct(antExt.getRuntimeID());
- rs.setRuntimeLabel(antExt.getRuntimeLabel());
- rs.setScenario(antExt.getID(), antExt.getScenarioLabel());
- runtimeStructs_.put(rs.getRuntimeID(), rs);
- }
- else{
- rs.setScenario(antExt.getID(), antExt.getScenarioLabel());
- }
- }
- }
-
- public LabelsAndIds getRuntimeLabelsAndIds(){
- if(antExtentions_ == null) createExtensions();
- if(runtimeStructs_ == null)createRuntimes();
- LabelsAndIds runtime = new LabelsAndIds();
- Enumeration runtimeStructs = runtimeStructs_.elements();
- while(runtimeStructs.hasMoreElements()){
- RuntimeStruct rs = (RuntimeStruct)runtimeStructs.nextElement();
- runtime.add(rs.getRuntimeID(),rs.getRuntimeLabel());
- }
- return runtime;
- }
-
- public LabelsAndIds getScenarioLabelsByRuntime(String runtimeId){
- if(antExtentions_ == null) createExtensions();
- if(runtimeStructs_ == null) createRuntimes();
- RuntimeStruct rs = (RuntimeStruct)runtimeStructs_.get(runtimeId);
- return rs.getScenarioLabels();
- }
-
-
- public AntExtension getAnrExtByScenario(String selection){
- if(antExtentions_ == null) return null;
- return (AntExtension)antExtentions_.get(selection);
- }
-
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizard.java
deleted file mode 100644
index 58c1a9c86..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizard.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060315 128711 joan@ca.ibm.com - Joan Haggarty
- * 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-import org.eclipse.wst.command.internal.env.ui.plugin.EnvUIPlugin;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.NullStatusHandler;
-import org.osgi.framework.Bundle;
-
-public class AntFileImportWizard extends Wizard implements INewWizard {
-
- //private IConfigurationElement fConfigElement;
- private AntFileImportWizardPage mainPage;
- /**
- * The workbench.
- */
- private IWorkbench workbench;
- private AntExtensionCreation antExtC_;
-
- /**
- * The current selection.
- */
- protected IStructuredSelection selection;
-
- public AntFileImportWizard()
- {
- super();
- setWindowTitle(EnvironmentUIMessages.WIZARD_TITLE_ANT);
- }
-
- public void setWindowTitle(String newTitle) {
- super.setWindowTitle(newTitle);
- }
-
- public void addPages() {
- super.addPages();
- mainPage = new AntFileImportWizardPage(EnvironmentUIMessages.WIZARD_PAGE_TITLE_ANT, getSelection());
- addPage(mainPage);
- }
-
- public boolean performFinish() {
- antExtC_ = AntExtensionCreation.getInstance();
- IPath destination = mainPage.getPath();
- if (destination == null)
- {
- return false;
- }
- else
- {
- AntExtension antExt = antExtC_.getAnrExtByScenario(mainPage.getScenario());
- Bundle wsBundle = Platform.getBundle(antExt.getPlugin());
- IPath propertyPath = new Path(antExt.getPath());
- URL propertyURL = FileLocator.find( wsBundle, propertyPath, null);
-
- URLConnection conn;
- InputStream isProperty = null;
- try{
- conn = propertyURL.openConnection();
- isProperty = conn.getInputStream();
- }
- catch (IOException ioe){}
-
- Plugin sourcePlugin = EnvPlugin.getInstance();
- String targetFile = antExt.getPath();
- createIFile(sourcePlugin, isProperty, destination, targetFile, (IProgressMonitor)new NullProgressMonitor());
-
- IPath wsgenPath = new Path(antExt.getWSGenPath());
- URL fileURL = FileLocator.find( wsBundle, wsgenPath, null);
-
- URLConnection connWSGen;
- InputStream isWSGen = null;
- try{
- connWSGen = fileURL.openConnection();
- isWSGen = connWSGen.getInputStream();
- }
- catch (IOException ioe){}
-
- String targetFileWSGen = antExt.getWSGenPath();
- createIFile(sourcePlugin, isWSGen, destination, targetFileWSGen, (IProgressMonitor)new NullProgressMonitor());
-
-
-
- }
- return true;
- }
-
-
-
- private IStatus createIFile(Plugin plugin, InputStream source, IPath targetPath, String targetFile, /*IEnvironment env,*/ IProgressMonitor monitor )
- {
-
- if (plugin != null)
- {
- IPath target = targetPath.append(new Path(targetFile));
-
- ProgressUtils.report( monitor, EnvironmentUIMessages.MSG_STATUS_COPYING_ANT_FILES);
- try
- {
- ResourceContext context = new TransientResourceContext();
- // check to see if file exists before copy
- IResource resource = FileResourceUtils.findResource(target);
-
- if (resource != null)
- {
- MessageBox overwriteBox = new MessageBox(getShell(), SWT.ICON_QUESTION|SWT.YES|SWT.NO);
- overwriteBox.setMessage(EnvironmentUIMessages.bind(EnvironmentUIMessages.MSG_WARNING_FILE_EXISTS, target.toString()));
- overwriteBox.setText(EnvironmentUIMessages.DIALOG_TITLE_OVERWRITE);
- int result = overwriteBox.open();
- if (result != SWT.NO)
- FileResourceUtils.createFile(context, target, source,
- monitor, (IStatusHandler)new NullStatusHandler());
- else
- return Status.CANCEL_STATUS;
- }
- else
- {
- FileResourceUtils.createFile(context, target, source,
- monitor, (IStatusHandler)new NullStatusHandler());
- }
- }
- catch (Exception e) {
- return StatusUtils.errorStatus(EnvironmentUIMessages.MSG_ERR_COPYING_ANT_FILES, e);
- }
- }
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the selection which was passed to <code>init</code>.
- *
- * @return the selection
- */
- public IStructuredSelection getSelection() {
- return selection;
- }
-
- /**
- * Returns the workbench which was passed to <code>init</code>.
- *
- * @return the workbench
- */
- public IWorkbench getWorkbench() {
- return workbench;
- }
-
- /**
- * The <code>BasicNewResourceWizard</code> implementation of this
- * <code>IWorkbenchWizard</code> method records the given workbench and
- * selection, and initializes the default banner image for the pages
- * by calling <code>initializeDefaultPageImageDescriptor</code>.
- * Subclasses may extend.
- */
- public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
- this.workbench = workbench;
- this.selection = currentSelection;
-
- initializeDefaultPageImageDescriptor();
- }
-
- /**
- * Initializes the default page image descriptor to an appropriate banner.
- * By calling <code>setDefaultPageImageDescriptor</code>.
- * The default implementation of this method uses a generic new wizard image.
- * <p>
- * Subclasses may reimplement.
- * </p>
- */
- protected void initializeDefaultPageImageDescriptor() {
- ImageDescriptor desc = EnvUIPlugin.getImageDescriptor("icons/full/wizban/newantfiles_wiz.png");//$NON-NLS-1$
- setDefaultPageImageDescriptor(desc);
- }
-
- /**
- * Selects and reveals the newly added resource in all parts
- * of the active workbench window's active page.
- *
- * @see ISetSelectionTarget
- */
- protected void selectAndReveal(IResource newResource) {
- selectAndReveal(newResource, getWorkbench().getActiveWorkbenchWindow());
- }
-
- /**
- * Attempts to select and reveal the specified resource in all
- * parts within the supplied workbench window's active page.
- * <p>
- * Checks all parts in the active page to see if they implement <code>ISetSelectionTarget</code>,
- * either directly or as an adapter. If so, tells the part to select and reveal the
- * specified resource.
- * </p>
- *
- * @param resource the resource to be selected and revealed
- * @param window the workbench window to select and reveal the resource
- *
- * @see ISetSelectionTarget
- */
- public static void selectAndReveal(IResource resource,
- IWorkbenchWindow window) {
- // validate the input
- if (window == null || resource == null)
- return;
- IWorkbenchPage page = window.getActivePage();
- if (page == null)
- return;
-
- // get all the view and editor parts
- List parts = new ArrayList();
- IWorkbenchPartReference refs[] = page.getViewReferences();
- for (int i = 0; i < refs.length; i++) {
- IWorkbenchPart part = refs[i].getPart(false);
- if (part != null)
- parts.add(part);
- }
- refs = page.getEditorReferences();
- for (int i = 0; i < refs.length; i++) {
- if (refs[i].getPart(false) != null)
- parts.add(refs[i].getPart(false));
- }
-
- final ISelection selection = new StructuredSelection(resource);
- Iterator itr = parts.iterator();
- while (itr.hasNext()) {
- IWorkbenchPart part = (IWorkbenchPart) itr.next();
-
- // get the part's ISetSelectionTarget implementation
- ISetSelectionTarget target = null;
- if (part instanceof ISetSelectionTarget)
- target = (ISetSelectionTarget) part;
- else
- target = (ISetSelectionTarget) part
- .getAdapter(ISetSelectionTarget.class);
-
- if (target != null) {
- // select and reveal resource
- final ISetSelectionTarget finalTarget = target;
- window.getShell().getDisplay().asyncExec(new Runnable() {
- public void run() {
- finalTarget.selectReveal(selection);
- }
- });
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java
deleted file mode 100644
index 61641fb7d..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/AntFileImportWizardPage.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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
- * yyyymmdd bug Email and other contact information
- * 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews
- * -------- -------- -----------------------------------------------------------
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WizardResourceImportPage;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-import org.eclipse.wst.command.internal.env.ui.common.LabelsAndIds;
-
-public class AntFileImportWizardPage extends WizardResourceImportPage{
-
- private String pluginId_ = "org.eclipse.wst.command.internal.env.ui";
-
- /* CONTEXT_ID SRPF0001 for server preference on the server runtime preference page */
- private String INFOPOP_SRPF_SERVER_PREF = pluginId_ + ".SRPF0001";
- private Combo scenario_;
-
- /* CONTEXT_ID SRPF0002 for runtime preference on the server runtime preference page */
- private String INFOPOP_SRPF_RUNTIME_PREF = pluginId_ + ".SRPF0002";
- private Combo runtime_;
-
- private AntExtensionCreation antExtC_;
- private LabelsAndIds labelsAndIdsScenario_;
- private LabelsAndIds labelsAndIdsRuntime_;
- private int runtimeIdx_;
- private Listener statusListener_;
-
- public AntFileImportWizardPage(String pageName,
- IStructuredSelection selection) {
- super("WSAntFilesPage1", selection);//$NON-NLS-1$
- setTitle(pageName);
- setDescription(EnvironmentUIMessages.WIZARD_PAGE_DESC_ANT);
- }
-
-
- public Combo createCombo( Composite parent, String labelName, String tooltip, String infopop, int style )
- {
- tooltip = tooltip == null ? labelName : tooltip;
-
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( labelName );
- label.setToolTipText( tooltip );
- }
-
- Combo combo = new Combo( parent, style );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-
- combo.setLayoutData( griddata );
- combo.setToolTipText( tooltip );
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( combo, pluginId_ + "." + infopop );
-
- return combo;
- }
-
- protected ITreeContentProvider getFileProvider() {
- return null;
- }
-
- public IPath getPath()
- {
- return getContainerFullPath();
- }
-
- protected void createSourceGroup(Composite parent) {
- Composite page = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- page.setLayout(gl);
- GridData gd = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
- page.setLayoutData(gd);
-
- runtime_ = createCombo(page,EnvironmentUIMessages.LABEL_RUNTIMES_LIST,
- EnvironmentUIMessages.TOOLTIP_PPAD_COMBO_RUNTIME,
- INFOPOP_SRPF_RUNTIME_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
- runtime_.addSelectionListener(new SelectionListener(){
- public void widgetDefaultSelected(SelectionEvent e) {}
-
- public void widgetSelected(SelectionEvent e) {
- handleRuntimeSelected();
- statusListener_.handleEvent(null);
- }
- });
-
- scenario_ = createCombo(page,EnvironmentUIMessages.LABEL_SERVERS_LIST,
- EnvironmentUIMessages.TOOLTIP_PPAD_COMBO_SCENARIO,
- INFOPOP_SRPF_SERVER_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
- iniatialize();
- }
-
- protected ITreeContentProvider getFolderProvider() {
- return null;
- }
-
- protected void createOptionsGroup(Composite parent) {
- //empty - don't want an options group
- }
-
- public void handleEvent(Event event)
- {
- if (scenario_ == event.widget)
- handleScenarioSelected();
- else if (runtime_ == event.widget)
- handleRuntimeSelected();
- else
- super.handleEvent(event);
-
- }
-
- public void handleRuntimeSelected(){
- labelsAndIdsScenario_ = antExtC_.getScenarioLabelsByRuntime(labelsAndIdsRuntime_.getId(runtime_.getSelectionIndex()));
- setScenarioLabels(labelsAndIdsScenario_.getLabels());
- }
-
- public void handleScenarioSelected(){
-
- }
-
- private void iniatialize(){
- antExtC_ = AntExtensionCreation.getInstance();
- labelsAndIdsRuntime_ = antExtC_.getRuntimeLabelsAndIds();
- setRuntimeLabels(labelsAndIdsRuntime_.getLabels());
- }
-
- public String getScenario(){
- return labelsAndIdsScenario_.getId(scenario_.getSelectionIndex());
- }
-
- private void setSelection(Combo combo, String s)
- {
- String[] items = combo.getItems();
- for (int i=0; i<items.length; i++)
- {
- if (items[i].equals(s))
- {
- combo.select(i);
- return;
- }
- }
- }
-
- private void setRuntimeLabels(String[] runtimeLabels)
- {
- runtime_.setItems(runtimeLabels);
- //until the preferences are set up
- setSelection(runtime_,runtimeLabels[0]);
- runtimeIdx_ = 0;
- labelsAndIdsScenario_ = antExtC_.getScenarioLabelsByRuntime(labelsAndIdsRuntime_.getId(0));
- setScenarioLabels(labelsAndIdsScenario_.getLabels());
- }
-
- private void setScenarioLabels(String[] scenarioLabels)
- {
- scenario_.setItems(scenarioLabels);
- //until the preferences are set up
- setSelection(scenario_,scenarioLabels[0]);
-
- }
-
-}
-
-
-
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java
deleted file mode 100644
index 3bd1c1102..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *
- */
-public class ErrorDialog extends MessageDialog
-{
-
- /**
- * Creates an error dialog. Note that the dialog will have no visual
- * representation (no widgets) until it is told to open.
- * <p>
- * Normally one should use <code>openError</code> to create and open one of
- * these. This constructor is useful only if the error object being displayed
- * contains child items <it>and</it> you need to specify a mask which will
- * be used to filter the displaying of these children.
- * </p>
- *
- * @param parentShell
- * the shell under which to create this dialog
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as per
- * <code>Status.matches</code>
- */
- public ErrorDialog(
- Shell parentShell,
- String dialogTitle,
- String message,
- IStatus status,
- int displayMask)
- {
- super(parentShell, dialogTitle, message, status, displayMask);
- }
-
- /*
- * (non-Javadoc) This should also be overwritten Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent)
- {
- // create OK and Details buttons
- createButton(
- parent,
- StatusDialogConstants.OK_ID,
- IDialogConstants.OK_LABEL,
- true);
- if (status.isMultiStatus() || status.getException() != null )
- {
- detailsButton =
- createButton(
- parent,
- StatusDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL,
- false);
- }
- }
-
- /*
- * This is one of the few methods that needs to be overwritten by the
- * subclasses. The image names can be found in the Dialog class
- */
- protected Image getDialogImage()
- {
- // create image
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_ERROR);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java
deleted file mode 100644
index 7107db6e1..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *
- */
-public class InfoDialog extends MessageDialog
-{
- /**
- * Creates an error dialog. Note that the dialog will have no visual
- * representation (no widgets) until it is told to open.
- * <p>
- * Normally one should use <code>openError</code> to create and open one of
- * these. This constructor is useful only if the error object being displayed
- * contains child items <it>and</it> you need to specify a mask which will
- * be used to filter the displaying of these children.
- * </p>
- *
- * @param parentShell
- * the shell under which to create this dialog
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as per
- * <code>Status.matches</code>
- */
- public InfoDialog(
- Shell parentShell,
- String dialogTitle,
- String message,
- IStatus status,
- int displayMask)
- {
- super(parentShell, dialogTitle, message, status, displayMask);
- }
-
- /*
- * (non-Javadoc) This should also be overwritten Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent)
- {
- // create OK and Details buttons
- createButton(
- parent,
- StatusDialogConstants.OK_ID,
- IDialogConstants.OK_LABEL,
- true);
- if (status.isMultiStatus() )
- {
- detailsButton =
- createButton(
- parent,
- StatusDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL,
- false);
- }
- }
-
- /*
- * This is one of the few methods that needs to be overwritten by the
- * subclasses. The image names can be found in the Dialog class
- */
- protected Image getDialogImage()
- {
- // create image
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java
deleted file mode 100644
index ddaf723b3..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java
+++ /dev/null
@@ -1,585 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060504 128984 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.common.StringUtils;
-import org.eclipse.wst.common.environment.Choice;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *
- */
-public class MessageDialog extends Dialog
-{
- protected Composite parent;
-
- /**
- * Reserve room for this many list items.
- */
- protected static final int LIST_ITEM_COUNT = 7;
-
- /**
- * The Details button.
- */
- protected Button detailsButton;
-
- /**
- * The title of the dialog.
- */
- protected String title;
-
- /**
- * The message to display.
- */
- protected String message;
-
- /**
- * The SWT list control that displays the error details.
- */
- protected List list;
- protected Text details;
-
- /**
- * Indicates whether the error details viewer is currently created.
- */
- protected boolean listCreated = false;
- protected boolean detailsCreated = false;
-
- /**
- * Filter mask for determining which status items to display.
- */
- protected int displayMask = 0xFFFF;
-
- /**
- * The main status object.
- */
- protected IStatus status;
-
- private Point savedSize = null;
-
- /**
- * List of the main error object's detailed errors (element type: <code>Status</code>).
- */
- protected java.util.List statusList;
- /**
- * Creates an error dialog. Note that the dialog will have no visual
- * representation (no widgets) until it is told to open.
- * <p>
- * Normally one should use <code>openError</code> to create and open one of
- * these. This constructor is useful only if the error object being displayed
- * contains child items <it>and</it> you need to specify a mask which will
- * be used to filter the displaying of these children.
- * </p>
- *
- * @param parentShell
- * the shell under which to create this dialog
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as per
- * <code>Status.matches</code>
- */
- public MessageDialog(
- Shell parentShell,
- String dialogTitle,
- String message,
- IStatus status,
- int displayMask)
- {
- super(parentShell);
- this.title = dialogTitle == null ? JFaceResources.getString("Problem_Occurred") : //$NON-NLS-1$
- dialogTitle;
- this.message = message == null ? status.getMessage() : JFaceResources.format("Reason", new Object[] { message, status.getMessage()}); //$NON-NLS-1$
- this.status = status;
- statusList = Arrays.asList(status.getChildren());
- this.displayMask = displayMask;
- setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
- }
- /*
- * (non-Javadoc) Method declared on Dialog. Handles the pressing of the Ok or
- * Details button in this dialog. If the Ok button was pressed then close
- * this dialog. If the Details button was pressed then toggle the displaying
- * of the error details area. Note that the Details button will only be
- * visible if the error being displayed specifies child details.
- */
- protected void buttonPressed(int id)
- {
- if (id == StatusDialogConstants.DETAILS_ID)
- { // was the details button pressed?
- toggleDetailsArea();
- }
- else
- {
- super.buttonPressed(id);
- }
- }
- /*
- * (non-Javadoc) Method declared in Window.
- */
- protected void configureShell(Shell shell)
- {
- super.configureShell(shell);
- shell.setText(title);
- }
- /*
- * (non-Javadoc) This should also be overwritten Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent)
- {
- // create OK and Details buttons
- createButton(
- parent,
- StatusDialogConstants.OK_ID,
- IDialogConstants.OK_LABEL,
- true);
- if (status.isMultiStatus() || status.getException() != null )
- {
- detailsButton =
- createButton(
- parent,
- StatusDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL,
- false);
- }
-
- parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
- }
-
- /*
- * This is one of the few methods that needs to be overwritten by the
- * subclasses. The image names can be found in the Dialog class
- */
- protected Image getDialogImage()
- {
- // create image
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog. Creates and returns the contents
- * of the upper part of the dialog (above the button bar).
- */
- protected Control createDialogArea(Composite parent)
- {
- this.parent = parent;
-
- // create composite
- Composite composite = (Composite) super.createDialogArea(parent);
- Composite imageAndLabel = new Composite(composite, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- imageAndLabel.setLayout(gl);
- imageAndLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
- composite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-
- // create image
- Image image = getDialogImage();
- if (image != null)
- {
- Label label = new Label(imageAndLabel, 0);
- image.setBackground(label.getBackground());
- label.setImage(image);
- label.setLayoutData(
- new GridData(
- GridData.HORIZONTAL_ALIGN_CENTER
- | GridData.VERTICAL_ALIGN_BEGINNING));
- }
-
- // create message
- if (message != null)
- {
- Text text = new Text(imageAndLabel, SWT.READ_ONLY|SWT.WRAP);
- text.setText(message);
- GridData data =
- new GridData(
- GridData.GRAB_HORIZONTAL
- | GridData.GRAB_VERTICAL
- | GridData.HORIZONTAL_ALIGN_FILL
- | GridData.VERTICAL_ALIGN_CENTER);
- data.widthHint =
- convertHorizontalDLUsToPixels(
- IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
-
- text.setLayoutData(data);
- text.setFont(parent.getFont());
- }
-
- return composite;
- }
-
- protected List createDropDownList(Composite parent)
- {
- // create the list
- list = new List(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
- // fill the list
- populateList(list);
-
- GridData data =
- new GridData(
- GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL
- | GridData.VERTICAL_ALIGN_FILL
- | GridData.GRAB_VERTICAL);
- data.heightHint = list.getItemHeight() * LIST_ITEM_COUNT;
- list.setLayoutData(data);
- listCreated = true;
- return list;
- }
- protected Text createDropDownDetails(Composite parent)
- {
- details = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.READ_ONLY | SWT.WRAP );
- //details.setEditable(false);
- Color color = parent.getShell().getDisplay().getSystemColor( SWT.COLOR_WHITE );
- details.setBackground(color);
- populateDetails(details, status, 0);
- GridData data =
- new GridData(
- GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL
- | GridData.VERTICAL_ALIGN_FILL
- | GridData.GRAB_VERTICAL);
-
- details.setLayoutData(data);
- details.setSelection(0);
- detailsCreated = true;
- return details;
- }
- /*
- * (non-Javadoc) Method declared on Window.
- */
- /**
- * Extends <code>Window.open()</code>. Opens an error dialog to display
- * the error. If you specified a mask to filter the displaying of these
- * children, the error dialog will only be displayed if there is at least one
- * child status matching the mask.
- */
- public int open()
- {
- if (shouldDisplay(status, displayMask))
- {
- return super.open();
- }
- return 0;
- }
- /**
- * This essentially does the work of a factory Opens an error dialog to
- * display the given error. Use this method if the error object being
- * displayed does not contain child items, or if you wish to display all such
- * items without filtering.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @return the code of the button that was pressed that resulted in this
- * dialog closing. This will be <code>Dialog.OK</code> if the OK
- * button was pressed, or <code>Dialog.CANCEL</code> if this
- * dialog's close window decoration or the ESC key was used.
- */
- public static int openMessage(
- Shell parent,
- String dialogTitle,
- String message,
- IStatus status)
- {
-
- switch (status.getSeverity())
- {
- case IStatus.INFO :
- return openInfo(
- parent,
- dialogTitle,
- message,
- status,
- IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
- case IStatus.WARNING :
- return openWarning(
- parent,
- dialogTitle,
- message,
- status,
- IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
- default :
- return openError(
- parent,
- dialogTitle,
- message,
- status,
- IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
- }
-
- }
-
- public static int openMessage(
- Shell parent,
- String dialogTitle,
- String message,
- IStatus status,
- Choice[] options)
- {
-
- return openOptions(
- parent,
- dialogTitle,
- message,
- status,
- IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR,
- options);
- }
-
- /**
- * Opens an error dialog to display the given error. Use this method if the
- * error object being displayed contains child items <it>and</it> you wish
- * to specify a mask which will be used to filter the displaying of these
- * children. The error dialog will only be displayed if there is at least one
- * child status matching the mask.
- *
- * @param parentShell
- * the parent shell of the dialog, or <code>null</code> if none
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as per
- * <code>Status.matches</code>
- * @return the code of the button that was pressed that resulted in this
- * dialog closing. This will be <code>Dialog.OK</code> if the OK
- * button was pressed, or <code>Dialog.CANCEL</code> if this
- * dialog's close window decoration or the ESC key was used.
- */
- public static int openError(
- Shell parentShell,
- String title,
- String message,
- IStatus status,
- int displayMask)
- {
- ErrorDialog dialog =
- new ErrorDialog(parentShell, title, message, status, displayMask);
- return dialog.open();
- }
-
- public static int openInfo(
- Shell parentShell,
- String title,
- String message,
- IStatus status,
- int displayMask)
- {
- InfoDialog dialog =
- new InfoDialog(parentShell, title, message, status, displayMask);
- return dialog.open();
- }
-
- public static int openWarning(
- Shell parentShell,
- String title,
- String message,
- IStatus status,
- int displayMask)
- {
- WarningDialog dialog =
- new WarningDialog(parentShell, title, message, status, displayMask);
- return dialog.open();
- }
-
- public static int openOptions(
- Shell parentShell,
- String title,
- String message,
- IStatus status,
- int displayMask,
- Choice[] options)
- {
- OptionsDialog dialog =
- new OptionsDialog(
- parentShell,
- title,
- message,
- status,
- displayMask,
- options);
- dialog.open();
- return dialog.getReturnCode();
- }
-
- /**
- * Populates the list using this error dialog's status object. This walks the
- * child stati of the status object and displays them in a list. The format
- * for each entry is status_path : status_message If the status's path was
- * null then it (and the colon) are omitted.
- */
- private void populateList(List list)
- {
- Iterator enumeration = statusList.iterator();
- while (enumeration.hasNext())
- {
- IStatus childStatus = (IStatus) enumeration.next();
- populateList(list, childStatus, 0);
- }
- }
- private void populateList(List list, IStatus status, int nesting)
- {
- if (!status.matches(displayMask))
- {
- return;
- }
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < nesting; i++)
- {
- sb.append(" ");
- }
- sb.append(status.getMessage());
- list.add(sb.toString());
- IStatus[] children = status.getChildren();
- for (int i = 0; i < children.length; i++)
- {
- populateList(list, children[i], nesting + 1);
- }
- }
- private void populateDetails(Text text, IStatus status, int nesting)
- {
- if (!status.matches(displayMask))
- {
- return;
- }
-
- String tabChars = StringUtils.repeat( ' ', nesting * 2 );
- String messageLine = tabChars + status.getMessage() + System.getProperty("line.separator");
- Throwable except = status.getException();
-
- text.append( messageLine );
-
- if( except != null )
- {
- String[] trace = StringUtils.getStackTrace( except );
-
- for( int index = 0; index < trace.length; index++ )
- {
- text.append( tabChars + " " + trace[index] + System.getProperty("line.separator") );
- }
- }
-
- IStatus[] children = status.getChildren();
- for (int i = 0; i < children.length; i++)
- {
- populateDetails(text, children[i], nesting + 1);
- }
- }
- /**
- * Returns whether the given status object should be displayed.
- *
- * @param status
- * a status object
- * @param mask
- * a mask as per <code>Status.matches</code>
- * @return <code>true</code> if the given status should be displayed, and
- * <code>false</code> otherwise
- */
- protected static boolean shouldDisplay(IStatus status, int mask)
- {
- IStatus[] children = status.getChildren();
- if (children == null || children.length == 0)
- {
- return status.matches(mask);
- }
- for (int i = 0; i < children.length; i++)
- {
- if (children[i].matches(mask))
- return true;
- }
- return false;
- }
- /**
- * Toggles the unfolding of the details area. This is triggered by the user
- * pressing the details button.
- */
- private void toggleDetailsArea()
- {
- Point windowSize = getShell().getSize();
- int newHeight = -1;
-
- if (detailsCreated)
- {
- details.dispose();
- detailsCreated = false;
- detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-
- // Without the following computeSize call the setSize call below throws an array out of bounds exception.
- // Very weird.
- getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
- newHeight = savedSize.y;
- }
- else
- {
- if( savedSize == null ) savedSize = windowSize;
-
- details = createDropDownDetails((Composite) getContents());
- detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
- newHeight = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
- newHeight = newHeight < 250 ? 250 : newHeight;
- }
-
- newHeight = newHeight > 400 ? 400 : newHeight;
-
- getShell().setSize( new Point(windowSize.x, newHeight) );
- parent.layout();
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java
deleted file mode 100644
index bf1179d40..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.environment.Choice;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *
- */
-public class OptionsDialog extends MessageDialog
-{
- private Choice[] choices;
- private int returnCode_;
-
- public OptionsDialog(
- Shell parentShell,
- String dialogTitle,
- String message,
- IStatus status,
- int displayMask,
- Choice[] choices)
- {
- super(parentShell, dialogTitle, message, status, displayMask);
- this.choices = choices;
- }
-
- /*
- * (non-Javadoc) This should also be overwritten Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent)
- {
- // create a button for each options
- for (int i = 0; i < choices.length; i++)
- {
- createButton(parent, choices[i].getShortcut(), choices[i].getLabel(), true);
- }
- if (status.isMultiStatus() )
- {
- detailsButton =
- createButton(
- parent,
- StatusDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL,
- false);
- }
- }
-
- protected void buttonPressed(int id)
- {
- if (id == StatusDialogConstants.DETAILS_ID)
- // was the Details button pressed?
- super.buttonPressed(id);
- else
- {
- setReturnCode(id);
- close();
- }
- }
-
- protected void setReturnCode(int id)
- {
- returnCode_ = id;
- }
-
- public int getReturnCode()
- {
- return returnCode_;
- }
- /*
- * This is one of the few methods that needs to be overwritten by the
- * subclasses. The image names can be found in the Dialog class
- */
- protected Image getDialogImage()
- {
- // create image
- switch (status.getSeverity())
- {
- case IStatus.INFO :
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
- case IStatus.WARNING :
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_WARNING);
- default :
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_ERROR);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/RuntimeStruct.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/RuntimeStruct.java
deleted file mode 100644
index c5902490a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/RuntimeStruct.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/**
- */
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.wst.command.internal.env.ui.common.LabelsAndIds;
-
-public class RuntimeStruct {
-
- private String runtimeID_;
- private String runtimeLabel_;
- private LabelsAndIds scenarios_;
-
- public RuntimeStruct(String runtimeID){
- runtimeID_ = runtimeID;
- }
-
- public String getRuntimeID(){
- return runtimeID_;
- }
-
- public void setRuntimeLabel(String label){
- runtimeLabel_ = label;
- }
-
- public String getRuntimeLabel(){
- return runtimeLabel_;
- }
-
- public void setScenario(String id, String label){
- if(scenarios_ == null) scenarios_ = new LabelsAndIds();
- if(id == null || label == null) return;
- scenarios_.add(id,label);
- }
-
- public LabelsAndIds getScenarioLabels(){
- return scenarios_;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java
deleted file mode 100644
index 4e56788ec..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-/**
-* Constants for status dialogs
-*/
-public interface StatusDialogConstants {
-
- /*
- * Button ID for the "Yes" button
- */
- public static final int YES_ID = 2;
- /*
- * Button ID for the "Yes to all" button
- */
- public static final int YES_TO_ALL_ID = 4;
- /*
- * Button ID for the "Cancel" button
- */
- public static final int CANCEL_ID = 1;
- /*
- * Button ID for the "OK" button
- */
- public static final int OK_ID = 0;
- /*
- * Button ID for the "Details" button
- */
- public static final int DETAILS_ID = 13;
-
- /*
- * Button label for the "Yes" button
- */
- // public static final String YES_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_YES_LABEL");
- /*
- * Button label for the "Yes to all" button
- */
- // public static final String YES_TO_ALL_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_YES_TO_ALL_LABEL");
- /*
- * Button label for the "Cancel" button
- */
- // public static final String CANCEL_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_CANCEL_LABEL");
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java
deleted file mode 100644
index cb5695f5b..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *
- */
-public class WarningDialog extends MessageDialog
-{
- /**
- * Creates an error dialog. Note that the dialog will have no visual
- * representation (no widgets) until it is told to open.
- * <p>
- * Normally one should use <code>openError</code> to create and open one of
- * these. This constructor is useful only if the error object being displayed
- * contains child items <it>and</it> you need to specify a mask which will
- * be used to filter the displaying of these children.
- * </p>
- *
- * @param parentShell
- * the shell under which to create this dialog
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as per
- * <code>Status.matches</code>
- */
- public WarningDialog(
- Shell parentShell,
- String dialogTitle,
- String message,
- IStatus status,
- int displayMask)
- {
- super(parentShell, dialogTitle, message, status, displayMask);
- }
-
- /*
- * (non-Javadoc) This should also be overwritten Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent)
- {
- // create OK, Cancel and Details buttons
- createButton(
- parent,
- StatusDialogConstants.OK_ID,
- IDialogConstants.OK_LABEL,
- true);
- createButton(
- parent,
- StatusDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL,
- false);
- if (status.isMultiStatus())
- {
- detailsButton =
- createButton(
- parent,
- StatusDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL,
- false);
- }
- }
-
- /*
- * This is one of the few methods that needs to be overwritten by the
- * subclasses. The image names can be found in the Dialog class
- */
- protected Image getDialogImage()
- {
- // create image
- return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_WARNING);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java
deleted file mode 100644
index 39c764534..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- * 20070502 162287 makandre@ca.ibm.com - Andrew Mak, Server publish cancel button unavailable
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.eclipse;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.core.EnvironmentCoreMessages;
-import org.eclipse.wst.command.internal.env.eclipse.BaseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.dialog.MessageDialog;
-import org.eclipse.wst.command.internal.env.ui.dialog.StatusDialogConstants;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-
-
-/**
- * This is the Eclipse UI version of the IStatusHandler
- */
-public class EclipseStatusHandler extends BaseStatusHandler
-{
- private Shell shell = null;
-
- public EclipseStatusHandler()
- {
- }
-
- public EclipseStatusHandler( Shell theShell )
- {
- shell = theShell;
- }
-
- /**
- * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[])
- */
- public Choice report( final IStatus status, final Choice[] choices)
- {
- final int[] result = new int[1];
-
- checkStatus( status );
-
- Runnable runnable = new Runnable()
- {
- public void run()
- {
- result[0] =
- MessageDialog.openMessage( getShell(),
- EnvironmentCoreMessages.TITLE_WARNING, //TODO: Should be inferred from status' severity.
- null,
- status,
- choices);
- }
- };
-
- Display.getDefault().syncExec( runnable );
-
- for (int i = 0; i < choices.length; i++)
- {
- if (choices[i].getShortcut() == result[0] )
- return choices[i];
- }
-
- return null;
- }
-
- /**
- * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status)
- */
- public void report(IStatus status) throws StatusException
- {
- boolean userOk = false;
-
- checkStatus( status );
-
- switch (status.getSeverity())
- {
- // an error has been reported and we need to stop executing the comming
- // commands
- case Status.ERROR :
- {
- userOk = reportErrorStatus(status);
- break;
- }
- case Status.WARNING :
- {
- userOk = reportWarning(status);
- break;
- }
- case Status.INFO :
- {
- userOk = true;
- reportInfo(status);
- break;
- }
- }
-
- if( !userOk ) throw new StatusException( status );
- }
-
- private boolean reportWarning( final IStatus status )
- {
- final int userResponse[] = new int[1];
-
- Runnable runnable = new Runnable()
- {
- public void run()
- {
- userResponse[0] =
- MessageDialog.openMessage( getShell(),
- EnvironmentCoreMessages.TITLE_WARNING,
- null,
- status);
- }
- };
-
- Display.getDefault().syncExec( runnable );
-
- return (userResponse[0] == StatusDialogConstants.OK_ID);
- }
-
- private boolean reportErrorStatus(final IStatus status)
- {
- // no need to report an empty message with no exception
- if ("".equals(status.getMessage()) && status.getException() == null)
- return false;
-
- Runnable runnable = new Runnable()
- {
- public void run()
- {
- MessageDialog.openMessage( getShell(),
- EnvironmentCoreMessages.TITLE_ERROR,
- null,
- status);
- }
- };
-
- Display.getDefault().syncExec( runnable );
-
- return false;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.common.IStatusHandler#reportError(org.eclipse.wst.command.internal.env.core.common.Status)
- */
- public void reportError(IStatus status)
- {
- checkStatus( status );
- reportErrorStatus( status );
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.common.IStatusHandler#reportInfo(org.eclipse.wst.command.internal.env.core.common.Status)
- */
- public void reportInfo(final IStatus status)
- {
- Runnable runnable = new Runnable()
- {
- public void run()
- {
- MessageDialog.openMessage( getShell(),
- EnvironmentCoreMessages.TITLE_INFO,
- null,
- status);
- }
- };
-
- Display.getDefault().syncExec( runnable );
- }
-
- private Shell getShell()
- {
- if( shell != null ) return shell;
-
- Display display = Display.getDefault();
-
- return display == null ? null : display.getActiveShell();
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EnvironmentUtils.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EnvironmentUtils.java
deleted file mode 100644
index ea1de3783..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EnvironmentUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.eclipse;
-
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-public final class EnvironmentUtils
-{
- /**
- *
- * @param env This should be an EclipseEnvironment.
- * @return Returns a ResourceContext.
- */
- public static ResourceContext getResourceContext( IEnvironment env )
- {
- ResourceContext context = null;
-
- if( env instanceof EclipseEnvironment )
- {
- context = ((EclipseEnvironment)env).getResourceContext();
- }
- else
- {
- context = new TransientResourceContext();
- }
-
- return context;
- }
-
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/SWTEnvironmentManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/SWTEnvironmentManager.java
deleted file mode 100644
index 99132bcc5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/SWTEnvironmentManager.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.eclipse;
-
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-
-public class SWTEnvironmentManager
-{
- /**
- * Returns a new instance of an IEnvironment for the Eclipse SWT GUI.
- */
- public static BaseEclipseEnvironment getNewSWTEnvironment()
- {
- PersistentResourceContext context = PersistentResourceContext.getInstance();
- EclipseStatusHandler handler = new EclipseStatusHandler();
- EclipseEnvironment environment = new EclipseEnvironment( null, context, handler );
-
- return environment;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java
deleted file mode 100644
index 4c15d6091..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- ******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EnvUIPlugin extends Plugin {
-
- //The shared instance.
- private static EnvUIPlugin instance;
-
- /**
- * The constructor.
- */
- public EnvUIPlugin() {
- super();
- instance = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static EnvUIPlugin getInstance() {
- return instance;
- }
- public static ImageDescriptor getImageDescriptor ( String name )
- {
- try
- {
- URL installURL = instance.getBundle().getEntry("/");
- URL imageURL = new URL(installURL,name);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java
deleted file mode 100644
index 55e4a7989..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060726 151866 makandre@ca.ibm.com - Andrew Mak, Popup Dialog Selection preferences defaults incorrectly to hide all
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-
-
-/**
- * This class can be used to create a popup actions preference page for a
- * particular category. For example:
- *
- * <pre>
- * &lt;extension
- * point="org.eclipse.ui.preferencePages"&gt;
- * &lt;page
- * name="%PREFERENCE_CATEGORY_DIALOGS"
- * category="org.eclipse.jst.ws.ui.preferences.name"
- * class="org.eclipse.wst.command.internal.env.preferences.ActionDialogsPreferencePage"
- * id="org.eclipse.jst.wss.popup.category"&gt;
- * &lt;/page&gt;
- * * </pre>
- * This entry specifies that all popup actions that are associated with the
- * org.eclipse.jst.wss.popup.category will be displayed on this
- * preference page.
- */
-public class ActionDialogsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener, IExecutableExtension
-{
- /*CONTEXT_ID PPAD0001 for the Action Dialogs Preference Page*/
- private String INFOPOP_PPAD_PAGE = "org.eclipse.wst.command.env.ui.PPAD0001";
- //
- private Button showAll;
- /*CONTEXT_ID PPAD0002 for the show all check box on the Action Dialogs Preference Page*/
- private String INFOPOP_PPAD_BUTTON_SHOW_ALL = "org.eclipse.wst.command.env.ui.PPAD0002";
- //
- private Button hideAll;
- /*CONTEXT_ID PPAD0003 for the hide all check box on the Action Dialogs Preference Page*/
- private String INFOPOP_PPAD_BUTTON_HIDE_ALL = "org.eclipse.wst.command.env.ui.PPAD0003";
-
- private Hashtable checkBoxes_;
- private String categoryId_;
-
- public void setInitializationData( IConfigurationElement config,
- String propertyName,
- Object data )
- throws CoreException
- {
- categoryId_ = config.getAttribute( "id" );
- }
-
- /**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
-
- checkBoxes_ = new Hashtable();
- addOptionalDialogsCheckBoxes (superparent);
- new Label(superparent, SWT.HORIZONTAL);
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- parent.setLayout( layout );
- parent.setToolTipText(EnvironmentUIMessages.TOOLTIP_PPAD_PAGE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, INFOPOP_PPAD_PAGE );
-
- showAll = new Button(parent, SWT.NONE);
- showAll.setText(EnvironmentUIMessages.BUTTON_SHOW_ALL_DIALOGS);
- showAll.addListener(SWT.Selection, this);
- showAll.setToolTipText(EnvironmentUIMessages.TOOLTIP_PPAD_BUTTON_SHOW_ALL);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(showAll, INFOPOP_PPAD_BUTTON_SHOW_ALL );
-
- hideAll = new Button(parent, SWT.NONE);
- hideAll.setText(EnvironmentUIMessages.BUTTON_HIDE_ALL_DIALOGS);
- hideAll.addListener ( SWT.Selection, this);
- hideAll.setToolTipText(EnvironmentUIMessages.TOOLTIP_PPAD_BUTTON_HIDE_ALL);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(hideAll, INFOPOP_PPAD_BUTTON_HIDE_ALL );
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
- return parent;
- }
-
- public void handleEvent (Event event)
- {
- if (showAll == event.widget)
- handleShowAllEvent();
-
- else if ( hideAll == event.widget)
- handleHideAllEvent();
- }
-
- private void handleShowAllEvent ()
- {
- Enumeration e = checkBoxes_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- Button dialog = (Button) e.nextElement();
- dialog.setSelection( false );
- }
- }
-
- private void handleHideAllEvent ()
- {
- Enumeration e = checkBoxes_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- Button dialog = (Button) e.nextElement();
- dialog.setSelection( true );
- }
- }
-
- private void addOptionalDialogsCheckBoxes ( Composite parent)
- {
- PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
- ActionDialogPreferenceType[] dialogs = context.getDialogs();
-
- for (int i = 0; i < dialogs.length; i++)
- {
- ActionDialogPreferenceType dialog = dialogs[i];
- String category = dialog.getCategory();
-
- if( dialog.getShowCheckbox() && category != null && category.equals( categoryId_) )
- {
- Button checkBox = createCheckBox(parent, dialog.getName());
- checkBox.setToolTipText( dialog.getTooltip() );
- PlatformUI.getWorkbench().getHelpSystem().setHelp(checkBox, dialog.getInfopop() );
- checkBoxes_.put(dialog.getId(), checkBox);
- }
- }
- }
-
- private Button createCheckBox( Composite parent, String text )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText( text );
- return button;
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- storeValues();
- return true;
- }
-
- protected void performApply()
- {
- performOk();
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * Initializes states of the controls using default values
- * in the preference store.
- */
- private void initializeDefaults()
- {
- PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
- Enumeration e = checkBoxes_.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
- String id = (String) e.nextElement();
- Button dialog = (Button) checkBoxes_.get(id);
- dialog.setSelection(context.getDefaultBoolean(id));
- }
- }
-
- /**
- * Initializes states of the controls from the preferences.
- */
- private void initializeValues()
- {
- PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
- Enumeration e = checkBoxes_.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
- String id = (String) e.nextElement();
- Button button = (Button) checkBoxes_.get(id);
- button.setSelection(context.isActionDialogEnabled(id));
- }
- }
-
- /**
- * Stores the values of the controls back to the preference store.
- */
- private void storeValues()
- {
- PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-
- Enumeration e = checkBoxes_.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
- String id = (String) e.nextElement();
- context.setActionDialogEnabled(id, ((Button)checkBoxes_.get(id)).getSelection());
- }
- }
-}
-
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java
deleted file mode 100644
index 5ab5b3104..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.registry;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class WidgetRegistry
-{
- private static WidgetRegistry registry_;
-
- private Hashtable entries_;
-
- private WidgetRegistry()
- {
- }
-
- public static WidgetRegistry instance()
- {
- if (registry_ == null)
- {
- registry_ = new WidgetRegistry();
- registry_.load();
- }
-
- return registry_;
- }
-
- public static void initialize()
- {
- registry_ = null;
- }
-
- /**
- *
- * @param id the methodId that may have WidgetContributor associated with it.
- * @return returns a INamedWidgetContributorFactory if one was defined in the registry.
- * Otherwise null is returned.
- */
- public INamedWidgetContributorFactory getFactory( String id )
- {
- INamedWidgetContributorFactory factory = null;
- Entry entry = (Entry)entries_.get( id );
-
- if( entry != null )
- {
- try
- {
- if( entry.factory_ == null )
- {
- entry.factory_ = (INamedWidgetContributorFactory)entry.element_.createExecutableExtension( "class" );
- }
-
- factory = entry.factory_;
- }
- catch( CoreException exc )
- {
- exc.printStackTrace();
- }
- catch( Throwable exc )
- {
- exc.printStackTrace();
- }
- }
-
- return factory;
- }
-
- private void load()
- {
- IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.wst.command.env.ui.widgetRegistry");
-
- entries_ = new Hashtable();
-
- for( int index = 0; index < elements.length; index++ )
- {
- // If this is not an element that know about we will skip it.
- if( !elements[index].getName().equals("widgetFactory") ) continue;
-
- Entry entry = new Entry();
- IConfigurationElement element = elements[index];
- String id = element.getAttribute( "id" );
- String methodId = element.getAttribute( "insertBeforeCommandId" );
-
- entry.element_ = element;
- entry.id_ = id;
-
- entries_.put( methodId, entry );
- }
- }
-
- private class Entry
- {
- String id_;
- IConfigurationElement element_;
- INamedWidgetContributorFactory factory_;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/AbstractSelectionDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/AbstractSelectionDialog.java
deleted file mode 100644
index 0d94ecb68..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/AbstractSelectionDialog.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-
-public abstract class AbstractSelectionDialog extends SimpleDialog {
-
- public AbstractSelectionDialog( Shell shell, PageInfo pageInfo)
- {
- super(shell, pageInfo);
- }
-
- protected void callSetters() {
- // extenders should override this method
-
- }
-
- public String getDisplayableSelectionString()
- {
- return "";
- }
-
- public abstract IStructuredSelection getObjectSelection();
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java
deleted file mode 100644
index c86640939..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-
-/**
- * This is an interface for an abstract can finish registry.
- * This registry is usually associate with an Eclipse wizard. This
- * registry allow condition object to be added to it in order to
- * determine if the wizard can finish or not.
- *
- */
-public interface CanFinishRegistry
-{
- /**
- * Add a condition object to the registry.
- * @param condition the condition.
- */
- public void addCondition( Condition condition );
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java
deleted file mode 100644
index b1cfc3273..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory;
-
-
-public interface CommandWidgetBinding extends CommandFragmentFactoryFactory
-{
- /**
- * This method is used by extensions to register their widgets with
- * CommandFragments
- *
- * @param widgetRegistry
- */
- public void registerWidgetMappings( WidgetRegistry widgetRegistry );
-
- /**
- * This method is used by extenions to register the data mappings
- * that their widgets use.
- *
- * @param dataRegistry
- */
- public void registerDataMappings( DataMappingRegistry dataRegistry );
-
- /**
- * This method is used by extensions to register condition objects
- * that control if the wizard can finish or not.
- *
- * @param canFinishRegistry
- */
- public void registerCanFinish( CanFinishRegistry canFinishRegistry );
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java
deleted file mode 100644
index ec1980769..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-
-public class CommandWidgetBindingList implements CommandWidgetBinding
-{
- private Vector bindings_;
- private Vector fragments_;
- private CommandFragmentFactory factory_;
-
- /**
- * This CommandWidgetBinding combines a list of CommandWidgetBindings.
- * There should be the same number of entries in both the bindings
- * parameter and the fragments parameter. Entries in either of the
- * bindings for fragments vectors are allowed to be null.
- *
- * @param bindings the bindings to combine.
- * @param fragments These fragments will be interspersed with the
- * fragments associated with each binding. The first
- * fragment will be put before the fragment from the
- * first binding. Following this will be the second
- * fragment from the fragments vector and then the
- * second fragment from the bindings vector, etc.
- */
- public CommandWidgetBindingList( Vector bindings, Vector fragments )
- {
- bindings_ = bindings;
- fragments_ = fragments;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- int length = bindings_.size();
-
- for( int index = 0; index < length; index++ )
- {
- CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-
- if( binding != null ) binding.registerCanFinish( canFinishRegistry );
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- int length = bindings_.size();
-
- for( int index = 0; index < length; index++ )
- {
- CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
- if( binding != null ) binding.registerDataMappings( dataRegistry );
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- int length = bindings_.size();
-
- for( int index = 0; index < length; index++ )
- {
- CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
- if( binding != null ) binding.registerWidgetMappings( widgetRegistry );
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- if( factory_ == null )
- {
- factory_ = new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- SequenceFragment fragmentList = new SequenceFragment();
- int length = bindings_.size();
-
- for( int index = 0; index < length; index++ )
- {
- CommandFragment fragment = (CommandFragment)fragments_.elementAt( index );
-
- if( fragment != null )
- {
- fragmentList.add( fragment );
- }
-
- CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-
- if( binding != null )
- {
- fragmentList.add( binding.create().create() );
- }
- }
-
- return fragmentList;
- }
- };
- }
-
- return factory_;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java
deleted file mode 100644
index c3855d4de..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * This Command can be used to get the current page.
- * Use of this class is not recommended.
- *
- */
-public class CurrentPageCommand extends AbstractDataModelOperation
-{
- private WizardPageManager pageManager_;
-
- public CurrentPageCommand( WizardPageManager pageManager )
- {
- pageManager_ = pageManager;
- }
-
- public IWizardPage getCurrentPage()
- {
- return pageManager_.getCurrentPage();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java
deleted file mode 100644
index 0450ad308..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * This Command can be use to get the resulting data object for
- * this wizard.
- *
- */
-public class DataObjectCommand extends AbstractDataModelOperation
-{
- private Object dataObject_;
-
- public void setDataObject( Object object )
- {
- dataObject_ = object;
- }
-
- public Object getDataObject()
- {
- return dataObject_;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DialogDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DialogDataEvents.java
deleted file mode 100644
index 52fd19d8c..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DialogDataEvents.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-/**
- * Dynamic wizard implementations that want to create different
- * kinds of wizard pages need to implement this interface.
- * The WizardPageFactory returns a class of this type.
- *
- */
-public interface DialogDataEvents
-{
- /**
- *
- * @return returns the WidgetDataEvents object created by the addControls
- * method of a WidgetContributor.
- */
- public WidgetDataEvents getDataEvents();
-
- /**
- * Validates that this wizard page is complete.
- *
- */
- public void validatePageToStatus();
-}
-
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java
deleted file mode 100644
index 16a7a225f..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060223 129232 pmoogk@ca.ibm.com - Peter Moogk
- * 20060822 154750 pmoogk@ca.ibm.com - Peter Moogk
- * 20070529 187780 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.registry.WidgetRegistry;
-import org.osgi.framework.Bundle;
-
-
-/**
- * This class is used to add dynamic wizards into Eclipse. When adding
- * a dynamic wizard into eclipse two entries need to be made in the plugin.xml
- * file. This first entry tells Eclipse that a new wizard should be added
- * and it references this class. The second entry specifies detailed information
- * that is specific to the wizard to be added. These two plugin.xml entries
- * are linked together via their id attributes. For example here is an
- * entry that registers a new wizard with eclipse. Note the class attribute
- * references this class.
- * <pre>
- * &lt;extension
- * point="org.eclipse.ui.newWizards"&gt;
- * &lt;wizard
- * name="%PLUGIN_NEW_WIZARD_NAME_WS_CLIENT"
- * icon="icons/full/ctool16/newclient_webserv_wiz.gif"
- * category="org.eclipse.jst.ws.ui.new"
- * class="org.eclipse.wst.command.env.ui.widgets.DynamicWizard"
- * id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- * &lt;description&gt;
- * %PLUGIN_NEW_WIZARD_DESC_WS_CLIENT
- * &lt;/description&gt;
- * &lt;selection
- * class="org.eclipse.core.resources.IResource"&gt;
- * &lt;/selection&gt;
- * &lt;/wizard&gt;
- * &lt;/extension&gt;
- *
- * </pre>
- * Here is the dynamicWizard entry for this particular wizard. This id attributes
- * link these two entries together. The class attribute must specify a class that
- * implements the org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding interface. This
- * interface specifies what the UI should look like and the commands the should
- * be executed in the wizard.
- *
- * <pre>
- * &lt;extension
- * point="org.eclipse.wst.command.env.dynamicWizard"&gt;
- * &lt;dynamicWizard
- * iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
- * class="org.eclipse.jst.ws.consumption.ui.widgets.binding.ClientWidgetBinding"
- * title="%WIZARD_TITLE_WSC"
- * id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- * &lt;/dynamicWizard&gt;
- * &lt;/extension&gt;
- * </pre>
- *
- */
-public class DynamicWizard extends Wizard implements INewWizard, IExecutableExtension
-{
- private String iconBannerName_;
- private Bundle bundle_;
- private SimpleCanFinishRegistry canFinishRegistry_;
- private String wizardTitle_;
- private DataObjectCommand dataObjectCommand_ = null;
- private WizardPageManager pageManager_;
-
- protected IConfigurationElement wizardElement_;
- protected IConfigurationElement originalElement_;
- protected CommandWidgetBinding commandWidgetBinding_;
-
- public DynamicWizard()
- {
- setNeedsProgressMonitor(true);
- }
-
- /**
- * This method is called when the Dynamic wizard is created by eclipse.
- * We need to find a dynamicWizard extension point that matches the id
- * for this wizard. Once the extension point is found it will contain
- * a reference to a CommandWidgetBinding class which defines the widgets
- * and commands for this wizard.
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
- */
- public void setInitializationData( IConfigurationElement config,
- String propertyName,
- Object data )
- throws CoreException
- {
- String wizardId = config.getAttribute( "id" ); //$NON-NLS-1$
-
- setInitialData( wizardId );
- originalElement_ = config;
- }
-
- /**
- * This method should only be called if the Dynamic Wizard is being
- * launched through some other mechanise other than the Eclipse New Wizard
- * mechanism.
- *
- * @param binding the command widget binding for this wizard.
- * @param descriptor the plugin descriptor where the icon banner is
- * located.
- * @param iconBannerPath the icon banner path for this wizard. The path
- * is relative to the plugin specified by the
- * descriptor parameter.
- * @param wizardTitle the wizard title
- *
- * @deprecated Use either setInitialData(wizardId) or
- * setInitialData(wizardId, bundle, iconBannerPath, wizardTitle )
- */
- public void setInitialData( CommandWidgetBinding binding,
- Bundle bundle,
- String iconBannerPath,
- String wizardTitle )
- {
- commandWidgetBinding_ = binding;
- bundle_ = bundle;
- iconBannerName_ = iconBannerPath;
- wizardTitle_ = wizardTitle;
- }
-
- /**
- * Sets the initial data based on the dynamic wizard id.
- *
- * @param wizardId
- */
- public void setInitialData( String wizardId ) throws CoreException
- {
- setInitialData(wizardId, null, null, null );
- }
-
- /**
- * Sets the initial data based on the dynamic wizard id.
- *
- * @param wizardId the ID of the wizard.
- * @param bundle the bundle used to find an icon banner. Can be null if
- * no icon banner is specified.
- * @param iconBannerPath the path relative to the bundle specified.
- * @param wizardTitle the title of the wizard.
- *
- * Note: normally the wizard associated with a wizardId will have an
- * icon banner and a title. The parameters on this method allow the caller
- * to override these values.
- */
- public void setInitialData( String wizardId, Bundle bundle, String iconBannerPath, String wizardTitle ) throws CoreException
- {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint point = registry.getExtensionPoint("org.eclipse.wst.command.env.dynamicWizard"); //$NON-NLS-1$
- IExtension[] extensions = point.getExtensions();
-
- for( int index = 0; index < extensions.length; index++)
- {
- IConfigurationElement[] elements = extensions[index].getConfigurationElements();
-
- if( elements.length == 1 && elements[0].getName().equals( "dynamicWizard") ) //$NON-NLS-1$
- {
- String id = elements[0].getAttribute( "id" ); //$NON-NLS-1$
-
- if( id != null && id.equals( wizardId ) )
- {
- wizardElement_ = elements[0];
- break;
- }
- }
- }
-
- bundle_ = bundle;
- iconBannerName_ = iconBannerPath;
- wizardTitle_ = wizardTitle;
-
- if( wizardElement_ == null )
- {
- Status status = new Status( Status.ERROR, "id", 0, NLS.bind(EnvironmentUIMessages.MSG_ERROR_WIZARD_ID_NOT_FOUND, new String[]{ wizardId}) , null ); //$NON-NLS-1$
- throw new CoreException( status );
- }
- }
-
- /**
- * This method is called by the eclipse framework to initialize the
- * wizard.
- *
- * Note: if this method is called programatically(ie. not by the eclipse
- * framework.) one of the setInitalData methods needs to be called before this
- * method is invoked.
- *
- * @param workbench the eclipse workbench
- * @param selection the initial selection that the user has made within
- * eclipse.
- */
- public void init ( IWorkbench workbench, IStructuredSelection selection )
- {
- PersistentResourceContext context = PersistentResourceContext.getInstance();
- EclipseStatusHandler handler = new EclipseStatusHandler();
- EclipseEnvironment environment = new EclipseEnvironment( null, context, handler );
-
- DataMappingRegistryImpl dataRegistry_ = new DataMappingRegistryImpl();
- SimpleWidgetRegistry widgetRegistry_ = new SimpleWidgetRegistry();
- DataFlowManager dataManager = new DataFlowManager( dataRegistry_, environment );
-
- try
- {
- if( wizardElement_ != null )
- {
- if( commandWidgetBinding_ == null )
- {
- commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" ); //$NON-NLS-1$
- }
-
- if( bundle_ == null )
- {
- bundle_ = Platform.getBundle( wizardElement_.getNamespace() );
- }
-
- if( iconBannerName_ == null )
- {
- iconBannerName_ = wizardElement_.getAttribute( "iconbanner" ); //$NON-NLS-1$
- }
-
- if( wizardTitle_ == null )
- {
- wizardTitle_ = wizardElement_.getAttribute( "title" ); //$NON-NLS-1$
- }
- }
- }
- catch( CoreException exc )
- {
- exc.printStackTrace();
- }
-
- dataObjectCommand_ = new DataObjectCommand();
- canFinishRegistry_ = new SimpleCanFinishRegistry();
- pageManager_ = new WizardPageManager( widgetRegistry_,
- getWizardPageFactory(),
- this,
- dataManager,
- environment );
-
- pageManager_.setRootFragment( getRootFragment( selection, pageManager_ ) );
-
- commandWidgetBinding_.registerWidgetMappings( widgetRegistry_ );
- commandWidgetBinding_.registerDataMappings( dataRegistry_ );
- commandWidgetBinding_.registerCanFinish( canFinishRegistry_ );
-
- // If a page is not complete ensure that canFinish is false.
- Condition canFinish = new Condition()
- {
- public boolean evaluate()
- {
- IWizardPage currentPage = pageManager_.getCurrentPage();
-
- return currentPage != null ? currentPage.isPageComplete() : true;
- }
- };
-
- canFinishRegistry_.add( canFinish );
-
- // Set that we need a progress monitor.
- setNeedsProgressMonitor( true );
-
- // Ensure that the next/back buttons are enabled.
- setForcePreviousAndNextButtons( true );
-
- // Set the icon banner if specified.
- if( iconBannerName_ != null && iconBannerName_.length() > 0 )
- {
- try
- {
- URL installURL = bundle_.getEntry("/"); //$NON-NLS-1$
- URL imageURL = new URL(installURL, iconBannerName_ );
- ImageDescriptor image = ImageDescriptor.createFromURL(imageURL);
-
- if( image != null )
- {
- setDefaultPageImageDescriptor( image );
- }
- }
- catch (MalformedURLException e)
- {
- }
- }
-
- if( wizardTitle_ != null && wizardTitle_.length() > 0 )
- {
- setWindowTitle( wizardTitle_ );
- }
- }
-
- // Subclasses can override this.
- protected WizardPageFactory getWizardPageFactory()
- {
- return new SimplePageFactory();
- }
-
- /**
- * Returns true if all pages are complete.
- * @return True if all pages are complete.
- */
- public boolean canFinish ()
- {
- int length = canFinishRegistry_.size();
- boolean result = true;
-
- for( int index = 0; index < length; index++ )
- {
- Condition condition = (Condition)canFinishRegistry_.elementAt( index );
-
- result = condition.evaluate();
-
- if( !result ) break;
- }
-
- return result;
- }
-
- /**
- * Returns the first page for this wizard.
- *
- * @return the first page for this wizard.
- **/
- public IWizardPage getStartingPage()
- {
- return pageManager_.getStartingPage();
- }
-
- /**
- * Returns the next page after page and
- * runs the appropriate tasks.
- *
- * @return the next page after page.
- **/
- public IWizardPage getNextPage( IWizardPage page )
- {
- return pageManager_.getNextPage();
- }
-
- /**
- */
- public boolean performFinish ()
- {
- boolean result = pageManager_.performFinish();
-
- if( result ) cleanup();
-
- return result;
- }
-
- /**
- * Undo fragments
- */
- public boolean performCancel ()
- {
- boolean result = pageManager_.performCancel();
-
- if( result ) cleanup();
-
- return result;
- }
-
- public Object getDataObject()
- {
- return dataObjectCommand_.getDataObject();
- }
-
- protected CommandFragment getRootFragment( IStructuredSelection selection, WizardPageManager pageManager )
- {
- SequenceFragment root = new SequenceFragment();
-
- root.add( new SimpleFragment( new SelectionCommand( selection ), "" ) ); //$NON-NLS-1$
- root.add( new SimpleFragment( new CurrentPageCommand( pageManager ), "" ) ); //$NON-NLS-1$
- root.add( commandWidgetBinding_.create().create() );
- root.add( new SimpleFragment( dataObjectCommand_, "" )); //$NON-NLS-1$
-
- return root;
- }
-
- protected IConfigurationElement getConfigElement()
- {
- return wizardElement_;
- }
-
- /**
- * This method frees up the memory held by this object.
- *
- */
- private void cleanup()
- {
- iconBannerName_ = null;
- bundle_ = null;
- canFinishRegistry_ = null;
- pageManager_ = null;
- wizardTitle_ = null;
- commandWidgetBinding_ = null;
- WidgetRegistry.initialize();
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java
deleted file mode 100644
index a5baf32b4..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-public interface INamedWidgetContributor
-{
- /**
- *
- * @return returns the WidgetContributor for this Named widget.
- */
- public WidgetContributorFactory getWidgetContributorFactory();
-
- /**
- *
- * @return returns the name.
- */
- public String getName ();
-
- /**
- *
- * @return returns a description that might be displayed on
- * a wizard page.
- */
- public String getDescription ();
-
- /**
- *
- * @return returns title that may be displayed on
- * a wizard page.
- */
- public String getTitle();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java
deleted file mode 100644
index f14ff0380..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-public interface INamedWidgetContributorFactory
-{
- /**
- *
- * @return returns the first named widget.
- */
- INamedWidgetContributor getFirstNamedWidget();
-
- /**
- *
- * @param widgetContributor
- * @return returns the next named widget after the one specified.
- */
- INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor );
-
- /**
- * This method is used by extenions to register the data mappings
- * that their widgets use.
- *
- * @param dataRegistry
- */
- public void registerDataMappings( DataMappingRegistry dataRegistry );
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java
deleted file mode 100644
index 15843645d..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-
-public class PageInfo
-{
- private String pageName_;
- private String pageTitle_;
- private WidgetContributorFactory widgetFactory_;
-
- public PageInfo( String pageName,
- String pageTitle,
- WidgetContributorFactory widgetFactory )
- {
- pageName_ = pageName;
- pageTitle_ = pageTitle;
- widgetFactory_ = widgetFactory;
- }
-
- public String getPageName()
- {
- return pageName_;
- }
-
- public String getPageTitle()
- {
- return pageTitle_;
- }
-
- public WidgetContributorFactory getWidgetFactory()
- {
- return widgetFactory_;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java
deleted file mode 100644
index 5eb65f110..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * Dynamic wizard implementations that want to create different
- * kinds of wizard pages need to implement this interface.
- * The WizardPageFactory returns a class of this type.
- *
- */
-public interface PageWizardDataEvents extends IWizardPage
-{
- /**
- *
- * @return returns the WidgetDataEvents object created by the addControls
- * method of a WidgetContributor.
- */
- public WidgetDataEvents getDataEvents();
-
- /**
- * Validates that this wizard page is complete.
- *
- */
- public void validatePageToStatus();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java
deleted file mode 100644
index 8f13bcce3..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
- * This SelectionCommand is execute at the very beginning of the
- * dynamic wizard. Commands executed in the wizard that need
- * the initial selection can get it through a data mapping from
- * this command to the command that needs it.
- *
- */
-public class SelectionCommand extends AbstractDataModelOperation
-{
- private IStructuredSelection selection_;
-
- public SelectionCommand( IStructuredSelection selection )
- {
- selection_ = selection;
- }
-
- public IStructuredSelection getInitialSelection()
- {
- return selection_;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java
deleted file mode 100644
index ae99dc6ef..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-
-
-
-public class SimpleCanFinishRegistry extends Vector implements CanFinishRegistry
-{
-
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3257285837870741305L;
-
- /* (non-Javadoc)
- * @see org.eclipse.env.widgets.CanFinishRegistry#addCondition(org.eclipse.env.command.fragment.Condition)
- */
- public void addCondition(Condition condition)
- {
- add( condition );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java
deleted file mode 100644
index 46aaa7b80..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060223 129232 pmoogk@ca.ibm.com - Peter Moogk
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- * 20070730 197144 pmoogk@ca.ibm.com - Peter Moogk, Pass progress monitor to undo commands.
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentEngine;
-import org.eclipse.wst.command.internal.env.core.fragment.FragmentListener;
-import org.eclipse.wst.command.internal.env.eclipse.BaseStatusHandler;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-
-
-/**
- * This class manages the execution of Commands in a flow of CommandFragments.
- * The bulk of this work is done by the CommandFragmentEngine. The main job of
- * this class is run the fragments in a particular transactional environment.
- * A fragment has a method called doNotRunInTransaction which is used to determine
- * if its commands should be run in a transaction or not. If this method returns
- * true(ie. not in a transaction) the Commands are wrapped in a IRunnableWithProgress.
- * If false( ie. in a transaction ) the Commands are wrapped in a WorkspaceModifyOperation.
- *
- */
-public class SimpleCommandEngineManager
-{
- protected CommandFragmentEngine engine_;
- protected DataFlowManager dataManager_;
- protected EclipseEnvironment environment_;
-
- private boolean foundStop_;
- private boolean doNotRunInTransaction_;
-
- public SimpleCommandEngineManager( EclipseEnvironment environment, DataFlowManager dataManager )
- {
- environment_ = environment;
- dataManager_ = dataManager;
- }
-
- /**
- * Sets the root fragment. The execution engine will start executing commands
- * at the beginning of this root fragment.
- *
- * @param root the root fragment.
- */
- public void setRootFragment( CommandFragment root )
- {
- engine_ = new CommandFragmentEngine( root, dataManager_, environment_ );
-
- environment_.setCommandManager( engine_ );
-
- engine_.setPeekFragmentListener(
- new FragmentListener()
- {
- public boolean notify( CommandFragment fragment )
- {
- return peekFragment( fragment );
- }
- } );
-
- engine_.setNextFragmentListener(
- new FragmentListener()
- {
- public boolean notify( CommandFragment fragment )
- {
- return nextFragment( fragment );
- }
- } );
-
- engine_.setAfterExecuteFragmentListener(
- new FragmentListener()
- {
- public boolean notify( CommandFragment fragment )
- {
- return afterExecuteNextFragment( fragment );
- }
- } );
-
- engine_.setUndoFragmentListener(
- new FragmentListener()
- {
- public boolean notify( CommandFragment fragment )
- {
- return undoFragment( fragment );
- }
- } );
- }
-
- protected boolean afterExecuteNextFragment( CommandFragment fragment )
- {
- boolean continueExecute = true;
- BaseStatusHandler statusHandler = (BaseStatusHandler)environment_.getStatusHandler();
- IStatus commandStatus = engine_.getLastStatus();
- IStatus handlerStatus = statusHandler.getStatus();
-
- if( commandStatus.getSeverity() == IStatus.ERROR &&
- handlerStatus.getSeverity() != IStatus.ERROR )
- {
- // The command returned an error status for the engine to stop,
- // but the status handler did not have report and error.
- // Therefore, we will report this status returned by the command
- // if there is a message to display.
- String errorMessage = commandStatus.getMessage();
-
- if( errorMessage != null && errorMessage.length() > 0 )
- {
- statusHandler.reportError( commandStatus );
- }
- }
- else if( commandStatus.getSeverity() != IStatus.ERROR &&
- handlerStatus.getSeverity() == IStatus.ERROR )
- {
- // The last command didn't return an error, but the status handler
- // did report and error. Therefore, we should stop.
- continueExecute = false;
- }
-
- return continueExecute;
- }
-
- /**
- * The CommandFragmentEngine calls this method when it is peeking forward
- * in the fragments. When peeking forward the command stack state in the
- * engine is not changes.
- *
- *
- * @param fragment the fragment that it is peeking at.
- * @return Indicates whether peeking should stop or not.
- */
- protected boolean peekFragment( CommandFragment fragment )
- {
- return true;
- }
-
- /**
- * The CommandFragmentEngine calls this method when it is moving forward
- * in the fragments. When moving forward the command stack state is saved
- * at each fragment is traversed.
- *
- * @param fragment the fragment that is being traversed.
- * @return indicates if the forward traversal should continue.
- */
- protected boolean nextFragment( CommandFragment fragment )
- {
- if( fragment.doNotRunInTransaction() != doNotRunInTransaction_ )
- {
- // The fragment is requesting a different transaction environment than
- // the one that we are in so we must stop and change environments.
- doNotRunInTransaction_ = fragment.doNotRunInTransaction();
- foundStop_ = false;
- }
-
- return foundStop_;
- }
-
- /**
- * This method is called for each fragment when the command engine is unwinding
- * its stack during an undo operation.
- *
- * @param fragment the fragment being undone.
- * @return returns true if the undo process should continue.
- */
- protected boolean undoFragment( CommandFragment fragment )
- {
- return true;
- }
-
- /**
- * This method undoes the commands that were executed in the runForwardToNextStop
- * method.
- * @param context the runnable context.
- * @return returns if all commands have been undone or not.
- */
- public boolean runUndoToNextStop( IRunnableContext context )
- {
- final boolean result[] = new boolean[]{true};
-
- IRunnableWithProgress undoOperation
- = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor monitor)
- {
- result[0] = engine_.undoToLastStop(monitor);
- }
- };
-
- try
- {
- if( context == null )
- {
- // We don't have a container yet so just run the operation.
- undoOperation.run( null );
- }
- else
- {
- // We have a container where this operation can run and have
- // its progress displayed.
- context.run( false, false, undoOperation );
- }
- }
- catch( Exception exc )
- {
- // For now we will ignore all exceptions.
- }
-
- return result[0];
- }
-
- /**
- * The method executes the CommandFragment commands in the context provided.
- *
- * @param context the context
- * @return returns the status of executing the commands.
- */
- public IStatus runForwardToNextStop( IRunnableContext context )
- {
- IRunnableWithProgress operation = null;
-
- doNotRunInTransaction_ = false;
-
- do
- {
- // We will stop unless we are changing transaction modes.
- foundStop_ = true;
-
- if( doNotRunInTransaction_ )
- {
- operation = getNoTransactionOperation();
- }
- else
- {
- operation = getTransactionOperation();
- }
-
- try
- {
- if( context == null )
- {
- // We don't have a container yet so just run the operation.
- operation.run( null );
- }
- else
- {
- // We have a container where this operation can run and have
- // its progress displayed.
- context.run( false, false, operation );
- }
- }
- catch( InterruptedException exc )
- {
- //TODO should log these exceptions.
- exc.printStackTrace();
- }
- catch( InvocationTargetException exc )
- {
- //TODO should log these exceptions.
- exc.printStackTrace();
- }
- }
- while( !foundStop_ );
-
- return engine_.getLastStatus();
- }
-
- private IRunnableWithProgress getTransactionOperation()
- {
- IRunnableWithProgress operation = new IRunnableWithProgress()
- {
- public void run( IProgressMonitor monitor )
- {
- environment_.getLog().log(ILog.INFO, "command", 5002, this, "getTransactionOperation", "Start of transaction");
-
- BaseStatusHandler statusHandler = (BaseStatusHandler)environment_.getStatusHandler();
-
- statusHandler.resetStatus();
- engine_.moveForwardToNextStop( monitor );
-
-
- environment_.getLog().log(ILog.INFO, "command", 5003, this, "getTransactionOperation", "End of transaction");
- }
- };
-
- return operation;
- }
-
- private IRunnableWithProgress getNoTransactionOperation()
- {
- IRunnableWithProgress operation = new IRunnableWithProgress()
- {
- public void run( IProgressMonitor monitor )
- {
- environment_.getLog().log(ILog.INFO, "command", 5085, this, "getNoTransactionOperation", "Start of NON transaction");
-
- BaseStatusHandler statusHandler = (BaseStatusHandler)environment_.getStatusHandler();
-
- statusHandler.resetStatus();
- engine_.moveForwardToNextStop( monitor );
- environment_.getLog().log(ILog.INFO, "command", 5086, this, "getNoTransactionOperation", "End of NON transaction");
- }
- };
-
- return operation;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleDialog.java
deleted file mode 100644
index fe6f8f765..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleDialog.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060418 136335 joan@ca.ibm.com - Joan Haggarty
- * 20060418 136759 joan@ca.ibm.com - Joan Haggarty
- * 20061106 142500 david.schneider@unisys.com - David Schneider
- * 20060829 180833 ericdp@ca.ibm.com - Eric D. Peters, New Web Service wizard service settings dialog has unlabelled enabled text fields
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-public abstract class SimpleDialog extends Dialog implements DialogDataEvents
-{
- private WidgetContributor widget_;
- private WidgetDataEvents dataEvents_;
- private Listener statusListener_;
- protected WizardPageManager pageManager_;
- private Text messageText_;
- private boolean ok_;
-
- public SimpleDialog( Shell shell, PageInfo pageInfo)
- {
- super(shell);
- widget_ = pageInfo.getWidgetFactory().create();
- statusListener_ = new StatusListener();
- }
-
- Composite parent_;
- public Control createDialogArea( Composite parent )
- {
- parent_ = parent;
- Composite control = (Composite) super.createDialogArea(parent);
- dataEvents_ = widget_.addControls( control, statusListener_ );
-
- //Text area to display validation messages
- messageText_ = new Text(parent, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY);
- messageText_.setBackground(parent.getBackground());
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- griddata.horizontalIndent = 10;
- messageText_.setLayoutData( griddata );
- parent_.setFocus();
-
- //Call extenders override of the callSetters method to intialize any data in widget
- callSetters();
- Dialog.applyDialogFont(parent);
- return control;
- }
-
- //Override of Dialog.createContents so we can affect button enablement
- protected Control createContents(Composite parent) {
- Control c = super.createContents(parent);
- //enable controls for initial entry to dialog
- validatePageToStatus();
- return c;
- }
-
- // Enable or disable ok button based on state
- private void enableOk(boolean state)
- {
- Button okButton = getButton(IDialogConstants.OK_ID);
- if (okButton != null)
- okButton.setEnabled(state);
- }
-
- //Implement this method to call all setters on the dialog widget after the controls are created
- protected abstract void callSetters();
-
- public WidgetDataEvents getDataEvents()
- {
- return dataEvents_;
- }
-
- protected WidgetContributor getWidget()
- {
- return widget_;
- }
-
- // sets message in message area above OK and Cancel buttons
- private void setMessage(String message)
- {
- if (message == null)
- messageText_.setText("");
- else
- messageText_.setText(message);
- // force a resize of the parent composite and wrap of the text field if necessary
- parent_.layout();
- }
-
-
-
- public void validatePageToStatus()
- {
- IStatus status = widget_.getStatus();
-
- if( status != null )
- {
- String message = status.getMessage();
- int severity = status.getSeverity();
-
- // for error condition, disable ok and print message
- if( severity == IStatus.ERROR )
- {
- if( message.length() == 0 )
- {
- setMessage( null);
- }
- else
- {
- setMessage(message);
- }
- ok_ = false;
- }
- // display warning and info messages but still enable OK
- else if (severity == IStatus.WARNING | severity == IStatus.INFO)
- {
- setMessage(message);
- ok_ = true;
- }
- // no message to display
- else
- {
- setMessage( null);
- ok_ = true;
- }
- }
- // null status case
- else
- {
- setMessage(null);
- ok_ = true;
- }
-
- enableOk(ok_);
- }
-
- private class StatusListener implements Listener
- {
- public void handleEvent( Event evt )
- {
- validatePageToStatus();
- }
- }
-}
-
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java
deleted file mode 100644
index 9694e7080..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-public class SimplePageFactory implements WizardPageFactory
-{
- public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager )
- {
- return new SimpleWizardPage( pageInfo, manager );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java
deleted file mode 100644
index 65331d32e..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-public class SimplePopupPageFactory implements WizardPageFactory
-{
- private String id_;
-
- public SimplePopupPageFactory( String id )
- {
- id_ = id;
- }
-
- public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager )
- {
- return new SimplePopupWizardPage( pageInfo, manager, id_ );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java
deleted file mode 100644
index bc509ca8a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060731 120378 makandre@ca.ibm.com - Andrew Mak, Fields not visible in Large font settings
- * 20070522 184006 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.ui.EnvironmentUIMessages;
-
-
-
-public class SimplePopupWizardPage extends SimpleWizardPage
-{
- private String id_;
-
- public SimplePopupWizardPage( PageInfo pageInfo, WizardPageManager pageManager, String id )
- {
- super( pageInfo, pageManager );
-
- id_ = id;
- }
-
- protected Composite internalCreateControl( Composite parent )
- {
- Composite composite = super.internalCreateControl(parent);
-
- final PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-
- // If the current page is null then this must be the first page.
- if( pageManager_.getCurrentPage() == null && context.showCheckbox(id_) )
- {
- final Button button = new Button( composite, SWT.CHECK );
- String label = EnvironmentUIMessages.CHECKBOX_DO_NOT_SHOW_DIALOG_AGAIN;
-
- /*CONTEXT_ID TWP0001 for the show/hide check box*/
- String infopop = "org.eclipse.wst.command.env.ui.TWP0001";
- String tooltip = EnvironmentUIMessages.TOOLTIP_DO_NOT_SHOW_DIALOG_AGAIN;
-
- button.setText( label );
- button.setToolTipText( tooltip );
- button.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- context.setObjectActionDialogEnabled( id_, button.getSelection() );
- }
- });
- button.setSelection( false );
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp( button, infopop );
- }
-
- return composite;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java
deleted file mode 100644
index 952c2f42e..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-public class SimpleWidgetContributor implements INamedWidgetContributor
-{
- private WidgetContributorFactory factory_;
- private String name_;
- private String description_;
- private String title_;
-
- public void setDescription(String description)
- {
- description_ = description;
- }
-
-
- public void setFactory(WidgetContributorFactory factory)
- {
- factory_ = factory;
- }
-
-
- public void setName(String name)
- {
- name_ = name;
- }
-
-
- public void setTitle(String title)
- {
- title_ = title;
- }
-
-
- public WidgetContributorFactory getWidgetContributorFactory()
- {
- return factory_;
- }
-
- public String getName()
- {
- return name_;
- }
-
- public String getDescription()
- {
- return description_;
- }
-
- public String getTitle()
- {
- return title_;
- }
-
- /**
- * Subsclassers should override this method.
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
-
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java
deleted file mode 100644
index 6f806a16a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * This class provides a simple WidgetDataContributor class that concrete
- * WidgetDataContributors can subclass.
- *
- */
-public class SimpleWidgetDataContributor implements WidgetDataContributor
-{
- /**
- * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
- */
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- return this;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor#getStatus()
- */
- public IStatus getStatus()
- {
- return null;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents#externalize()
- */
- public void externalize()
- {
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents#internalize()
- */
- public void internalize()
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java
deleted file mode 100644
index 8a6fafc21..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-
-
-
-public class SimpleWidgetRegistry implements WidgetRegistry
-{
- private Hashtable table_ = new Hashtable();
-
- public void add( String fragmentId,
- String pageName,
- String pageTitle,
- WidgetContributorFactory widgetFactory )
- {
- PageInfo entry = new PageInfo( pageName, pageTitle, widgetFactory );
- table_.put( fragmentId, entry );
- }
-
- public PageInfo getPageInfo( String fragmentId )
- {
- return (PageInfo)table_.get( fragmentId );
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java
deleted file mode 100644
index 2625964cc..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060731 120378 makandre@ca.ibm.com - Andrew Mak, Fields not visible in Large font settings
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-
-
-public class SimpleWizardPage extends WizardPage implements PageWizardDataEvents
-{
- private WidgetContributor widget_;
- private WidgetDataEvents dataEvents_;
- private Listener statusListener_;
- protected WizardPageManager pageManager_;
-
- public SimpleWizardPage( PageInfo pageInfo, WizardPageManager pageManager )
- {
- super( "" );
-
- setTitle( pageInfo.getPageName() );
- setDescription( pageInfo.getPageTitle());
-
- widget_ = pageInfo.getWidgetFactory().create();
- statusListener_ = new StatusListener();
- pageManager_ = pageManager;
- }
-
- public void createControl( Composite parent )
- {
- ScrolledComposite control = new ScrolledComposite( parent, SWT.V_SCROLL );
- Composite inner = internalCreateControl(control);
-
- control.setExpandHorizontal(true);
- control.setExpandVertical(true);
- control.setContent(inner);
- control.setMinSize(inner.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(control);
- setControl( control );
- }
-
- protected Composite internalCreateControl( Composite parent ) {
-
- Composite control = new Composite( parent, SWT.NONE );
- control.setLayout( new GridLayout() );
- control.setLayoutData( new GridData( GridData.FILL_BOTH ));
-
- dataEvents_ = widget_.addControls( control, statusListener_ );
-
- return control;
- }
-
- public WidgetDataEvents getDataEvents()
- {
- return dataEvents_;
- }
-
- public void validatePageToStatus()
- {
- IStatus status = widget_.getStatus();
-
- if( status != null )
- {
- if( status.getSeverity() == IStatus.ERROR )
- {
- String message = status.getMessage();
-
- if( message.length() == 0 )
- {
- setErrorMessage( null );
- setMessage( getDescription() );
- }
- else
- {
- setErrorMessage( message );
- }
-
- setPageComplete( false );
- }
- else if (status.getSeverity() == IStatus.WARNING )
- {
- setErrorMessage( null );
- setMessage(status.getMessage(), IStatus.WARNING );
- setPageComplete( true );
- }
- else if( status.getSeverity() == IStatus.INFO )
- {
- setErrorMessage( null );
- setMessage( status.getMessage(), IStatus.INFO );
- setPageComplete( true );
- }
- else
- {
- setErrorMessage( null );
- setMessage( getDescription() );
- setPageComplete( true );
- }
- }
- else
- {
- setErrorMessage( null );
- setMessage( getDescription() );
- setPageComplete( true );
- }
-
- getContainer().updateButtons();
- }
-
- public boolean canFlipToNextPage()
- {
- return isPageComplete() && pageManager_.hasNextPage();
- }
-
- public IWizardPage getNextPage()
- {
- return pageManager_.getNextPage();
- }
-
- public void setVisible(boolean value)
- {
- pageManager_.handlePageVisible( this, value );
-
- super.setVisible(value);
- }
-
- private class StatusListener implements Listener
- {
- public void handleEvent( Event evt )
- {
- validatePageToStatus();
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java
deleted file mode 100644
index 152f7c8c8..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-
-public class WidgetBindingToWidgetFactoryAdapter
-{
- private Hashtable widgetContributor_;
- private CommandWidgetBinding binding_;
-
- public WidgetBindingToWidgetFactoryAdapter( CommandWidgetBinding binding )
- {
- widgetContributor_ = new Hashtable();
- binding_ = binding;
-
- binding.registerWidgetMappings( new MyWidgetRegistry() );
- }
-
- public INamedWidgetContributor getWidget( String id )
- {
- return (INamedWidgetContributor)widgetContributor_.get( id );
- }
-
- public void registerDataMappings( DataMappingRegistry registry )
- {
- binding_.registerDataMappings( registry );
- }
-
- private class MyWidgetRegistry implements WidgetRegistry
- {
- public void add(String fragmentId, String pageName, String pageTitle, WidgetContributorFactory widgetFactory)
- {
- SimpleWidgetContributor widget = new SimpleWidgetContributor();
- widget.setTitle( pageName );
- widget.setDescription( pageTitle );
- widget.setFactory( new MyWidgetContributorFactory( widgetFactory ) );
-
- widgetContributor_.put( fragmentId, widget );
- }
- }
-
- private class MyWidgetContributorFactory implements WidgetContributorFactory
- {
- private WidgetContributorFactory factory_;
- private WidgetContributor widget_;
-
- public MyWidgetContributorFactory( WidgetContributorFactory factory )
- {
- factory_ = factory;
- }
-
- public WidgetContributor create()
- {
- if( widget_ == null )
- {
- widget_ = factory_.create();
- }
-
- return widget_;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java
deleted file mode 100644
index 9c8afc661..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * This interface provides a way for developers to create validatable widgets
- * that can be used in many different Eclipse UI contexts. (ie. in a Windows, Diaglogs,
- * wizard pages, etc)
- *
- * The main functionality this interface has over just a regular Eclipse Composite
- * is that it provides a mechanism for validating the Widget. When validating
- * there are two aspects to keep in mind. The first aspect deals with WHEN validation
- * occurs and the second aspect deals with WHAT to do for a validation event.
- *
- * The first aspect of triggering validation events is handled by the statusListener
- * parameter of the addControls method. If a particular control that is contributed can
- * affect the validity of this WidgetContributor then the statusListener object
- * should be added to the listener list of that control. For example, if the text in
- * a Text widget can affect the validity of this WidgetContributor then you would
- * add the statusListener to the Text widgets Modify listener list:
- *
- *
- * Text someText = new Text( parent, SWT.NONE );
- * someText.addListener( SWT.Modify, statusListener );
- *
- * Note: if you want to force validation of this widget you can call
- * the statusListener.handleEvent(null) method directly. This
- * is not the prefered may to trigger validation, however.
- *
- * The second aspect of valiation is what to do when the validation event occurs.
- * This is handled by getStatus method. Any code that ensures that this widget is
- * valid should be put in the getStatus implementation.
- *
- *
-*/
-public interface WidgetContributor
-{
- /**
- * This method should be used to implement the UI contributions for this widget.
- *
- * @param parent The composite parent that sub widgets should use.
- * @param statusListener This listener should be added to any widget that can
- * affect the validity of this WidgetContributor.
- * @return returns a WidgetDataEvents object. This object is used by the
- * framework to internalize and externalize data for this widget.
- */
- public WidgetDataEvents addControls( Composite parent, Listener statusListener );
-
- /**
- * This method should implement validation code for this WidgetContributor.
- *
- * @return returns a status object indicating the validity of this widget.
- * If the status severity is ERROR then this widget is considered to
- * be invalid. For any other status severity or if the status returned
- * is null this widget is considered to be valid.
- */
- public IStatus getStatus();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java
deleted file mode 100644
index f27efc63f..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface provide a way for creating WidgetContributors
- *
- *
- */
-public interface WidgetContributorFactory
-{
- public WidgetContributor create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java
deleted file mode 100644
index a781acbbf..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface is a combination of the WidgetContributor interface and
- * the WidgetDataEvents interface.
- *
- */
-public interface WidgetDataContributor extends WidgetContributor, WidgetDataEvents
-{
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java
deleted file mode 100644
index cd1d9f8e9..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface provides a way for internalizing and externalizing state
- * data in a WidgetContributor. The internalize method will be called
- * before the widget is displayed so that it can set the default data
- * for that widget. The externalize method provides a way of getting data
- * from the widget after it is displayed.
- *
- */
-public interface WidgetDataEvents
-{
- /**
- * Implementations should set widget state data here.
- *
- */
- public void internalize();
-
- /**
- * Implemenations should get widget state data here.
- *
- */
- public void externalize();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java
deleted file mode 100644
index e51b18f53..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface defines how WidgetContributors are made known to the
- * dynamic wizard framework. This widget will be displayed as a wizard page
- * with the name and title specified in the add method. The fragmentId is
- * used to associate this widget with a particular CommandFragment. When
- * a CommandFragment with this fragmentId is traversed the corresponding
- * WidgetContributor will be displayed.
- *
- */
-public interface WidgetRegistry
-{
- /**
- * Adds a WidgetContributorFactory to the framework. This factory
- * is used to get the WidgetContributor. This WidgetContributor
- * will be used to render the wizard page.
- *
- * @param fragmentId the CommandFragment id that this WidgetContributor is associated with.
- * @param pageName the name of this wizard page.
- * @param pageTitle the title of this wizard page.
- * @param widgetFactory the factory which will create the WidgetContributor.
- */
- public void add( String fragmentId,
- String pageName,
- String pageTitle,
- WidgetContributorFactory widgetFactory );
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java
deleted file mode 100644
index 36b664d12..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-
-/**
- *
- *
- *
- *
- */
-public interface WizardPageFactory
-{
- public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager );
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java
deleted file mode 100644
index 068ed7d89..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060223 129232 pmoogk@ca.ibm.com - Peter Moogk
- * 20060313 130958 pmoogk@ca.ibm.com - Peter Moogk
- * 20070319 175721 pmoogk@ca.ibm.com - Peter Moogk
- * 20070328 173345 pmoogk@ca.ibm.com - Peter Moogk, Peek next page problem
- * 20070730 197144 pmoogk@ca.ibm.com - Peter Moogk, Pass progress monitor to undo commands.
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.registry.WidgetRegistry;
-import org.eclipse.wst.common.environment.ILog;
-
-
-
-public class WizardPageManager extends SimpleCommandEngineManager
-{
- private WizardPageFactory pageFactory_;
- private Hashtable pageTable_;
- private IWizard wizard_;
- protected SimpleWidgetRegistry registry_;
-
- // These variables are used and set by our methods which is
- // why they are not initialized in the constructor.
- private PageWizardDataEvents currentPage_;
- private PageWizardDataEvents nextPage_;
- private PageWizardDataEvents nextPeekPage_;
- private PageWizardDataEvents firstPage_;
- private CommandFragment lastUndoFragment_;
- private boolean firstFragment_;
-
- private INamedWidgetContributorFactory widgetFactory_;
- private Stack widgetStack_;
- private Stack widgetStackStack_;
- private Hashtable widgetTable_;
- private WidgetRegistry widgetRegistry_;
- private Hashtable widgetFactoryTable_;
-
- public WizardPageManager( SimpleWidgetRegistry registry,
- WizardPageFactory pageFactory,
- IWizard wizard,
- DataFlowManager dataManager,
- EclipseEnvironment environment )
- {
- super( environment, dataManager );
-
- pageFactory_ = pageFactory;
- pageTable_ = new Hashtable();
- registry_ = registry;
- wizard_ = wizard;
- widgetTable_ = new Hashtable();
- widgetFactoryTable_ = new Hashtable();
- widgetRegistry_ = WidgetRegistry.instance();
- widgetStackStack_ = new Stack();
- }
-
- public IWizardPage getStartingPage()
- {
- if( firstPage_ == null )
- {
- firstPage_ = (PageWizardDataEvents)getNextPage();
- }
-
- return firstPage_;
- }
-
- public IStatus runForwardToNextStop()
- {
- firstFragment_ = true;
- nextPage_ = null;
-
- return super.runForwardToNextStop( getContainer() );
- }
-
- private IWizardContainer getContainer()
- {
- IWizardContainer container = wizard_.getContainer();
-
- if( container == null || container.getCurrentPage() == null )
- {
- container = null;
- }
-
- return container;
- }
-
- public IWizardPage getCurrentPage()
- {
- return currentPage_;
- }
-
- public boolean hasNextPage()
- {
-
- nextPeekPage_ = null;
-
- try
- {
- nextPeekPage_ = getNextPageInGroup( widgetFactory_, widgetStack_, false );
-
- if( nextPeekPage_ == null )
- {
- // If a page is found nextPage_ will be set to its value in the method below.
- engine_.peekForwardToNextStop();
- }
- }
- catch( Throwable exc )
- {
- exc.printStackTrace();
- }
-
- return nextPeekPage_ != null;
- }
-
- public IWizardPage getNextPage()
- {
- try
- {
- // Need to externalize the data for the current page so that
- // when we move forward below the data is available.
- if( currentPage_ != null ) currentPage_.getDataEvents().externalize();
-
- if( environment_.getLog().isEnabled() )
- {
- environment_.getLog().log(ILog.INFO, "ws_dt_cmd_engine", 5010, this, "Cmd stack dump:", engine_ );
- }
-
- nextPage_ = getNextPageInGroup( widgetFactory_, widgetStack_, true );
-
- if( nextPage_ == null )
- {
- widgetFactory_ = null;
- widgetStack_ = null;
-
- IStatus status = runForwardToNextStop();
-
- if( status.getSeverity() == IStatus.ERROR )
- {
- // An error has occured so we need undo to the previous stop point.
- undoToLastPage();
- }
- }
-
- if( nextPage_ != null ) nextPage_.setWizard( wizard_ );
-
- return nextPage_;
- }
- catch( Throwable exc )
- {
- exc.printStackTrace();
- }
-
- return null;
- }
-
- public void handlePageVisible( PageWizardDataEvents page, boolean isPageVisible )
- {
- if( !isPageVisible && page == firstPage_ && page == currentPage_ )
- {
- // We are moving back one page from the first page. This can't happen with popup wizards
- // since the previous button would be greyed out. But when the new wizard launches this wizard
- // the previous button is not greyed out and brings the user back to the list wizards to select.
- // Therefore, we must unwind the command engine and get ready for the user to invoke this wizard
- // again. We are assuming here that the first page is never part of a widget group!
- undoToLastPage();
- currentPage_ = null;
- firstPage_ = null;
- }
- if( currentPage_ != null && page == currentPage_.getPreviousPage() && isPageVisible )
- {
- // We are moving back one page.
- // Note: we don't internalize the previous page and we do not externalize the current page.
- // we are basically just leaving the current page without retrieving its state and
- // moving to the previous page which already has its state set.
-
- if( widgetFactory_ != null )
- {
- if( widgetStack_.size() > 0 )
- {
- widgetStack_.pop();
- }
-
- if( widgetStack_.size() == 0 )
- {
- widgetFactory_ = null;
- widgetStack_ = null;
- widgetStackStack_.pop();
- }
- }
-
- if( widgetFactory_ == null )
- {
- undoToLastPage();
- }
-
- // Since we are moving backwards we need to remove the
- // current page object from the mapping table.
- dataManager_.unprocess( currentPage_.getDataEvents() );
-
- currentPage_ = page;
- }
- else if( isPageVisible )
- {
- try
- {
- // We are moving forward one page.
- WidgetDataEvents dataEvents = page.getDataEvents();
-
- dataManager_.process( dataEvents ); // Push model data into the new page.
- dataEvents.internalize();
-
- page.validatePageToStatus();
- }
- catch( Throwable exc )
- {
- exc.printStackTrace();
- }
- finally
- {
- if( currentPage_ != null ) page.setPreviousPage( currentPage_ );
-
- currentPage_ = page;
- }
- }
- }
-
- public boolean performFinish()
- {
- // We need to simulate the next button being pressed until there are no more pages.
- // If an error occurs we will return false and reset the command stack back our original state.
- boolean doneOk = true;
- PageWizardDataEvents startPage = currentPage_;
- int stackStackSize = widgetStackStack_.size();
-
- INamedWidgetContributorFactory currentFactory = widgetFactory_;
-
- // Externalize the current page.
- currentPage_.getDataEvents().externalize();
-
- // Loop through subsequent pages.
- do
- {
- IStatus status = runForwardToNextStop();
-
- if( status.getSeverity() == IStatus.ERROR )
- {
- // An error occured in one of the commands.
- doneOk = false;
- }
- }
- while( nextPage_ != null && doneOk);
-
- if( !doneOk )
- {
- // An error occured, so we need to return the command stack to it's
- // orginal state.
- PageWizardDataEvents page = null;
- boolean done = false;
-
- do
- {
- done = runUndoToNextStop( getContainer() );
- page = getPage( lastUndoFragment_ );
-
- if( page == null &&
- currentFactory != null &&
- lastUndoFragment_ != null &&
- getWidgetFactory( lastUndoFragment_.getId() ) == currentFactory )
- {
- // The current widget factory is associated with the last fragment that was undone.
- // Therefore, we are back to where we started.
- done = true;
-
- // Restore the widgetStackStack back to the state it was in before
- // running forward.
- widgetStackStack_.setSize( stackStackSize );
-
- StackEntry entry = (StackEntry)widgetStackStack_.peek();
-
- widgetFactory_ = entry.factory_;
- widgetStack_ = entry.stack_;
- }
- else if( page != null )
- {
- widgetFactory_ = null;
- widgetStack_ = null;
- }
- }
- while( page != startPage && !done );
- }
-
- return doneOk;
- }
-
- public boolean performCancel()
- {
- IWizardContainer container = getContainer();
-
- while( !runUndoToNextStop( container ) ){}
-
- return true;
- }
-
- protected boolean peekFragment( CommandFragment fragment )
- {
- // Check to see if this fragment is in our page table.
- nextPeekPage_ = getPage( fragment );
-
- if( nextPeekPage_ == null )
- {
- INamedWidgetContributorFactory factory = getWidgetFactory( fragment.getId() );
-
- if( factory != null )
- {
- nextPeekPage_ = getNextPageInGroup( factory, null, false );
- }
- }
-
- return nextPeekPage_ == null;
- }
-
- protected boolean nextFragment( CommandFragment fragment )
- {
- // If the super class nextFragment want us to stop then we will stop right away.
- if( !super.nextFragment( fragment ) ) return false;
-
- // The first fragment is either at the start of the wizard
- // or it is on a wizard page. In either case we do not want
- // to stop if a page is found.
- if( firstFragment_ )
- {
- firstFragment_ = false;
- }
- else
- {
- widgetFactory_ = getWidgetFactory( fragment.getId() );
-
- if( widgetFactory_ != null )
- {
- widgetStack_ = new Stack();
-
- nextPage_ = getNextPageInGroup( widgetFactory_, widgetStack_, true );
-
- if( nextPage_ == null )
- {
- // We found a widget contributor for this fragment, but no page was delivered for it.
- // We will therefore, not put it on our stack of widget stacks.
- widgetStack_ = null;
- widgetFactory_ = null;
- }
- else
- {
- StackEntry entry = new StackEntry();
-
- entry.factory_ = widgetFactory_;
- entry.stack_ = widgetStack_;
- widgetStackStack_.push( entry );
- }
- }
- else
- {
- nextPage_ = getPage( fragment );
- }
- }
-
- return nextPage_ == null;
- }
-
- protected boolean undoFragment( CommandFragment fragment )
- {
- lastUndoFragment_ = fragment;
-
- return true;
- }
-
-
- private PageWizardDataEvents getNextPageInGroup( INamedWidgetContributorFactory factory, Stack widgetStack, boolean pushNewWidget )
- {
- PageWizardDataEvents page = null;
-
- if( factory != null )
- {
- INamedWidgetContributor newWidget = null;
-
- if( widgetStack == null || widgetStack.size() == 0 )
- {
- newWidget = factory.getFirstNamedWidget();
- }
- else
- {
- INamedWidgetContributor currentWidget = (INamedWidgetContributor)widgetStack.peek();
- newWidget = factory.getNextNamedWidget( currentWidget );
- }
-
- if( newWidget != null )
- {
- page = getPage( newWidget );
-
- if( pushNewWidget )
- {
- widgetStack.push( newWidget );
- }
- }
- }
-
- return page;
- }
-
- private void undoToLastPage()
- {
- boolean stackEmpty = false;
- boolean doneUndoing = false;
-
- while( !doneUndoing )
- {
- stackEmpty = runUndoToNextStop( getContainer() );
-
- IWizardPage page = null;
-
- if( lastUndoFragment_ != null )
- {
- page = getPage( lastUndoFragment_ );
-
- if( page == null )
- {
- // Check to see if a group page fragment was found.
- INamedWidgetContributorFactory factory = getWidgetFactory( lastUndoFragment_.getId() );
-
- if( factory != null && !widgetStackStack_.empty() )
- {
- StackEntry entry = (StackEntry)widgetStackStack_.peek();
-
- if( entry.factory_ == factory )
- {
- // We found the factory for the entry at the top of the stack.
- widgetFactory_ = entry.factory_;
- widgetStack_ = entry.stack_;
-
- if( widgetStack_ != null && !widgetStack_.empty() )
- {
- INamedWidgetContributor currentWidget = (INamedWidgetContributor)widgetStack_.peek();
-
- page = getPage( currentWidget );
- }
- }
- }
- }
- }
-
- doneUndoing = page != null || stackEmpty;
- }
- }
-
- private PageWizardDataEvents getPage( CommandFragment fragment )
- {
- // Check to see if this fragment is in our page table.
- PageWizardDataEvents page = (PageWizardDataEvents)pageTable_.get( fragment );
- String id = fragment.getId();
-
- if( page == null && id != null )
- {
- // Check to see if this fragment id is in the registry.
- PageInfo pageInfo = registry_.getPageInfo( id );
-
- if( pageInfo != null )
- {
- page = pageFactory_.getPage( pageInfo, this );
- pageTable_.put( fragment, page );
- }
- }
-
- return page;
- }
-
- private PageWizardDataEvents getPage( INamedWidgetContributor widget )
- {
- PageWizardDataEvents page = (PageWizardDataEvents)widgetTable_.get( widget );
-
- if( page == null )
- {
- PageInfo pageInfo = new PageInfo(widget.getTitle(), widget.getDescription(), widget.getWidgetContributorFactory() );
-
- page = pageFactory_.getPage( pageInfo, this );
- widgetTable_.put( widget, page );
- }
-
- return page;
- }
-
- private INamedWidgetContributorFactory getWidgetFactory( String id )
- {
- INamedWidgetContributorFactory factory = (INamedWidgetContributorFactory)widgetFactoryTable_.get( id );
-
- if( factory == null )
- {
- // The factory is not in our table so we will try the registry.
- factory = widgetRegistry_.getFactory( id );
-
- if( factory != null )
- {
- widgetFactoryTable_.put( id, factory );
- factory.registerDataMappings( dataManager_.getMappingRegistry() );
- dataManager_.process( factory );
- }
- }
- else
- {
- dataManager_.process( factory );
- }
-
- return factory;
- }
-
- private class StackEntry
- {
- INamedWidgetContributorFactory factory_;
- Stack stack_;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java
deleted file mode 100644
index 0a1748bc8..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060223 129232 pmoogk@ca.ibm.com - Peter Moogk
- * 20060417 136596 joan@ca.ibm.com - Joan Haggarty
- * 20060731 120378 makandre@ca.ibm.com - Andrew Mak, Fields not visible in Large font settings
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets.popup;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimplePopupPageFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WizardPageFactory;
-
-
-/**
- * This class is used to popup dynamic wizards. The popupMenus extension is used
- * the contribute a popup to Eclipse. The class in the action element should reference
- * this DynamicPopupWizard class. This id attribute in the action element should contain
- * an id that references a dynamicWizard extension point. This is how the DynamicPopupWizard
- * class knows which wizard to display.
- *
- * Note: the id attribute in the objectContribution element refers to an
- * actionDialogPreferenceType extension point. The ids in objectContribution
- * element and the action element need not be the same as they are in the
- * example below.
- *
- *<pre>
- * &lt;extension
- * point="org.eclipse.ui.popupMenus"&gt;
- *&lt;!-- IFile *.wsdl popup menu --&gt;
- * &lt;objectContribution
- * objectClass="org.eclipse.core.resources.IFile"
- * nameFilter="*.wsdl"
- * id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *&lt;!-- WSDL To Java Bean Proxy --&gt;
- * &lt;action
- * label="%ACTION_GENERATE_JAVA_PROXY"
- * class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- * menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- * id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- * &lt;/action&gt;
- * &lt;/objectContribution&gt;
- * &lt;/extension&gt;
- *
- * &lt;extension
- * point="org.eclipse.wst.command.env.dynamicWizard"&gt;
- * &lt;dynamicWizard
- * iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
- * class="org.eclipse.jst.ws.consumption.ui.widgets.binding.ClientWidgetBinding"
- * title="%WIZARD_TITLE_WSC"
- * id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- * &lt;/dynamicWizard&gt;
- * &lt;/extension&gt;
- *</pre>
- *
- */
-public class DynamicPopupWizard extends DynamicWizard implements IActionDelegate
-{
- private ISelection selection_;
-
- public DynamicPopupWizard()
- {
- super();
- }
-
- /**
- *
- * @see org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard#getWizardPageFactory()
- */
- protected WizardPageFactory getWizardPageFactory()
- {
- return new SimplePopupPageFactory( getId() );
- }
-
- private String getId()
- {
- return ((IConfigurationElement)originalElement_.getParent()).getAttribute( "id" );
- }
-
- /**
- * @see IActionDelegate#run
- */
- public void run(IAction action)
- {
- PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
- String id = getId();
-
- if( context.showDialog(id) )
- {
- // Launch the wizard.
- init( PlatformUI.getWorkbench(), getSelection() );
-
- WizardDialog dialog= new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), this);
- dialog.create();
-
- if( getStartingPage() != null )
- {
- dialog.open();
- }
- }
- else
- {
- final ProgressMonitorDialog monitor = new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
-
- try
- {
- monitor.run( false, false, new IRunnableWithProgress()
- {
- public void run( IProgressMonitor progressMonitor )
- {
- runHeadLess( getSelection(), monitor );
- }
- } );
- }
- catch( InterruptedException exc )
- {
- }
- catch( InvocationTargetException exc )
- {
- }
- }
- }
-
- /**
- * Runs only the Commands associated with the dynamic wizard.
- *
- * @param selection the initial selection from the user.
- * @param context the context that this execution should take place in. This
- * is usually a progress context so that the user can get feedback
- * on how execution is progressing. The context may be null.
- */
- public void runHeadLess( IStructuredSelection selection, IRunnableContext context )
- {
- PersistentResourceContext resourceContext = PersistentResourceContext.getInstance();
- EclipseStatusHandler handler = new EclipseStatusHandler();
- EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, handler );
-
- DataMappingRegistryImpl dataRegistry_ = new DataMappingRegistryImpl();
- DataFlowManager dataManager = new DataFlowManager( dataRegistry_, environment );
- SimpleCommandEngineManager manager = new SimpleCommandEngineManager(environment, dataManager );
-
- try
- {
- commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" );
- }
- catch( CoreException exc )
- {
- exc.printStackTrace();
- }
-
- commandWidgetBinding_.registerDataMappings( dataRegistry_ );
-
- CommandFragment rootFragment = getRootFragment( selection, null );
-
- manager.setRootFragment( rootFragment );
- manager.runForwardToNextStop( context );
- }
-
- /**
- * @see IActionDelegate#selectionChanged
- */
- public void selectionChanged(IAction action, ISelection selection)
- {
- selection_ = selection;
- }
-
- private IStructuredSelection getSelection()
- {
- IStructuredSelection result = new StructuredSelection();
-
- if( selection_ != null)
- {
- if( selection_ instanceof IStructuredSelection )
- {
- result = (IStructuredSelection)selection_;
- }
- }
- else
- {
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-
- if( window != null )
- {
- ISelection selection = window.getSelectionService().getSelection();
-
- if( selection instanceof IStructuredSelection )
- {
- result = (IStructuredSelection)selection;
- }
- }
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/.classpath b/bundles/org.eclipse.wst.command.env/.classpath
deleted file mode 100644
index dce62b6fa..000000000
--- a/bundles/org.eclipse.wst.command.env/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="ant-src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.command.env/.cvsignore b/bundles/org.eclipse.wst.command.env/.cvsignore
deleted file mode 100644
index 5a9183aeb..000000000
--- a/bundles/org.eclipse.wst.command.env/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-env.jar
-@dot
-src.zip
-envsrc.zip
-javaCompiler.env.jar.args
-javaCompiler.ant-lib_anttasks.jar.args
diff --git a/bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch b/bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch
deleted file mode 100644
index b80ee4175..000000000
--- a/bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.wst.command.env/build-anttasks.xml}"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.wst.command.env"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/ibm-sdk-java5-20060912"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.wst.command.env/build-anttasks.xml"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/bundles/org.eclipse.wst.command.env/.project b/bundles/org.eclipse.wst.command.env/.project
deleted file mode 100644
index 31281d9e6..000000000
--- a/bundles/org.eclipse.wst.command.env/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.command.env</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value>&lt;project&gt;/.externalToolBuilders/build-anttasks.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index de2f205b0..000000000
--- a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 07 23:14:57 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 216c1c113..000000000
--- a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Jan 30 10:37:15 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index d6f09abab..000000000
--- a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jan 31 00:16:54 EST 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 00faa094e..000000000
--- a/bundles/org.eclipse.wst.command.env/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:38 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
deleted file mode 100644
index 8229e99c9..000000000
--- a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ClassPath: env.jar
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env; singleton:=true
-Bundle-Version: 1.0.305.qualifier
-Bundle-Activator: org.eclipse.wst.command.internal.env.plugin.EnvPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.internal.env;x-internal:=true,
- org.eclipse.wst.command.internal.env.ant;x-internal:=true,
- org.eclipse.wst.command.internal.env.commandline;x-internal:=true,
- org.eclipse.wst.command.internal.env.common;x-internal:=true,
- org.eclipse.wst.command.internal.env.context;x-internal:=true,
- org.eclipse.wst.command.internal.env.eclipse;x-internal:=true,
- org.eclipse.wst.command.internal.env.plugin;x-internal:=true,
- org.eclipse.wst.command.internal.env.preferences;x-internal:=true
-Require-Bundle: org.eclipse.wst.command.env.core;bundle-version="[1.0.203,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.200,2.0.0)",
- org.apache.ant;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.ant.core;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.wst.command.env/about.html b/bundles/org.eclipse.wst.command.env/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.wst.command.env/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.command.env/ant-lib/.cvsignore b/bundles/org.eclipse.wst.command.env/ant-lib/.cvsignore
deleted file mode 100644
index 60dbc397b..000000000
--- a/bundles/org.eclipse.wst.command.env/ant-lib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-anttasks.jar
-anttaskssrc.zip
diff --git a/bundles/org.eclipse.wst.command.env/ant-src/ws/ant/task/WebServiceGenerationAntTask.java b/bundles/org.eclipse.wst.command.env/ant-src/ws/ant/task/WebServiceGenerationAntTask.java
deleted file mode 100644
index 12b421551..000000000
--- a/bundles/org.eclipse.wst.command.env/ant-src/ws/ant/task/WebServiceGenerationAntTask.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070522 176943 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package ws.ant.task;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.eclipse.wst.command.internal.env.ant.AntController;
-
-public class WebServiceGenerationAntTask extends Task
-{
- public void execute()
- {
- //get properties set in the Ant file
- Project proj = getProject();
-
- if( proj != null )
- {
- //call the AntController to kick off generation
- AntController controller = new AntController(proj.getProperties());
- String errorMessage = controller.getErrorMessage();
-
- if( errorMessage != null )
- {
- throw new BuildException( errorMessage );
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/ant/axisclient.properties b/bundles/org.eclipse.wst.command.env/ant/axisclient.properties
deleted file mode 100644
index 4896e1ea2..000000000
--- a/bundles/org.eclipse.wst.command.env/ant/axisclient.properties
+++ /dev/null
@@ -1,60 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-###############################################################################
-!--ScenarioType REQUIRED. Differentiates from "service" scenario. See axisservice.properties.
-ScenarioType=client
-
-!--InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java.
-InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl
-
-!--Utility property values - use these to list values for the following properties:
-!-- Client.RuntimeId, Client.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-
-!--Client.RuntimeId - ID of web service runtime
-Client.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
-!--Client.ServerId - ID of target server
-Client.ServerId=org.eclipse.jst.server.tomcat.50
-
-!--ClientProjectName - name of Client project - this property can be used to give the client project a
-!-- different name than the project containing the initial selection
-!--ClientProjectName=clientProjectName
-
-!--ClientEarProjectName- name of Client EAR project - set only if applicable for selected server type
-!--ClientEarProjectName=clientEARProjectName
-
-!--ClientComponentType - type of Client project - the following are valid Axis templates: template.jst.web and template.jst.utility
-!--ClientComponentType=template.jst.web
-
-!-- CustomizeClientMappings - set to true to supply package-namespace mappings type: boolean
-!--CustomizeClientMappings=false
-
-!-- Mappings
-!-- Workspace relative URI to property file containing mappings
-!-- Mappings are used to override the default package names of the generated Java classes.
-!-- Need not be set if CustomizeClientMappings is false
-!-- The content of the properties file must be of the format package = namespace.
-!--Mappings=/testProj/mappings/mappings.txt
-
-!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!-- OverwriteFilesEnabled=true
-
-!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!-- CreateFoldersEnabled=true
-
-!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!-- CheckoutFilesEnabled=true
diff --git a/bundles/org.eclipse.wst.command.env/ant/axisservice.properties b/bundles/org.eclipse.wst.command.env/ant/axisservice.properties
deleted file mode 100644
index 3fa7c9080..000000000
--- a/bundles/org.eclipse.wst.command.env/ant/axisservice.properties
+++ /dev/null
@@ -1,71 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 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
-###############################################################################
-!-- ScenarioType REQUIRED. Differentiates from "client" scenario. See axisclient.properties.
-ScenarioType=service
-
-!-- InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java
-InitialSelection=/dynamicWebProjectName/WebContent/myService.wsdl
-
-!--Utility property values - use these to list valid values for the following properties:
-!-- Service.RuntimeId, Service.ServerId
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!-- Service.RuntimeId - ID of web service runtime
-Service.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
-!-- Service.ServerId - ID of target server
-Service.ServerId=org.eclipse.jst.server.tomcat.50
-!-- Service.TypeId - "Top Down EJB" or "Bottom Up EJB"
-!-- Java Bean is default for both Top Down and Bottom Up
-!-- Service.TypeId=Top Down EJB
-
-!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String
-!--ServiceProjectName=serviceProjectName
-!-- ServiceEarProjectName - !--type:String - name of Service project - this property can be used to give the service EAR project a different name than the project containing the initial selection. type: String
-!--ServiceEarProjectName=serviceEarProjectName
-
-!-- Mappings
-!-- Top down or bottom up scenario. Workspace relative URI to property file containing mappings.
-!-- Top Down: Mappings are used to override the default package names of the generated Java template classes.
-!-- The content of the properties file must be of the format namespace=package
-!-- Bottom Up: Mappings are used to override the default namespace names in the generated WSDL.
-!-- The content of the properties file must be of the format package = namespace
-!--Mappings=/testProj/mappings/mappings.txt
-
-!-- JavaOutput
-!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
-!--JavaOutput=/projectName/JavaSource
-
-!-- Methods
-!-- Bottom up - space delimited string of method signatures (i.e. method1(parmType1) method2(parmType2)) to be exposed in output WSDL. If no list is provided, all methods are exposed.
-!-- Methods=
-
-!-- Style
-!-- Bottom up - String: one of: RPC, DOCUMENT, WRAPPED
-!--Style=DOCUMENT
-
-!-- Use
-!-- Bottom up - String: one of: LITERAL, ENCODED
-!--Use=LITERAL
-
-!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!--OverwriteFilesEnabled=true
-
-!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!--CreateFoldersEnabled=true
-
-!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
-!-- note for non-interactive mode it is recommended that this be set to true
-!--CheckoutFilesEnabled=true
diff --git a/bundles/org.eclipse.wst.command.env/ant/wsant.bat b/bundles/org.eclipse.wst.command.env/ant/wsant.bat
deleted file mode 100644
index e9a42699b..000000000
--- a/bundles/org.eclipse.wst.command.env/ant/wsant.bat
+++ /dev/null
@@ -1,49 +0,0 @@
-rem *******************************************************************************
-rem Copyright (c) 2005, 2007 IBM Corporation and others.
-rem All rights reserved. This program and the accompanying materials
-rem are made available under the terms of the Eclipse Public License v1.0
-rem which accompanies this distribution, and is available at
-rem http://www.eclipse.org/legal/epl-v10.html
-rem
-rem Contributors:
-rem IBM Corporation - initial API and implementation
-rem *******************************************************************************
-echo off
-setlocal
-
-REM *********** Local envars ***************************
-
-REM The JRE java.exe to be used by Ant. Note: for WTP 2.0 the JDK needs to be 1.5 or higher.
-set JAVAEXE="C:\jdk1.5.0\jre\bin\java.exe"
-
-REM The Eclipse install directory. Some Eclipse based products may refer to this directory
-REM as the non shared directory.
-set INSTALL_DIRECTORY=d:\productdirectory\eclipse
-
-REM The shared Eclipse features directory. Some Eclipse based products may split their
-REM directory structure into shared and non shared folders. The variable below should be
-REM set to the shared directory. Note: a default WTP installation does not split it's
-REM directory structure so the INSTALL_DIRECTORY and the SHARED_DIRECTORY should be the same.
-set SHARED_DIRECTORY=%INSTALL_DIRECTORY%
-
-REM The Eclipse Equinox Launcher jar. Usually this plugin jar file is located in the
-REM shared plugin directory(ie. plugins\org.eclipse.equinox.launcher*.jar )
-set LAUNCHER_JAR="%SHARED_DIRECTORY%\plugins\org.eclipse.equinox.launcher_1.0.0.v20070606.jar"
-
-REM The location of your workspace
-set WORKSPACE=C:\workspace
-
-REM ****************************************************
-
-if not exist %JAVAEXE% echo ERROR: incorrect java.exe=%JAVAEXE%, edit this file and correct the JAVAEXE envar
-if not exist %JAVAEXE% goto done
-
-if not exist %LAUNCHER_JAR% echo ERROR: incorrect launcher jar=%LAUNCHER_JAR%, edit this file and correct the LAUNCHER_JAR envar
-if not exist %LAUNCHER_JAR% goto done
-
-:run
-@echo on
-%JAVAEXE% -jar %LAUNCHER_JAR% -install %INSTALL_DIRECTORY% -configuration %INSTALL_DIRECTORY%\configuration -application org.eclipse.ant.core.antRunner -data %WORKSPACE% -file wsgen.xml %* >wsgen.txt 2>&1
-
-:done
-pause
diff --git a/bundles/org.eclipse.wst.command.env/ant/wsant.sh b/bundles/org.eclipse.wst.command.env/ant/wsant.sh
deleted file mode 100644
index 82c9fe5fe..000000000
--- a/bundles/org.eclipse.wst.command.env/ant/wsant.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2005, 2007 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
-#*******************************************************************************
-#!/bin/sh
-set +v
-
-#Script to run WebService Ant tasks in headless Eclipse mode
-
-echo "Setting environment variables"
-
-# The JRE java.exe to be used by Ant. Note: for WTP 2.0 the JDK needs to be 1.5 or higher.
-JAVAEXE=/home/tester/jdk1.5.0/jre/bin/java
-
-
-# The Eclipse install directory. Some Eclipse based products may refer to this directory
-# as the non shared directory.
-INSTALL_DIRECTORY=/productdirectory/eclipse
-
-# The shared Eclipse features directory. Some Eclipse based products may split their
-# directory structure into shared and non shared folders. The variable below should be
-# set to the shared directory. Note: a default WTP installation does not split it's
-# directory structure so the INSTALL_DIRECTORY and the SHARED_DIRECTORY should be the same.
-SHARED_DIRECTORY=$INSTALL_DIRECTORY
-
-# The Eclipse Equinox Launcher jar. Usually this plugin jar file is located in the
-# shared plugin directory(ie. plugins/org.eclipse.equinox.launcher*.jar )
-LAUNCHER_JAR=$SHARED_DIRECTORY/plugins/org.eclipse.equinox.launcher_1.0.0.v20070606.jar
-
-
-# The location of your workspace
-WORKSPACE=/home/tester/workspace
-
-run() {
- set -v
- $JAVAEXE -jar $LAUNCHER_JAR -install $INSTALL_DIRECTORY -configuration $INSTALL_DIRECTORY/configuration -application org.eclipse.ant.core.antRunner -data $WORKSPACE -file wsgen.xml $ls > wsgen.txt 2>&1
-}
-
-if [ ! -e $JAVAEXE ]; then
- echo "ERROR: incorrect java.exe=$JAVAEXE, edit the script and correct the JAVAEXE environment variable";
- exit 1;
-fi
-
-if [ ! -e $LAUNCHER_JAR ]; then
-echo "ERROR: incorrect launcher=$LAUNCHER_JAR, edit the script and correct the LAUNCHER_JAR environment variable";
-exit 1;
-fi
-
-run
-exit 0
diff --git a/bundles/org.eclipse.wst.command.env/ant/wsgen.xml b/bundles/org.eclipse.wst.command.env/ant/wsgen.xml
deleted file mode 100644
index 947a6c7b3..000000000
--- a/bundles/org.eclipse.wst.command.env/ant/wsgen.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="axisservice.properties"/>
-
-<echo message="calling the web services generation ant task: wsgen"/>
- <target name="main" >
- <wsgen/>
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.wst.command.env/build-anttasks.xml b/bundles/org.eclipse.wst.command.env/build-anttasks.xml
deleted file mode 100644
index 5e1ed8850..000000000
--- a/bundles/org.eclipse.wst.command.env/build-anttasks.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Build Ant Environment support JAR" default="build" basedir=".">
-
- <target name="build" description="Cleans, builds and refreshes" depends="clean, ant-lib/anttasks.jar"/>
-
- <target name="init" depends="properties">
- <property name="version.suffix" value="_3.1.0"/>
- <property name="new.version.suffix" value="_3.2.0"/>
- <property name="bootclasspath" value=""/>
- <property name="temp.folder" value="${basedir}/temp.folder"/>
- <property name="build.result.folder" value="${basedir}"/>
- <property name="win32.jar" value="${eclipse.home}/plugins/org.eclipse.swt.win32.win32.x86${version.suffix}.jar"/>
- <property name="gtk.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.linux.x86${version.suffix}.jar"/>
- <property name="motif.jar" value="${eclipse.home}/plugins/org.eclipse.swt.motif${version.suffix}.jar"/>
- <property name="osx.jar" value="${eclipse.home}/plugins/org.eclipse.swt.carbon.macosx.ppc${version.suffix}.jar"/>
- <available file="${win32.jar}" property="swt.jar" value="${win32.jar}"/>
- <available file="${gtk.jar}" property="swt.jar" value="${gtk.jar}"/>
- <available file="${motif.jar}" property="swt.jar" value="${motif.jar}"/>
- <available file="${osx.jar}" property="swt.jar" value="${osx.jar}"/>
- </target>
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
- </target>
-
- <target name="ant-lib/anttasks.jar" description= "Creates the antrunner.jar" depends="init">
- <property name="destdir" value="${temp.folder}/ant-lib/anttasks.jar"/>
- <delete dir="${destdir}"/>
- <mkdir dir="${destdir}"/>
- <javac destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeJavaRuntime= "yes"
- bootclasspath="${bootclasspath}"
- classpath="${basedir}/bin">
- <src path="ant-src/"/>
- </javac>
- <copy todir="${destdir}">
- <fileset dir="ant-src/" excludes="**/*.java"/>
- </copy>
- <mkdir dir="${build.result.folder}/ant-lib"/>
- <jar destfile="${build.result.folder}/ant-lib/anttasks.jar" basedir="${destdir}"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="clean" description="Deletes previous build remnants" depends="init">
- <delete file="${build.result.folder}/ant-lib/anttasks.jar"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="refresh">
- <eclipse.LocalRefresh resource="org.eclipse.wst.command.env" depth="infinite"/>
- </target>
-
- </project>
diff --git a/bundles/org.eclipse.wst.command.env/build.properties b/bundles/org.eclipse.wst.command.env/build.properties
deleted file mode 100644
index 915706aa5..000000000
--- a/bundles/org.eclipse.wst.command.env/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-bin.includes = plugin.xml,\
- plugin.properties,\
- env.jar,\
- META-INF/,\
- about.html,\
- ant/,\
- ant-lib/anttasks.jar
-source.env.jar = src/
-output.env.jar = bin/
-jars.compile.order = env.jar,\
- ant-lib/anttasks.jar
-source.ant-lib/anttasks.jar = ant-src/
-output.ant-lib/anttasks.jar = bin/
-root.permissions.777 = ant/
diff --git a/bundles/org.eclipse.wst.command.env/plugin.properties b/bundles/org.eclipse.wst.command.env/plugin.properties
deleted file mode 100644
index 2c7d3ccbd..000000000
--- a/bundles/org.eclipse.wst.command.env/plugin.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Environment Command Framework (headless)
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_XP_DYNAMIC_WIZARD=Dynamic Wizard
-PLUGIN_XP_POPUP_DIALOGS=Optional Pop-up Action Dialogs Types
-
-XP_antDataMapping=Ant Environment property mappings
-XP_antScenario=Ant Environment scenarios
diff --git a/bundles/org.eclipse.wst.command.env/plugin.xml b/bundles/org.eclipse.wst.command.env/plugin.xml
deleted file mode 100644
index 39622169c..000000000
--- a/bundles/org.eclipse.wst.command.env/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- The following extension point is internal and likely to change. -->
- <extension-point
- id="dynamicWizard"
- name="%PLUGIN_XP_DYNAMIC_WIZARD"/>
-
- <!-- The following extension point is internal and likely to change. -->
- <extension-point
- id="actionDialogPreferenceType"
- name="%PLUGIN_XP_POPUP_DIALOGS"/>
-
- <extension-point id="antDataMapping" name="%XP_antDataMapping" schema="schema/antdatamapping.exsd"/>
- <extension-point id="antScenario" name="%XP_antScenario" schema="schema/antScenario.exsd"/>
-
- <extension
- id="wsgen"
- name="wsgen"
- point="org.eclipse.ant.core.antTasks">
- <antTask
- class="ws.ant.task.WebServiceGenerationAntTask"
- eclipseRuntime="true"
- headless="true"
- library="ant-lib/anttasks.jar"
- name="wsgen"/>
- </extension>
- <extension
- point="org.eclipse.ant.core.extraClasspathEntries">
- <extraClasspathEntry library="ant-lib/anttasks.jar"/>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.command.env/schema/antScenario.exsd b/bundles/org.eclipse.wst.command.env/schema/antScenario.exsd
deleted file mode 100644
index caaff5289..000000000
--- a/bundles/org.eclipse.wst.command.env/schema/antScenario.exsd
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.command.env">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.command.env" id="antScenario" name="Ant Environment Scenarios"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="antScenario"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="antScenario">
- <complexType>
- <attribute name="scenarioType" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.command.env/schema/antdatamapping.exsd b/bundles/org.eclipse.wst.command.env/schema/antdatamapping.exsd
deleted file mode 100644
index d1e7393ff..000000000
--- a/bundles/org.eclipse.wst.command.env/schema/antdatamapping.exsd
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.command.env">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.command.env" id="antDataMapping" name="Ant Environment Property Mappings"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="map" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="map">
- <complexType>
- <attribute name="key" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="operation" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="property" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="transform" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="required" type="boolean" use="optional" default="false">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
-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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties
deleted file mode 100644
index e363e4fee..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070418 177005 pmoogk@ca.ibm.com - Peter Moogk
-# 20080326 171705 trungha@ca.ibm.com - Trung
-# 20080326 149060 pmoogk@ca.ibm.com - Peter Moogk
-# 20080325 223912 ericdp@ca.ibm.com - Eric D. Peters, Adding PII/MRI to partially address 171705
-# 20080328 224563 ericdp@ca.ibm.com - Eric D. Peters, Text incorrect generating web services & clients
-###############################################################################
-
-#
-# Messages for ResouceUtils
-#
-MSG_ERROR_PATH_NOT_ABSOLUTE=IWAB0003E Path {0} is not absolute for creating a file.
-MSG_ERROR_PATH_EMPTY=IWAB0004E Path {0} is empty while creating a file.
-MSG_ERROR_PATH_NOT_FOLDER=IWAB0005E Path {0} is not a folder for creating a file.
-MSG_ERROR_FOLDER_CREATION_DISABLED=IWAB0007E Folder creation has been disabled for parent folder {0}. Do you want to create folder {1}?
-MSG_ERROR_RESOURCE_NOT_FOLDER=IWAB0008E Resource {0} is not a folder.
-MSG_WARN_FILE_OVERWRITE_DISABLED=IWAB0009W Cannot overwrite file {1} in folder {0}.
-MSG_ERROR_FILE_CHECKOUT_DISABLED=IWAB0010E Cannot checkout file {1} in folder {0}.
-MSG_ERROR_RESOURCE_NOT_FILE=IWAB0011E The following path is not a resource: {0}.
-MSG_ERROR_FOLDER_HAS_CHILDREN=IWAB0012E Cannot create folder: {0} that already has children.
-MSG_ERROR_IO=IWAB0006E An input/output error occurred while processing the resource "{0}".
-MSG_ERROR_FILE_OVERWRITE_DISABLED=IWAB0164E Cannot create the file "{1}" relative to the path "{0}" because automatic file overwriting has not been enabled. Do you want to enable it for this file?
-MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occurred.
-MSG_ERROR_ANT_DATA_TRANSFORM=Exception transforming Ant property key {0} using transformation {1}.
-MSG_ERROR_ANT_CALL_SETTER=Exception invoking setter method {0} for Ant property.
-MSG_ERROR_ANT_CMD_FRAGMENT=Exception retrieving Ant command fragment from registry.
-MSG_ERROR_ANT_SCENARIO_TYPE=Cannot determine scenario type. Please ensure ScenarioType Ant property is set.
-MSG_ERROR_ANT_REQUIRED_PROPERTY=Required property {0} was not set in the Ant property file.
-MSG_ERROR_ANT_PROPERTY_WITH_INVALID_VALUE=Property {0} was set with an invalid value: {1}.
-MSG_INFO_ANT__PROPERTY_DEFAULT=Property {0} was not set in the Ant property file. A default value will be used.
-MSG_ERROR_ANT_WORKSPACE_LOCKED="Cannot perform the Web services generation ant task. The associated workspace is currently in use by another Eclipse application."
-
-LABEL_YES=Yes
-LABEL_YES_TO_ALL=Yes to All
-LABEL_CANCEL=Cancel
-
-
-
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/EnvironmentMessages.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/EnvironmentMessages.java
deleted file mode 100644
index 1e71db92c..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/EnvironmentMessages.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080326 171705 trungha@ca.ibm.com - Trung
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EnvironmentMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.wst.command.internal.env.Environment";//$NON-NLS-1$
-
- private EnvironmentMessages() {
- // Do not instantiate
- }
-
- public static String MSG_ERROR_PATH_NOT_ABSOLUTE;
- public static String MSG_ERROR_PATH_EMPTY;
- public static String MSG_ERROR_PATH_NOT_FOLDER;
- public static String MSG_ERROR_FOLDER_CREATION_DISABLED;
- public static String MSG_ERROR_RESOURCE_NOT_FOLDER;
- public static String MSG_WARN_FILE_OVERWRITE_DISABLED;
- public static String MSG_ERROR_FILE_CHECKOUT_DISABLED;
- public static String MSG_ERROR_RESOURCE_NOT_FILE;
- public static String MSG_ERROR_FOLDER_HAS_CHILDREN;
- public static String MSG_ERROR_IO;
- public static String MSG_ERROR_FILE_OVERWRITE_DISABLED;
- public static String MSG_ERROR_UNEXPECTED_ERROR;
- public static String MSG_ERROR_ANT_DATA_TRANSFORM;
- public static String MSG_ERROR_ANT_CALL_SETTER;
- public static String MSG_ERROR_ANT_CMD_FRAGMENT;
- public static String MSG_ERROR_ANT_SCENARIO_TYPE;
- public static String MSG_ERROR_ANT_REQUIRED_PROPERTY;
- public static String MSG_ERROR_ANT_PROPERTY_WITH_INVALID_VALUE;
- public static String MSG_INFO_ANT__PROPERTY_DEFAULT;
- public static String LABEL_YES;
- public static String LABEL_YES_TO_ALL;
- public static String LABEL_CANCEL;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EnvironmentMessages.class);
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntController.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntController.java
deleted file mode 100644
index a6d24a2e9..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntController.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060726 151614 pmoogk@ca.ibm.com - Peter Moogk
- * 20061011 159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
- * 20070522 176943 pmoogk@ca.ibm.com - Peter Moogk
- * 20070730 197144 pmoogk@ca.ibm.com - Peter Moogk, Pass progress monitor to undo commands.
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ant;
-
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.EnvironmentMessages;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.FragmentListener;
-import org.eclipse.wst.command.internal.env.eclipse.BaseStatusHandler;
-
-/**
- *
- * Central point of control for web service Ant tasks.
- * Constructs Ant environment, root fragment and command manager. Starts execution of the command stack.
- *
- * @author joan
- *
- */
-
-public class AntController
-{
- private AntOperationManager operationManager_;
- private String errorMessage_ = null;
- private AntEnvironment environment_;
-
- public AntController(Hashtable properties)
- {
- // construct the environment - passing in the property table
- // --maintains link to property table plus any other environment properties
- // --code to access extension point mappings for operations to retrieve data from property table
- TransientResourceContext resourceContext = (TransientResourceContext)PersistentResourceContext.getInstance().copy();
- AntStatusHandler handler = new AntStatusHandler();
-
- environment_ = new AntEnvironment(this, resourceContext, handler, properties);
-
- // construct data manager for maintaining state across operations
- DataFlowManager dataManager = new DataFlowManager( new DataMappingRegistryImpl(), environment_ );
-
- // set up operation fragments - conditional on options by user... service or client
- // also need to initialize the "selection" or input file (WSDL, Java) here
-
- CommandFragment rootFragment = environment_.getRootCommandFragment();
-
- if (rootFragment != null)
- {
- //construct the engine - manages execution of operations
- createOperationManager( rootFragment, dataManager, environment_ );
-
- DataMappingRegistryImpl dataRegistry_ = new DataMappingRegistryImpl();
- rootFragment.registerDataMappings(dataRegistry_);
- }
- else //problem getting the root fragment - scenario type is likely missing
- {
- errorMessage_ = EnvironmentMessages.MSG_ERROR_ANT_SCENARIO_TYPE;
- handler.reportError(new Status(IStatus.ERROR, "ws_ant", 9999, errorMessage_, null));
- return;
- }
-
- //ready to start running operations
- IProgressMonitor nullMonitor = new NullProgressMonitor();
-
- operationManager_.moveForwardToNextStop( nullMonitor );
-
- IStatus lastStatus = operationManager_.getLastStatus();
-
- if ( !lastStatus.isOK() )
- {
- errorMessage_ = lastStatus.getMessage();
- operationManager_.undoToLastStop( nullMonitor );
- }
- }
-
- public String getErrorMessage()
- {
- return errorMessage_;
- }
-
- private void createOperationManager(CommandFragment frag, DataFlowManager mgr, AntEnvironment env)
- {
- operationManager_ = new AntOperationManager(frag, mgr, env);
-
- operationManager_.setPeekFragmentListener(
- new FragmentListener()
- {
- public boolean notify( CommandFragment fragment )
- {
- return peekFragment( fragment );
- }
- } );
-
- operationManager_.setNextFragmentListener(
- new FragmentListener()
- {
- public boolean notify( CommandFragment fragment )
- {
- return nextFragment( fragment );
- }
- } );
-
- operationManager_.setUndoFragmentListener(
- new FragmentListener()
- {
- public boolean notify( CommandFragment fragment )
- {
- return undoFragment( fragment );
- }
- } );
-
- operationManager_.setAfterExecuteFragmentListener(
- new FragmentListener()
- {
- public boolean notify( CommandFragment fragment )
- {
- return afterExecuteNextFragment( fragment );
- }
- } );
- }
-
- protected CommandManager getOperationManager()
- {
- return operationManager_;
- }
-
- /**
- * The CommandFragmentEngine calls this method when it is peeking forward
- * in the fragments. When peeking forward the command stack state in the
- * engine is not changes.
- *
- *
- * @param fragment the fragment that it is peeking at.
- * @return Indicates whether peeking should stop or not.
- */
- protected boolean peekFragment( CommandFragment fragment )
- {
- return true;
- }
-
- /**
- * The CommandFragmentEngine calls this method when it is moving forward
- * in the fragments. When moving forward the command stack state is saved
- * at each fragment is traversed.
- *
- * @param fragment the fragment that is being traversed.
- * @return indicates if the forward traversal should continue.
- */
- protected boolean nextFragment( CommandFragment fragment )
- {
- return true;
- }
-
- /**
- * This method is called for each fragment when the command engine is unwinding
- * its stack during an undo operation.
- *
- * @param fragment the fragment being undone.
- * @return returns true if the undo process should continue.
- */
- protected boolean undoFragment( CommandFragment fragment )
- {
- return true;
- }
-
- protected boolean afterExecuteNextFragment( CommandFragment fragment )
- {
- boolean continueExecute = true;
- BaseStatusHandler statusHandler = (BaseStatusHandler)environment_.getStatusHandler();
- IStatus commandStatus = operationManager_.getLastStatus();
- IStatus handlerStatus = statusHandler.getStatus();
-
- if( commandStatus.getSeverity() == IStatus.ERROR &&
- handlerStatus.getSeverity() != IStatus.ERROR )
- {
- // The command returned an error status for the engine to stop,
- // but the status handler did not have report and error.
- // Therefore, we will report this status returned by the command
- // if there is a message to display.
- String errorMessage = commandStatus.getMessage();
-
- if( errorMessage != null && errorMessage.length() > 0 )
- {
- statusHandler.reportError( commandStatus );
- }
- }
- else if( commandStatus.getSeverity() != IStatus.ERROR &&
- handlerStatus.getSeverity() == IStatus.ERROR )
- {
- // The last command didn't return an error, but the status handler
- // did report and error. Therefore, we should stop.
- errorMessage_ = handlerStatus.getMessage();
- continueExecute = false;
- }
-
- return continueExecute;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntEnvironment.java
deleted file mode 100644
index ab125ea55..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntEnvironment.java
+++ /dev/null
@@ -1,588 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060523 133714 joan@ca.ibm.com - Joan Haggarty
- * 20060726 151614 pmoogk@ca.ibm.com - Peter Moogk
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ant;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.EnvironmentMessages;
-import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.BeanModifier;
-import org.eclipse.wst.command.internal.env.core.data.ClassEntry;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.eclipse.IEclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- *
- * Access to status handler, log, resource context and command manager.
- * Initializes data for commands from Ant property files based on antDataMapping extensions.
- *
- * @author joan
- *
- */
-
-public class AntEnvironment extends EclipseEnvironment{
-
- private Hashtable antProperties_;
- private Hashtable operationDataRecord_ = new Hashtable();
- private boolean mappingComplete_;
- private ClassEntry classEntry;
-
- // extensionPoint names and namespace
- private static String MAPPER_EXT_PT = "antDataMapping"; //$NON-NLS-1$
- private static String SCENARIO_EXT_PT = "antScenario"; //$NON-NLS-1$
- private static String EXT_PT_NAMESPACE = "org.eclipse.wst.command.env"; ////$NON-NLS-1$
-
- // antDataMapping extension point attributes
- private static final String MAPPER_OPERATION_ATTRIBUTE= "operation"; //$NON-NLS-1$
- private static final String MAPPER_KEY_ATTRIBUTE= "key"; //$NON-NLS-1$
- private static final String MAPPER_PROPERTY_ATTRIBUTE= "property"; //$NON-NLS-1$
- private static final String MAPPER_TRANSFORM_ATTRIBUTE= "transform"; //$NON-NLS-1$
- private static final String MAPPER_REQUIRED_ATTRIBUTE= "required"; //$NON-NLS-1$
-
- // antScenario extension point attributes
- private static final String SCENARIO_TYPE_ATTRIBUTE = "scenarioType"; //$NON-NLS-1$
- private static final String SCENARIO_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
-
- // Ant property IDs
- private static final String VERBOSE_PROPERTY = "Verbose"; //$NON-NLS-1$
- private static final String OVERWRITE_PROPERTY = "OverwriteFilesEnabled"; //$NON-NLS-1$
- private static final String CREATEFOLDER_PROPERTY = "CreateFoldersEnabled"; //$NON-NLS-1$
- private static final String CHECKOUT_PROPERTY = "CheckoutFilesEnabled"; //$NON-NLS-1$
- private static final String SCENARIO_TYPE_PROPERTY = "ScenarioType"; //$NON-NLS-1$
-
- private AntController controller_;
-
- public AntEnvironment(AntController controller, TransientResourceContext context, IEclipseStatusHandler handler, Hashtable properties)
- {
- super(controller.getOperationManager(), context, handler);
- antProperties_ = properties;
- controller_ = controller;
- setContext( context );
- }
-
- private void setContext(TransientResourceContext context)
- {
- Boolean overwriteSet = getBooleanProperty( OVERWRITE_PROPERTY );
- Boolean createfolderSet = getBooleanProperty( CREATEFOLDER_PROPERTY );
- Boolean checkoutSet = getBooleanProperty( CHECKOUT_PROPERTY );
-
- if( overwriteSet != null ) context.setOverwriteFilesEnabled( overwriteSet.booleanValue() );
- if( createfolderSet != null ) context.setCreateFoldersEnabled( createfolderSet.booleanValue() );
- if( checkoutSet != null ) context.setCheckoutFilesEnabled( checkoutSet.booleanValue() );
- }
-
- public boolean verbose()
- {
- Boolean result = getBooleanProperty( VERBOSE_PROPERTY );
-
- return result == null ? false : result.booleanValue();
- }
-
- public Boolean getBooleanProperty( String property )
- {
- String value = getProperty( property );
- Boolean result = null;
-
- if( value != null )
- {
- value = value.toLowerCase();
- result = new Boolean( value.equals( "true") );
- }
-
- return result;
- }
-
- // returns String since the property table built by Ant is property value pairs where the value is a String
- private String getProperty(String key)
- {
- Object property = antProperties_.get(key);
- if (property != null && (!property.toString().equals("")))
- return property.toString().trim();
- return null;
- }
-
- // call from engine prior to executing the operation
- public IStatus initOperationData(AbstractDataModelOperation op)
- {
- //check to see if data has already been primed for this operation
- String qualifiedClassName = op.getClass().getName();
- if (operationDataRecord_.get(qualifiedClassName) == null)
- {
- classEntry = new ClassEntry();
-
- try {
- //extension lookup for the bean - may be more than one property for it
- Enumeration operationData = getMappingExtensions(op);
- classEntry.setterList_= getSetterList(op);
- while (operationData.hasMoreElements())
- {
- PropertyDataHolder mapping = (PropertyDataHolder)operationData.nextElement();
-
- mappingComplete_ = false;
- String property = mapping.property_;
- String setterMethodName = createSetterName(property);
-
- int step = 1;
- while (!mappingComplete_)
- {
- switch (step) {
- case 1:
- mappingComplete_ = transformAndSet(mapping, setterMethodName);
- break;
- case 2:
- mappingComplete_ = callSetter(mapping.operation_, mapping.value_, setterMethodName);
- break;
-
- case 3:
- mappingComplete_ = callPrimitiveSetter(mapping);
- break;
-
- case 4:
- mappingComplete_ = callSetterConstructor(mapping);
- break;
-
- default:
- mappingComplete_ = true;
- break;
- }
- step++;
- }
- }
- //add operation to the record - no need to initialize again...
- operationDataRecord_.put(qualifiedClassName, "");
- }
- catch (Exception e)
- {
- throw new IllegalArgumentException(e.getMessage());
- }
-
- }
- return Status.OK_STATUS;
- }
-
- /**
- * Creates setter name based on the property passed in. If the
- * property has any leading qualifiers they are stripped off.
- * The property is capitalized and set is prepended.
- * @param property The name of the property that requires a setter.
- * @return
- */
- private String createSetterName(String property)
- {
- while (property.indexOf(".")>=0)
- {
- property=property.substring(property.indexOf(".")+1);
- }
- String firstChar = property.substring(0,1);
- firstChar = firstChar.toUpperCase();
- property = firstChar + property.substring(1);
- String setterName = "set" + property;
- return setterName;
- }
-
- /**
- * Retrieves extensions for the org.eclipse.wst.command.env antDataMapping
- * extension point. Extracts those that with class attribute values that match operationName.
- * All mappings are converted to PropertyDataHolder objects.
- * Any m:1 Ant key to property mappings are collected into a key-value map within
- * a single PropertyDataHolder.
- * @param operationName The name of the operation that is being initialized.
- * @return A collection of PropertyDataHolder objects. Returns null if there are no extensions matching the operationName.
- */
- private Enumeration getMappingExtensions(AbstractDataModelOperation operation) throws CoreException
- {
- String operationName = operation.getClass().getName();
- //go to ext registry and get all antMapping extensions
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IExtensionPoint extPt = reg.getExtensionPoint(EXT_PT_NAMESPACE, MAPPER_EXT_PT);
- Hashtable dataTable = new Hashtable(25);
-
- IConfigurationElement[] elements = extPt.getConfigurationElements();
-
- for (int i = 0; i < elements.length; i++) {
-
- IConfigurationElement ce = elements[i];
- Object obj = ce.getAttribute(MAPPER_OPERATION_ATTRIBUTE);
- // look for mappings for this operation
- if (obj.equals(operationName))
- {
- String key = ce.getAttribute(MAPPER_KEY_ATTRIBUTE);
- String value = getProperty(key);
-
- //check to see if the property for this extension is already in the data table
- // if so, there is a m:1 mapping
- if (value != null) //only do a mapping if there is an Ant property value passed in...
- {
-
- String property = ce.getAttribute(MAPPER_PROPERTY_ATTRIBUTE);
- Object transform = null;
- try
- {
- //check to make sure there is an transform attribute provided
- // if so, get the class to do the transformation
- if (ce.getAttribute(MAPPER_TRANSFORM_ATTRIBUTE)!= null)
- transform = ce.createExecutableExtension(MAPPER_TRANSFORM_ATTRIBUTE);
- }
- catch (CoreException cex) {
- Status errorStatus = new Status(Status.ERROR, "ws_ant", 5092, cex.getMessage(), cex);
- getStatusHandler().reportError(errorStatus);
- getLog().log(ILog.ERROR, "ws_ant", 5092, this, "getMappingExtensions", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_DATA_TRANSFORM, key, transform));
- throw new CoreException(errorStatus);
- }
-
- if (transform != null && transform instanceof BeanModifier/*dataTable.containsKey(property)*/)
- {
- //get the PropertyDataHolder from the table
- PropertyDataHolder holder = (PropertyDataHolder)dataTable.get(property);
- if (holder == null)
- {
- holder = new PropertyDataHolder();
- holder.key_ = "";
- holder.value_ = "";
- holder.transform_ = transform;
- holder.operation_ = operation;
- holder.property_ = property;
- holder.map_ = new HashMap();
- holder.map_.put(key, value);
- dataTable.put(property, holder);
- }
- else
- {
- holder.map_.put(key, value);
- }
- }
- else //plain property mapping not a bean
- {
- PropertyDataHolder holder = new PropertyDataHolder();
- holder.operation_ = operation;
- holder.key_ = key;
- holder.property_ = property;
- holder.transform_ = transform;
- holder.value_ = value;
- dataTable.put(property, holder);
- }
- }
- else if(ce.getAttribute(MAPPER_REQUIRED_ATTRIBUTE)!=null && ce.getAttribute(MAPPER_REQUIRED_ATTRIBUTE).equals("true"))
- {
- String msg = EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_REQUIRED_PROPERTY, key.toString());
- Status statusObj = new Status(IStatus.ERROR,
- EnvPlugin.ID,
- IStatus.ERROR,
- msg,
- null);
- getStatusHandler().reportError(statusObj);
- getLog().log(ILog.ERROR, "ws_ant", 9999, this, "getMappingExtensions", msg);
- }
- else if (verbose())
- {
- String msg = EnvironmentMessages.bind(EnvironmentMessages.MSG_INFO_ANT__PROPERTY_DEFAULT, key.toString());
- Status statusObj = new Status(IStatus.INFO,
- EnvPlugin.ID,
- IStatus.INFO,
- msg,
- null);
- getStatusHandler().reportInfo(statusObj);
- getLog().log(ILog.INFO, "ws_ant", 9999, this, "getMappingExtensions", msg);
- }
- }
- }
- return dataTable.elements();
- }
-
- private boolean transformAndSet(PropertyDataHolder mapping, String setterMethodName)
- {
- Object transform = mapping.transform_;
- if (transform != null)
- {
- // get transform class & create setter parameters
- try
- {
- //Object classObject = Class.forName(transform).newInstance();
- Object param = new Object();
- if (transform instanceof Transformer)
- {
- Transformer transformer = (Transformer)transform;
- // transform the property value
- param = transformer.transform(mapping.value_);
- }
- else if (mapping.map_ != null && transform instanceof BeanModifier)
- {
- BeanModifier modifier = (BeanModifier)transform;
- Method getter = getGetterMethod(mapping);
- param = getter.invoke(mapping.operation_, new Object[]{});
- modifier.modify(param, mapping.map_);
- }
- return callSetter(mapping.operation_, param, setterMethodName);
-
- }
- catch (Exception exc)
- {
- getStatusHandler().reportError(new Status(Status.ERROR, "ws_ant", 5093, exc.getMessage(), exc));
- getLog().log(ILog.ERROR, "ws_ant", 5093, this, "transformAndSet", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_DATA_TRANSFORM, mapping.key_, mapping.transform_));
- throw new IllegalArgumentException(exc.getMessage());
- }
- }
- return false;
- }
-
- private Vector getSetterList(Object op)
- {
- Vector result = new Vector();
- Method[] methods = op.getClass().getMethods();
- for( int index = 0; index < methods.length; index++ )
- {
- Method method = methods[index];
- boolean isPublic = Modifier.isPublic( method.getModifiers() );
- Class returnType = method.getReturnType();
-
- if( isPublic &&
- returnType == Void.TYPE &&
- method.getParameterTypes().length == 1 &&
- method.getName().startsWith( "set" ))
- {
- method.setAccessible( true );
- result.add( method );
- }
- }
-
- return result;
- }
-
- private Method getGetterMethod(PropertyDataHolder mapping)
- {
- Method getterFound = null;
-
- if (classEntry.getterList_ == null)
- {
- classEntry.getterList_ = getGetterList(mapping.operation_);
- }
-
- for( int index = 0; index < classEntry.getterList_.size(); index++ )
- {
- Method getter = (Method)classEntry.getterList_.elementAt( index );
-
- if( getter.getName().equals( "get" + mapping.property_ ))
- {
- getterFound = getter;
- break;
- }
- }
- return getterFound;
- }
-
- private Vector getGetterList( Object object )
- {
- Vector result = new Vector();
- Method[] methods = object.getClass().getMethods();
-
- for( int index = 0; index < methods.length; index++ )
- {
- Method method = methods[index];
- boolean isPublic = Modifier.isPublic( method.getModifiers() );
- Class returnType = method.getReturnType();
-
- if( isPublic &&
- returnType != Void.TYPE &&
- method.getParameterTypes().length == 0 &&
- method.getName().startsWith( "get" ))
- {
- method.setAccessible( true );
- result.add( method );
- }
- }
-
- return result;
- }
-
- private boolean callSetter(AbstractDataModelOperation op, Object param, String setterMethodName) throws CoreException
- {
- for (Iterator iterator = classEntry.setterList_.iterator(); iterator.hasNext();)
- {
- Method method = (Method) iterator.next();
- if (method.getName().equals(setterMethodName))
- {
- Class[] paramTypes = method.getParameterTypes();
- if (paramTypes.length == 1 && param != null)
- {
- try{
- method.invoke(op, new Object[]{param});
- return true;
- }
- catch(Exception cex){
- Status errorStatus = new Status(Status.ERROR, "ws_ant", 5094, cex.getMessage(), cex);
- getStatusHandler().reportError(errorStatus);
- getLog().log(ILog.ERROR, "ws_ant", 5094, this, "callSetter", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_CALL_SETTER, setterMethodName));
- throw new CoreException(errorStatus);
- }
- }
- }
- }
- return false;
- }
-
-
- // look for setter with primitive type parameter - if find one, convert String propertyValue and call it
- private boolean callPrimitiveSetter(PropertyDataHolder mapping) throws CoreException
- {
- for (Iterator iterator = classEntry.setterList_.iterator(); iterator.hasNext();) {
- Method element = (Method) iterator.next();
- Class[] parmTypes = element.getParameterTypes();
- if (parmTypes.length==1 && parmTypes[0].isPrimitive())
- {
- Class parmType = parmTypes[0].getClass();
- Object setterParm = null;
- if (parmType.equals(Integer.class))
- {
- setterParm = Integer.valueOf(mapping.value_);
- }
- else if (parmType.equals(Boolean.class))
- {
- setterParm = Boolean.valueOf(mapping.value_);
- }
- else if (parmType.equals(Character.class) && mapping.value_.length() == 1)
- {
- setterParm = new Character(mapping.value_.charAt(0));
- }
- else if (parmType.equals(Byte.class))
- {
- setterParm = Byte.valueOf(mapping.value_);
- }
- else if (parmType.equals(Short.class))
- {
- setterParm = Short.valueOf(mapping.value_);
- }
- else if (parmType.equals(Long.class))
- {
- setterParm = Long.valueOf(mapping.value_);
- }
- else if (parmType.equals(Float.class))
- {
- setterParm = Float.valueOf(mapping.value_);
- }
- else if (parmType.equals(Double.class))
- {
- setterParm = Double.valueOf(mapping.value_);
- }
-
- if (setterParm != null)
- {
- try
- {
- element.invoke(mapping.operation_, new Object[]{setterParm});
- return true;
- }
- catch(Exception e){
- Status errorStatus = new Status(Status.ERROR, "ws_ant", 5095, e.getMessage(), e);
- getStatusHandler().reportError(errorStatus);
- getLog().log(ILog.ERROR, "ws_ant", 5095, this, "callPrimitiveSetter", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_CALL_SETTER, element.getName()));
- throw new CoreException(errorStatus);
- }
- }
- }
- }
- return false;
- }
-
- //check for setter with parameter type that takes a String to construct
- // construct the parameter using String & call the setter
- private boolean callSetterConstructor(PropertyDataHolder mapping) throws CoreException
- {
- for (Iterator iterator = classEntry.setterList_.iterator(); iterator.hasNext();) {
- Method element = (Method) iterator.next();
- Class[] parmTypes = element.getParameterTypes();
- Class[] stringParm = new Class[]{String.class};
- if (parmTypes.length==1)
- {
- try
- {
- Constructor ctor = parmTypes.getClass().getConstructor(stringParm);
- Object parameter = ctor.newInstance(new Object[]{mapping.value_});
- element.invoke(mapping.operation_, new Object[]{parameter});
- }
- catch (Exception exc)
- {
- Status errorStatus = new Status(Status.ERROR, "ws_ant", 5096, exc.getMessage(), exc);
- getStatusHandler().reportError(errorStatus);
- getLog().log(ILog.ERROR, "ws_ant", 5096, this, "callSetterConstructor", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_CALL_SETTER, element.getName()));
- throw new CoreException(errorStatus);
- }
- }
- }
- return false;
- }
-
- /**
- * Returns an object that helps manage execution/undoing of Commands.
- */
- public CommandManager getCommandManager (){
- return controller_.getOperationManager();
- }
-
- public CommandFragment getRootCommandFragment()
- {
-
- //look up the commandFragment in the scenarioRegistry extension point with an ID corresponding to the scenario property in the propertytable
- String scenarioProperty = (String)getProperty(SCENARIO_TYPE_PROPERTY);
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IExtensionPoint extPt = reg.getExtensionPoint(EXT_PT_NAMESPACE, SCENARIO_EXT_PT);
-
- IConfigurationElement[] elements = extPt.getConfigurationElements();
-
- for (int i = 0; i < elements.length; i++) {
-
- IConfigurationElement configElement = elements[i];
- if (configElement.getAttribute(SCENARIO_TYPE_ATTRIBUTE).equals(scenarioProperty))
- {
- try
- {
- Object obj = configElement.createExecutableExtension(SCENARIO_CLASS_ATTRIBUTE);
-
- if (obj instanceof org.eclipse.wst.command.internal.env.core.fragment.CommandFragment)
- {
- return (org.eclipse.wst.command.internal.env.core.fragment.CommandFragment)obj;
- }
- }
- catch (Exception exception)
- {
- Status errorStatus = new Status(Status.ERROR, "ws_ant", 5097, exception.getMessage(), exception);
- getStatusHandler().reportError(errorStatus);
- getLog().log(ILog.ERROR, "ws_ant", 5097, this, "getRootCommandFragment", EnvironmentMessages.MSG_ERROR_ANT_CMD_FRAGMENT);
- }
- }
- }
- return null;
- }
- }
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntOperationManager.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntOperationManager.java
deleted file mode 100644
index d04d096a3..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntOperationManager.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ant;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentEngine;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Manages the execution of commands in the root fragment passed to the constructor.
- *
- * @author joan
- *
- */
-
-public class AntOperationManager extends CommandFragmentEngine
-{
- private AntEnvironment environment_;
-
- protected IStatus initBeforeExecute( AbstractDataModelOperation operation )
- {
- environment_.getLog().log(ILog.INFO, "ws_ant", 5098, this, "initBeforeExecute", "Initializing data for: " + operation.getClass().getName());
- IStatus initStatus = Status.OK_STATUS;
- try
- {
- initStatus = environment_.initOperationData( operation );
- }
- catch (Exception e)
- {
- throw new IllegalArgumentException(e.getMessage());
- }
- return initStatus;
- }
-
- /**
- * Creates a CommandFragmentEngine.
- *
- * @param startFragment the root fragment where traversal will begin.
- * @param dataManager the data manager containing all of the data mappings.
- * @param environment the environment.
- */
- public AntOperationManager( CommandFragment startFragment, DataFlowManager dataManager, AntEnvironment environment )
- {
- super( startFragment, dataManager, environment );
-
- environment_ = environment;
- }
-}
-
-
-
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntStatusHandler.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntStatusHandler.java
deleted file mode 100644
index 30ea5c658..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/AntStatusHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- * 20070522 176943 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ant;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.command.internal.env.eclipse.BaseStatusHandler;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-
-public class AntStatusHandler extends BaseStatusHandler
-{
-
- public Choice report(IStatus status, Choice[] choices) {
- // TODO
- checkStatus(status);
- return null;
- }
-
- public void report(IStatus status) throws StatusException {
- if (status.getSeverity() == IStatus.ERROR)
- reportError(status);
- else
- reportInfo(status);
-
- }
-
- public void reportError(IStatus status) {
- checkStatus(status);
- System.err.println(status.getMessage());
- }
-
- public void reportInfo(IStatus status) {
- checkStatus(status);
- System.out.println(status.getMessage());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/PropertyDataHolder.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/PropertyDataHolder.java
deleted file mode 100644
index 509ab6bb0..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/PropertyDataHolder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ant;
-
-/**
- * Simple class to hold data mapping information once retrieved from Ant property file.
- * Map is used for many to one mappings involving mapping of multiple properties to a bean.
- * In this case, the key_ and value_ should be set to an empty string and all key value pairs
- * for properties put into the map instead. The transformation for this case would be a modifier
- * which will set the properties onto the bean.
- */
-
-import java.util.Map;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class PropertyDataHolder {
- public AbstractDataModelOperation operation_;
- public Object transform_;
- public String key_;
- public String property_;
- public String value_;
- public Map map_;
-}
-
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/String2BooleanTransformer.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/String2BooleanTransformer.java
deleted file mode 100644
index 783e54cac..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/ant/String2BooleanTransformer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ant;
-
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class String2BooleanTransformer implements Transformer {
-
- public Object transform(Object value) {
- String str = (String)value;
- str = str.toLowerCase();
- if (str.equals("true"))
- {
- return new Boolean(true);
- }
- else return new Boolean(false);
-
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java
deleted file mode 100644
index 4109bdb37..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java
+++ /dev/null
@@ -1,855 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.commandline;
-
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.ResourceBundle;
-import java.util.Vector;
-import org.eclipse.wst.command.internal.env.common.StringUtils;
-
-
-/**
- * <p>This is a generic command line parsing class. The programmer need only specify
- * the characteristics of their command line(ie. positional parameters, flags, etc)
- * and this class will perform the rest of the parsing work. As an added bonus this
- * class will also create formated help text that displays the syntax of this
- * command line.
- *
- * <p>The main parameter to the CommandLine constructor is a two dimensional String
- * array. There are 5 columns in this array and as many rows as needed for each
- * flag or positional parameter. The five columns are:
- *
- * <ol>
- * <li>The name of the flag(eg. "help" or "a", etc)
- * Note: no dash should be in the name here. The user would specify "-help" on the
- * command line though.
- * <li>The name of the flag parameter(if any)
- * <li>A string indicating whether this flag can appear more than once on the
- * command line.
- * <li>A string indicating whether this flag must be specified on the command line.
- * <li>A help text string which describes this particular flag or positional parameter.
- * </ol>
- *
- * <p>Each row in the string array is associate with either a positional parameter
- * or with a flag. For example, consider this command line:
- * <ul>
- * <li>My_prog required_parm1 -ab parm_for_ab required_parm2 -help optional_parms
- * </ul>
- *
- * <p>In this example My_prog is the name of the program. required_parm1 and
- * required_parm2 must be specified on the command line. Notice that they do not
- * have to be adjacent to each other on the command line. optional_parms may optionally
- * specified. optional_parms can be 0 or more parameters. They does not need to be
- * adjacent to the required parameters, but they do need to follow the required
- * parameters. Two flags are specified "-ab" and "-help". The "-ab" flag has a
- * parameter "parm_for_ab" associated with it. Note: a flag can not have an optional
- * parameter. (ie. a flag either never have a parameter or it always has a parameter)
- * In this example, the first two rows in the string array would describe required_parm1
- * and required_parm2. The third entry would describe optional_parms. The fourth and
- * fifth rows would describe "-ab" and "-help". For this command line the string array
- * would look like this:
- *
- * <ul>
- * <li>{ { CommandLine.POSITIONAL, "parm1", CommandLine.NO_DUPS,
- * CommandLine.REQUIRED, "parm1 help text" },
- * <li>{ CommandLine.POSITIONAL, "parm2", CommandLine.NO_DUPS,
- * CommandLine.REQUIRED, "parm2 help text" },
- * <li>{ CommandLine.POSITIONAL, "optional_parms", CommandLine.DUPS_OK,
- * CommandLine.REQUIRED, "optional help text" },
- * <li>{ "ab", "parm_for_ab", CommandLine.NO_DUPS,
- * CommandLine.OPTIONAL, "ab help text" },
- * <li>{ "help", CommandLine.NO_PARM, CommandLine.NO_DUPS,
- * CommandLine.OPTIONAL, "displays this help text" } }
- * </ul>
- *
- * <p>String array rules:
- *
- * <ol>
- * <li>Positional rows must always come first in the array. These rows must
- * have a name specified in column 2, except for one case. If you want to indicate that
- * there are no optional positional parameters you would put CommandLine.NO_PARM
- * in column 2 of the positional row. You would also need to put CommandLine.OPTIONAL
- * in column 4 since this row is for optional parameters(or the non-existence of
- * optional parameters as the case may be)
- * <li>Once a positional row specifies that it is optional, no further positional rows
- * may be specified.
- * <li>At least one positional row must be specified, even if it is to just to specify that
- * there are no optional parameters.
- * <li>Flag names must be in lower case. Note: the user can specify upper or lower case
- * on the command line.
- * <li>If a flag has a parameter the name of the parameter should be put into column 2.
- * otherwise CommandLine.NO_PARM should be put in column 2.
- * <li>If a flag is allowed to appear more than once on the command line then
- * CommandLine.DUPS_OK should be put into column 3, otherwise CommandLine.NO_DUPS
- * should be put into column 3.
- * <li>If a flag must be specified on the command line then CommandLine.REQUIRED should
- * be specified in column 4, otherwise CommandLine.OPTIONAL should be specified.
- * <li>A help flag must be specified.
- * <li>The strings specified in the flags column, the parameter name column, and the
- * help column are always translated using the resource bundle specified. Of
- * course the special string values such as POSITIONAL and NO_PARM are not
- * translated.
- * </ol>
- *
- * <p> Flag matching rules:
- * <ol>
- * <li>The parser will attempt to match a user specified flag with the minimum number
- * of programmer specified flag characters. For example, if the programmer has
- * specified that the flag is "help" the user could specify "-h", "-he", "-hel", or
- * "-help". If the programmer has also specified a flag called "hello", the
- * user would get an error message for specifing either "-h", "-he" or "-hel", since
- * it is ambiguous which flag is being refered to. Both "-hell" and "-hello"
- * would be ok for the user to specify the hello flag on the command line.
- * <li>If a flag has a parameter, the parameter may be immediately adjacent to the flag.
- * For example if "abcd" is specified as a flag with a parameter, the user could
- * specify the following assuming there are no other ambiguous flags. "-abcdparm",
- * "-abcparm", "-abparm", or "-aparm" where parm is the parameter for the flag.
- * (Of course the user can always put a white space between the flag and the
- * parameter.)
- * <li>If a flag does not have a parameter and a parameter is adjacent to it then this
- * parameter is interpreted as a positional parameter. For example if "abcb" is
- * specified as a flag and the user specifies "-abhello", then the first "ab" will be
- * interpreted as the flag and "hello" will be interpreted as a positional
- * parameter.
- * </ol>
- *
- * @author Peter Moogk
- * @date July 13, 2000
-**/
-
-public class CommandLine
-{
- // Constant strings that the user should use in their flags_info input array.
- /**
- * Specifies that this flag or positional parameter is required.
- **/
- public static final String REQUIRED = "required";
- /**
- * Specifies that this flag or positional parameter is optional.
- **/
- public static final String OPTIONAL = "optional";
- /**
- * Specifies that this flag may be specified more than once on the command line.
- * Note: This string has no meaning for positional parameters.
- **/
- public static final String DUPS_OK = "dups_ok";
- /**
- * Specifies that this flag may not be specified more than once on the command line.
- * Note: This string has no meaning for positional parameters.
- **/
- public static final String NO_DUPS = "no_dups";
- /**
- * Specifies that a row is a positional parameter row.
- **/
- public static final String POSITIONAL = "";
- /**
- * Specifies that a flag has no parameter. For positional parameters this
- * string indicates that there are no optional parameters.
- **/
- public static final String NO_PARM = "";
-
- /**
- * @param flags_info This parameter specifies the characteristics of the
- * command line parser. See the class description for a
- * definition of what this string array should look like.
- * @param help_flag This string indicates which flag in the flags_info
- * array is the help flag.
- * @param tool_name This string indicates the name of the tool that this
- * command line parser is being used for. This string
- * is only used when creating the help text.
- **/
- public CommandLine( String[][] flags_info,
- String help_flag,
- String tool_name,
- ResourceBundle flagMessages )
-
- throws InternalErrorExc
- {
- this.flags_info = flags_info;
- this.help_flag = help_flag;
- this.tool_name = tool_name;
- this.flagMessages = flagMessages;
-
- messages = ResourceBundle.getBundle( "org.eclipse.wst.command.internal.env.commandline.commandline" );
- verify_flags_info();
- }
-
- /**
- * Call this method to parse a command line.
- * @param args This is the string array from the command line.
- * @throws Flag_error If the user has specified the command line incorrectly
- * a Flag_error exception will be thrown. Use getMessage
- * to get a description of the user error.
- *
- * @throws Help_specified If the user specifies the help flag this exception
- * will be thrown. Use getMessage to get a fully
- * formatted syntax description of this command line.
- **/
- public void check_flags( String[] args ) throws Flag_error
- {
- flags_specified = new Vector[flags_info.length];
-
- for( int index = 0; index < args.length; index++ )
- {
- boolean processed_the_next_arg = process_arg( args, index );
- if( processed_the_next_arg == true ) index++;
- }
-
- // If help was specified we will not check the regular rules.
- if( !flag_specified( help_flag ) )
- {
- // Check for flags breaking the rules specified in flags_info.
- check_rules();
-
- // Call subclassed method to see if more processing is required.
- more_processing();
- }
- }
-
- /**
- * This method is for subclasses of this class. This method is called at
- * the very end of check_flags method. It is intended that subclasses would
- * perform additional command line checking here.
- **/
- protected void more_processing() throws Flag_error, InternalErrorExc
- {
- }
-
- /**
- * Once the command line has been parsed by calling check_flags a
- * call can be made to this method to get the parameters for this flag.
- * If the flag was not specified on the command line null will be returned.
- * If the flag was specified, but has no parameters a valid vector will be
- * returned containing a null.
- **/
- public String[] get_flag_parms( String flag )
- {
- int row = 0;
- boolean flag_found = false;
-
- while( flag_found == false && row < flags_info.length )
- {
- if( flags_info[row][FLAG_COL].equals( flag ) )
- {
- flag_found = true;
- }
- else
- {
- row++;
- }
- }
-
- if( flag_found == true )
- {
- Vector parms = flags_specified[row];
- return parms == null ? null : (String[])(parms.toArray( new String[0] ));
- }
-
- return null;
- }
-
- /**
- * Call this method to get all of the positional parameters.
- * This method returns both the required positionals and the
- * optional positionals in that order. If no positional parameters
- * were specified null will be returned.
- **/
- public String[] get_positionals()
- {
- return (String[])flags_specified[POSITIONAL_ROW].toArray( new String[0] );
- }
-
- /**
- * This method returns true if this flag was specified by the user
- * otherwise false is returned.
- **/
- public boolean flag_specified( String flag )
- {
- return get_flag_parms( flag ) != null;
- }
-
- /**
- * This method returns fully formated help text syntax for this
- * command line.
- **/
- public String get_help_text()
- {
- StringBuffer help_text = new StringBuffer(400);
- int help_width = HELP_LINE_LEN -
- 2 - // blanks
- 1 - // dash
- max_flag_size - // flag field
- 1 - // blank
- max_name_size - // name field
- 1; // blank
-
- help_text.append( messages.getString( FlagMessages.PARSER_INFO_SYNTAX ) +
- ": " + tool_name + " " );
-
- // Display the required positionals if any.
- for( int index = 0; index < required_positionals; index++ )
- {
- help_text.append( flagMessages.getString( flags_info[index][NAME_COL] ) +
- " " );
- }
-
- help_text.append( "[" + messages.getString( FlagMessages.PARSER_FLAGS ) +
- "] " );
-
- if( optional_positionals_allowed == true )
- {
- help_text.append( flagMessages.getString( flags_info[optional_list_index][NAME_COL] ) );
- }
-
- help_text.append( "\n " + messages.getString( FlagMessages.PARSER_INFO_WHERE ) + "\n" );
-
- // Create one line of description for each parameter
- for( int row = 0; row < flags_info.length; row++ )
- {
- String columnId = flags_info[row][NAME_COL];
- String columnName = columnId == NO_PARM ? "" : flagMessages.getString( columnId );
-
- String flagId = flags_info[row][FLAG_COL];
- String flagName = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString(flagId);
-
- int flag_padding = max_flag_size - flagName.length();
- int name_padding = max_name_size - columnName.length();
-
- // Skip this row if this is a marker for no optional positionals.
- if( flags_info[row][FLAG_COL] == POSITIONAL &&
- flags_info[row][NAME_COL] == NO_PARM ) continue;
-
- if( flagName == POSITIONAL )
- {
- help_text.append( getBlanks(3 ) );
- }
- else
- {
- help_text.append( " -" + flagName );
- }
-
- help_text.append( getBlanks( flag_padding + 1 ) );
- help_text.append( columnName );
- help_text.append( getBlanks( name_padding + 1 ) );
-
- String columnHelp = flagMessages.getString( flags_info[row][HELP_COL] );
- String[] split_help_text
- = StringUtils.splitter( columnHelp, help_width );
-
- if( split_help_text.length > 0 )
- help_text.append( split_help_text[0] + "\n" );
- else
- help_text.append( "\n" );
-
- for( int index = 1; index < split_help_text.length; index++ )
- {
- help_text.append( getBlanks( HELP_LINE_LEN - help_width ) );
- help_text.append( split_help_text[index] + "\n" );
- }
-
- help_text.append( "\n" );
- }
-
- return "" + help_text;
- }
-
- /**
- * Return a string with the specified number of blanks.
- */
- private String getBlanks( int count )
- {
- char[] blanks = new char[count];
- Arrays.fill( blanks, 0, count, ' ' );
-
- return new String( blanks );
- }
-
- /**
- * This class is the base for all command line exception classes.
- **/
- static public class ErrorExc extends Exception
- {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3257567317259793720L;
-
- public ErrorExc( String message, String[] args )
- {
- super( MessageFormat.format( message, args ) );
- }
- }
-
- /**
- * This class will be thrown when an internal error is detected.
- * This usually happens if the flag description information was
- * specified incorrectly.
- **/
- static public class InternalErrorExc extends IllegalArgumentException
- {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3258410621136614450L;
-
- public InternalErrorExc( String message, String[] args )
- {
- super( MessageFormat.format( message, args ) );
- }
-
- public InternalErrorExc( String message )
- {
- this( message, (String[])null );
- }
-
- public InternalErrorExc( String message, String arg )
- {
- this( message, new String[]{ arg } );
- }
- }
-
- /**
- * This class will be thrown if a user error occurs while parsing the command line.
- **/
- static public class Flag_error extends ErrorExc
- {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3832621776877663537L;
-
- public Flag_error( String message, String[] args )
- {
- super( message, args );
- }
-
- public Flag_error( String message, String arg )
- {
- super( message, new String[]{ arg } );
- }
-
- public Flag_error( String message )
- {
- super( message, null );
- }
- }
-
- /**
- * Tries to process a single flag on the command line.
- * @param args All the command line parameters.
- * @param arg_index This is the index of the argument that is to be processed.
- * @return returns true if the argument we are processing is a flag that has a
- * parameter and the parameter is specified in the next argument.
- **/
- private boolean process_arg( String[] args, int arg_index ) throws Flag_error
- {
- boolean processed_next_arg = false;
-
- if( args[arg_index].charAt(0) == '-' )
- {
- // This is the start of a flag.
- int flag_index = 1;
- int info_index = get_info_index( args[arg_index], flag_index );
- int max_index = get_max_index( args[arg_index], flag_index, info_index );
-
- if( flags_info[info_index][NAME_COL] != NO_PARM )
- {
- // This flag takes a parameter so check if it is stuck to this
- // arg.
- if( max_index < args[arg_index].length() )
- {
- add_flag_parm( info_index,
- args[arg_index].substring( max_index,
- args[arg_index].length() ) );
- }
- else
- {
- // This flag has a parameter and it wasn't stuck to the flag,
- // so we will try to get it from the next arg.
- if( arg_index+1 < args.length &&
- args[arg_index+1].charAt(0) != '-' )
- {
- // We found an parameter in the next string so we will use this
- // one as a parameter for this flag. Note: if was no parameter
- // after the flag at all, the error will be caught in the
- // check_rules method.
- add_flag_parm( info_index, args[arg_index+1] );
- processed_next_arg = true;
- }
- else
- {
- // Error missing paramater. This error is caught by check_rules.
- add_flag_parm( info_index, null );
- }
- }
- }
- else
- {
- // The flag does not have a parameter so we will add a null.
- add_flag_parm( info_index, null );
-
- // Check to see if a positional parameter is stuck to this flag.
- if( max_index < args[arg_index].length() )
- {
- add_positional( args[arg_index].substring( max_index,
- args[arg_index].length() ) );
- }
- }
- }
- else
- {
- // This is a positional parameter.
- add_positional( args[arg_index] );
- }
-
- return processed_next_arg;
- }
-
- /**
- * Finds the row for the flag that uniquely matched this flag str.
- * @return returns the flags_info index of the matching flag.
- **/
- private int get_info_index( String flag_str, int start_index )
- throws Flag_error
- {
- //int info_start = 1;
- //int info_end = flags_info.length;
- int info_index;
- int found_count = 0;
- int info_col_index = 0;
- int last_info_index = 0;
-
- BitSet flags_rejected = new BitSet();
-
- // Loop over each char in flag_str. Note: we will probably bail early.
- for( int flag_col_index = start_index; flag_col_index < flag_str.length(); flag_col_index++ )
- {
- // Loop over each flag in flag_info
- for( info_index = 0; info_index < flags_info.length; info_index++ )
- {
- String flagId = flags_info[info_index][FLAG_COL];
- String flagName = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString( flagId );
-
- if( flags_rejected.get( info_index ) == false &&
- info_col_index < flagName.length() &&
- Character.toLowerCase(flag_str.charAt(flag_col_index)) ==
- flagName.charAt(info_col_index) )
- {
- found_count++;
- last_info_index = info_index;
- }
- else
- {
- flags_rejected.set( info_index );
- }
- }
-
- if( found_count == 1 )
- {
- // We have a match.
- return last_info_index;
- }
- else if( found_count == 0 )
- {
- // Flag not found at all.
- throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_FLAG_NOT_FOUND ),
- flag_str.substring( start_index ) );
- }
- else
- {
- // More than one flag was found with this char so we will go to the
- // next char to uniquely match it.
- info_col_index++;
- //info_start = last_info_index - found_count + 1;
- //info_end = last_info_index + 1;
- found_count = 0;
- }
- }
-
- // The only way to get to this code is if the loop exited with
- // the found_count greater than 1. Therefore, the flag specified is
- // ambiguous.
- throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_AMBIGUOUS_FLAG ),
- flag_str.substring( start_index) );
- }
-
- /**
- * This method tries to match as many characters as possible of the user
- * specified flag with the matched flag string.
- * @return returns the position of the last matching flag chararacter.
- **/
- private int get_max_index( String flag_str, int flag_start, int info_index )
- {
- int flag_col_index = flag_start;
- int info_col_index = 0;
-
- String info_str = flagMessages.getString( flags_info[info_index][FLAG_COL] );
-
- while( flag_col_index < flag_str.length() &&
- info_col_index < info_str.length() )
- {
- if( Character.toLowerCase( flag_str.charAt(flag_col_index) ) !=
- info_str.charAt(info_col_index) )
- break;
-
- flag_col_index++;
- info_col_index++;
- }
-
- return flag_col_index;
- }
-
- /**
- * Adds a positional parameter to flags_specified.
- **/
- private void add_positional( String positional_parm )
- {
- if( flags_specified[POSITIONAL_ROW] == null )
- flags_specified[POSITIONAL_ROW] = new Vector(3);
-
- flags_specified[POSITIONAL_ROW].add( positional_parm );
- }
-
- /**
- * Adds a flag and its parameter to flags_specified. If only the
- * flag was specified, then a null should be passed to flag_parm.
- **/
- private void add_flag_parm( int flag_index, String flag_parm )
- throws Flag_error
- {
- if( flags_info[flag_index][DUP_COL] == NO_DUPS &&
- flags_specified[flag_index] != null )
- throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED ),
- flagMessages.getString( flags_info[flag_index][FLAG_COL] ) );
-
- if( flags_specified[flag_index] == null )
- flags_specified[flag_index] = new Vector(3);
-
- flags_specified[flag_index].add( flag_parm );
- }
-
- /**
- * Checks that the user hasn't broken any command line rules.
- **/
- private void check_rules() throws Flag_error
- {
- // Check that all of the required positionals were specified.
- int positional_count = 0;
-
- if( flags_specified[POSITIONAL_ROW] != null )
- {
- positional_count = flags_specified[POSITIONAL_ROW].size();
- }
-
- if( required_positionals > positional_count )
- throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_POSITIONAL ),
- flagMessages.getString( flags_info[required_positionals-1][NAME_COL] ) );
-
- else if( required_positionals < positional_count &&
- optional_positionals_allowed == false )
- throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_TOO_MANY_POSITIONALS ) );
-
- for( int row = 0; row < flags_info.length; row++ )
- {
- if( flags_info[row][FLAG_COL] == POSITIONAL ) continue;
-
- if( flags_specified[row] == null &&
- flags_info[row][REQUIRED_COL] == REQUIRED )
- throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_REQUIRED_FLAG ),
- flagMessages.getString( flags_info[row][FLAG_COL] ) );
-
- int parm_count = 0;
-
- if( flags_specified[row] != null ) parm_count = flags_specified[row].size();
-
- // Check for too many flag parameters.
- if( flags_info[row][DUP_COL] == NO_DUPS && parm_count > 1 )
- throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED ),
- flagMessages.getString( flags_info[row][FLAG_COL] ) );
-
- // Check for missing flag parameter.
- if( parm_count > 0 && flags_info[row][NAME_COL] != NO_PARM )
- {
- for( int index = 0; index < flags_specified[row].size(); index++ )
- {
- if( flags_specified[row].elementAt(index) == null )
- throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_FLAG_PARAMETER ),
- new String[]
- { flagMessages.getString( flags_info[row][FLAG_COL] ),
- flagMessages.getString( flags_info[row][NAME_COL] ) } );
-
- }
- }
- }
- }
-
- /**
- * This method verifies that a proper flags_info string array was passed
- * to us by the programmer.
- **/
- private void verify_flags_info() throws InternalErrorExc
- {
- boolean done_positionals = false;
- boolean help_specified = false;
-
- required_positionals = 0;
- optional_positionals_allowed = false;
- optional_list_index = -1;
- max_flag_size = 0;
- max_name_size = 0;
-
- if( flags_info == null || flags_info.length == 0 )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED ) );
-
- if( flags_info[POSITIONAL_ROW] != null &&
- flags_info[POSITIONAL_ROW].length > 0 &&
- flags_info[POSITIONAL_ROW][FLAG_COL] != POSITIONAL )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL ) );
-
- for( int row = 0; row < flags_info.length; row++ )
- {
- if( flags_info[row] == null )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NULL_FLAG_ROW ) );
-
- if( flags_info[row].length != 5 )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_ROW_SIZE ) );
-
- if( flags_info[row][FLAG_COL] == null ||
- flags_info[row][NAME_COL] == null ||
- flags_info[row][HELP_COL] == null )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NULL_IN_ROW ) );
-
- if( flags_info[row][FLAG_COL].equals( help_flag ) ) help_specified = true;
-
- String flagId = flags_info[row][FLAG_COL];
- String nameId = flags_info[row][NAME_COL];
-
- String flag_col = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString( flagId );
- String name_col = nameId == NO_PARM ? NO_PARM : flagMessages.getString( nameId );
-
- if( flag_col.length() > max_flag_size )
- max_flag_size = flag_col.length();
-
- if( name_col != NO_PARM && name_col.length() > max_name_size )
- max_name_size = name_col.length();
-
- // Ensure that flags are all in lowercase.
- if( !flag_col.equals( flag_col.toLowerCase() ) )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_FLAG_NOT_LOWERCASE ),
- flag_col );
-
- // Ensure that only the predefined dup strings are used.
- // Note: it's ok to use != when comparing constant strings literals.
- if( flags_info[row][DUP_COL] == null ||
- ( flags_info[row][DUP_COL] != NO_DUPS &&
- flags_info[row][DUP_COL] != DUPS_OK ) )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_DUP_STRING ),
- flags_info[row][DUP_COL] );
-
- // Ensure that only the predefined required strings are used.
- if( flags_info[row][REQUIRED_COL] == null ||
- ( flags_info[row][REQUIRED_COL] != REQUIRED &&
- flags_info[row][REQUIRED_COL] != OPTIONAL ) )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_REQUIRED_STRING ),
- flags_info[row][REQUIRED_COL] );
-
- // Count the number of required positionals.
- if( flags_info[row][FLAG_COL] == POSITIONAL )
- {
- if( flags_info[row][REQUIRED_COL] == REQUIRED )
- {
- if( flags_info[row][NAME_COL] == NO_PARM )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME ) );
-
- required_positionals++;
- }
- else if( flags_info[row][NAME_COL] != NO_PARM )
- {
- // We use the NAME_COL field for an optional positional to denote
- // whether additional positionals are allowed or not.
- optional_positionals_allowed = true;
- optional_list_index = row;
- }
- }
-
- // Ensure that positionals are at the beginning of the info.
- if( flags_info[row][FLAG_COL] != POSITIONAL ||
- ( done_positionals == false &&
- flags_info[row][FLAG_COL] == POSITIONAL &&
- flags_info[row][REQUIRED_COL] == OPTIONAL ) )
- {
- done_positionals = true;
- }
- else if( done_positionals == true )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING ) );
- }
-
- // Ensure that a help flag was specified in the info list.
- if( help_specified == false )
- throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED ) );
- }
-
- /**
- * This method is used to dump internal information about a parsed
- * command line.
- **/
- public String toString()
- {
- StringBuffer b = new StringBuffer(100);
-
- for( int row = 0; row < flags_info.length; row++ )
- {
- b.append( "\n" );
-
- if( flags_info[row][FLAG_COL] == POSITIONAL )
- b.append( "Positional:" );
- else
- b.append( flagMessages.getString( flags_info[row][FLAG_COL] ) + ":" );
-
-
- if( flags_specified[row] == null )
- b.append( "no parameters" );
- else
- for( int parm_index = 0; parm_index < flags_specified[row].size(); parm_index++ )
- {
- String parm = (String)flags_specified[row].elementAt(parm_index);
- b.append( parm + ":" );
- }
- b.append( "\n" );
- }
-
- return ""+b;
- }
-
- private static final int FLAG_COL = 0;
- private static final int NAME_COL = 1;
- private static final int DUP_COL = 2;
- private static final int REQUIRED_COL = 3;
- private static final int HELP_COL = 4;
-
- private static final int POSITIONAL_ROW = 0;
- private static final int HELP_LINE_LEN = 75;
-
- private String[][] flags_info;
- private String help_flag;
- private String tool_name;
- private Vector[] flags_specified;
- private int required_positionals;
- private boolean optional_positionals_allowed;
- private int optional_list_index;
- private int max_flag_size;
- private int max_name_size;
-
- protected ResourceBundle messages;
- private ResourceBundle flagMessages;
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java
deleted file mode 100644
index 388414f56..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.commandline;
-
-/**
- * This class is used to store constant string error messages
- * generated by CommandLine.java
- *
- *
- * @author Peter Moogk
- * @date July 13, 2000
- * @see org.eclipse.wst.command.internal.env.commandline.CommandLine
-**/
-
-public final class FlagMessages
-{
-
- public static final String PARSER_ERROR_FLAG_NOT_FOUND = "PARSER_ERROR_FLAG_NOT_FOUND";
-
- public static final String PARSER_ERROR_AMBIGUOUS_FLAG = "PARSER_ERROR_AMBIGUOUS_FLAG";
-
- public static final String PARSER_ERROR_MISSING_POSITIONAL = "PARSER_ERROR_MISSING_POSITIONAL";
-
- public static final String PARSER_ERROR_TOO_MANY_POSITIONALS = "PARSER_ERROR_TOO_MANY_POSITIONALS";
-
- public static final String PARSER_ERROR_MISSING_REQUIRED_FLAG = "PARSER_ERROR_MISSING_REQUIRED_FLAG";
-
- public static final String PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED = "PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED";
-
- public static final String PARSER_ERROR_MISSING_FLAG_PARAMETER = "PARSER_ERROR_MISSING_FLAG_PARAMETER";
-
- // Error internal error messages.
- public static final String PARSER_ERROR_MESSAGE_MISSING_ARG = "PARSER_ERROR_MESSAGE_MISSING_ARG";
-
- // Internal command line error messages.
- public static final String PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED = "PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED";
-
- public static final String PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL = "PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL";
-
- public static final String PARSER_ERROR_NULL_FLAG_ROW = "PARSER_ERROR_NULL_FLAG_ROW";
-
- public static final String PARSER_ERROR_INCORRECT_ROW_SIZE = "PARSER_ERROR_INCORRECT_ROW_SIZE";
-
- public static final String PARSER_ERROR_NULL_IN_ROW = "PARSER_ERROR_NULL_IN_ROW";
-
- public static final String PARSER_ERROR_INCORRECT_DUP_STRING = "PARSER_ERROR_INCORRECT_DUP_STRING";
-
- public static final String PARSER_ERROR_INCORRECT_REQUIRED_STRING = "PARSER_ERROR_INCORRECT_REQUIRED_STRING";
-
- public static final String PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING = "PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING";
-
- public static final String PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED = "PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED";
-
- public static final String PARSER_ERROR_FLAGS_NOT_ORDERED = "PARSER_ERROR_FLAGS_NOT_ORDERED";
-
- public static final String PARSER_ERROR_FLAG_NOT_LOWERCASE = "PARSER_ERROR_FLAG_NOT_LOWERCASE";
-
- public static final String PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME = "PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME";
-
- public static final String PARSER_INFO_SYNTAX = "PARSER_SYNTAX";
-
- public static final String PARSER_FLAGS = "PARSER_FLAGS";
-
- public static final String PARSER_INFO_WHERE = "PARSER_WHERE";
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties
deleted file mode 100644
index 78529810d..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 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
-###############################################################################
-
-PARSER_ERROR_FLAG_NOT_FOUND=IWAB0123E Flag -{0} is not valid.
-PARSER_ERROR_AMBIGUOUS_FLAG=IWAB0284E Flag -{0} is ambiguous.
-PARSER_ERROR_MISSING_POSITIONAL=IWAB0285E Missing {0} parameter.
-PARSER_ERROR_TOO_MANY_POSITIONALS=IWAB0286E Too many positional parameters specified.
-PARSER_ERROR_MISSING_REQUIRED_FLAG=IWAB0288E Flag -{0} is missing.
-PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED=IWAB0293E Flag -{0} has been specified more than once.
-PARSER_ERROR_MISSING_FLAG_PARAMETER=IWAB0294E Flag -{0} is missing parameter {1}.
-PARSER_ERROR_MESSAGE_MISSING_ARG=IWAB0319E Error message {0} is missing an argument.
-PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED=IWAB0345E Specify flag information.
-PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL=IWAB0346E The first flag must be positional.
-PARSER_ERROR_NULL_FLAG_ROW=IWAB0347E Null flag row.
-PARSER_ERROR_INCORRECT_ROW_SIZE=IWAB0348E Flag row must have 5 strings.
-PARSER_ERROR_NULL_IN_ROW=IWAB0349E Flag information contains a null string.
-PARSER_ERROR_INCORRECT_DUP_STRING=IWAB0350E Duplicate string {0} is not valid.
-PARSER_ERROR_INCORRECT_REQUIRED_STRING=IWAB0351E Required string {0} is not valid.
-PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING=IWAB0352E Positional flag is not at the beginning.
-PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED=IWAB0353E Help flag is not specified in information array.
-PARSER_ERROR_FLAGS_NOT_ORDERED=IWAB0354E Flags are not in lexical order.
-PARSER_ERROR_FLAG_NOT_LOWERCASE=IWAB0355E Flag {0} is not lowercase.
-PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME=IWAB0356E Required positional parameters must have a name specified.
-PARSER_SYNTAX=Syntax
-PARSER_FLAGS=Flags
-PARSER_WHERE=Where
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java
deleted file mode 100644
index c48a4a531..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.File;
-
-/**
- *
- * The class provides and easy way to build classpaths.
- *
- */
-public class ClassPath
-{
- private StringBuffer path = new StringBuffer();
-
- /**
- *
- * @param newPath appends this new path to the end of the classpath.
- */
- public void appendPath( String newPath )
- {
- // No value to put on path, so just return
- if( newPath.equals( "" ) ) return;
-
- // If this is the first path in the string then we don't need a path
- // separator.
- if( path.length() == 0 )
- {
- path.append( newPath );
- }
- else
- {
- path.append( File.pathSeparatorChar + newPath );
- }
- }
-
- /**
- * This method appends all jar and zip files in a particular directory to
- * the classpath.
- *
- * @param directory specifies a directory contains jar and zip files.
- */
- public void appendDir( String directory )
- {
- File dir = new File( directory );
-
- if( !dir.isDirectory() ) return;
-
- File[] files = dir.listFiles();
-
- for( int index = 0; index < files.length; index++ )
- {
- File file = files[index];
- String name = file.getName();
-
- if( file.isFile() &&
- ( name.endsWith( ".jar" ) ||
- name.endsWith( ".zip" ) ) )
- {
- appendPath( file.getAbsolutePath() );
- }
-
- }
- }
-
- /**
- *
- * @param newPath appends a new classpath to the end of this classpath.
- */
- public void appendPath( ClassPath newPath )
- {
- appendPath( newPath.path.toString() );
- }
-
- /**
- * @return returns the full string classpath with separators.
- */
- public String toString()
- {
- return path.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java
deleted file mode 100644
index abc4a4124..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-
-
-/**
-* This class defines an output stream that writes to an
-* {@link org.eclipse.core.resources.IFile IFile}.
-*/
-public class FileResourceOutputStream extends OutputStream
-{
-
- IPath fFilePath;
- ResourceContext fResourceContext;
- IProgressMonitor fMonitor;
- IStatusHandler fStatusHandler;
- ByteArrayOutputStream fByteArrayOutputStream;
- boolean fOpen;
-
- /**
- * Constructs an output stream that can be used to write to the
- * given <code>file</code>. The workspace is neither examined nor
- * altered during construction. All resource creation is deferred
- * until later in the stream's lifecycle, such as during writing
- * or closure.
- * <b>Note:</b> The preferred mechanism for creating a stream that
- * writes to an IFile is to call the static factory method
- * {@link FileResourceUtils#newFileOutputStream FileResourceUtils.newFileOutputStream()}
- * and work with the resulting <code>OutputStream</code>.
- * Direct construction of a FileResourceOutputStream is not recommended.
- * @param file The {@link org.eclipse.core.resources.IFile IFile}
- * handle of the file resource to create. The project implied by the
- * pathname of the file must already exist,
- * that is, this method cannot be used to create projects.
- * @param progressMonitor The progress monitor for the operation, or null.
- */
- public FileResourceOutputStream (
- ResourceContext resourceContext,
- IPath filePath,
- IProgressMonitor monitor,
- IStatusHandler statusHandler
- )
- {
- fFilePath = filePath;
- fResourceContext = resourceContext;
- fMonitor = monitor;
- fStatusHandler = statusHandler;
- fByteArrayOutputStream = new ByteArrayOutputStream();
- fOpen = true;
- }
-
- /**
- * Closes the stream.
- * @throws IOException If an error occurs while closing the stream.
- * For example, if this stream was constructed with overwriteFile = false
- * and a file of the same name already exists, then an IOException will
- * be thrown either now or during an earlier {@link #write write}.
- */
- public void close ()
- throws IOException
- {
- if (!fOpen) return;
- fOpen = false;
- fByteArrayOutputStream.close();
- byte[] buffer = fByteArrayOutputStream.toByteArray();
- ByteArrayInputStream tempInputStream = new ByteArrayInputStream(buffer);
- try
- {
- FileResourceUtils.createFile(fResourceContext, fFilePath, tempInputStream, fMonitor, fStatusHandler);
- }
- catch (CoreException e)
- {
- throw new IOException(e.getMessage());
- }
- }
-
- /**
- * Flushes the stream. This does not imply the File resource
- * will be created or become visible within the workbench.
- * @throws IOException If an error occurs. For example, if this
- * stream was constructed with overwriteFile = false and a file of the
- * same name already exists, then an IOException may be thrown at
- * this point.
- */
- public void flush ()
- throws IOException
- {
- fByteArrayOutputStream.flush();
- }
-
- /**
- * Writes all bytes from the given array to the stream.
- * @param b The array of bytes to write.
- * @throws IOException If an error occurs. For example, if this
- * stream was constructed with overwriteFile = false and a file of the
- * same name already exists, then an IOException may be thrown at
- * this point.
- */
- public void write ( byte[] b )
- throws IOException
- {
- fByteArrayOutputStream.write(b);
- }
-
- /**
- * Writes bytes from the given array beginning at some offset
- * and continuing for some number of bytes (len) to the stream.
- * @param b The array of bytes to write.
- * @param off The offset into the array to begin writing.
- * @param len The number of bytes to write.
- * @throws IOException If an error occurs. For example, if this
- * stream was constructed with overwriteFile = false and a file of the
- * same name already exists, then an IOException may be thrown at
- * this point.
- */
- public void write ( byte[] b, int off, int len )
- {
- fByteArrayOutputStream.write(b,off,len);
- }
-
- /**
- * Writes a single byte to the stream.
- * @param b The byte to write.
- * @throws IOException If an error occurs. For example, if this
- * stream was constructed with overwriteFile = false and a file of the
- * same name already exists, then an IOException may be thrown at
- * this point.
- */
- public void write ( int b )
- {
- fByteArrayOutputStream.write(b);
- }
-}
-
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java
deleted file mode 100644
index 74d1b9d75..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java
+++ /dev/null
@@ -1,797 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060112 121199 jesper@selskabet.org - Jesper Møller
- * 20070813 188999 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.EnvironmentMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.StatusException;
-
-
-
-/**
-* This class contains useful methods for working with Eclipse resources.
-*/
-public final class FileResourceUtils
-{
- //
- // Keeps the IWorkspace hanging around. See getWorkspace().
- //
- private static IWorkspace workspace_ = null;
- //
- // Keeps the IWorkspaceRoot hanging around. See getWorkspaceRoot().
- //
- private static IWorkspaceRoot root_ = null;
-
-// private static MessageUtils msg_ = new MessageUtils( "org.eclipse.wst.command.internal.env.common.environment", new FileResourceUtils() );
-
-
- /**
- * Returns the IWorkspaceRoot object.
- * @return The IWorkspaceRoot object.
- */
- public static IWorkspaceRoot getWorkspaceRoot ()
- {
- if (root_ == null)
- {
- root_ = ResourcesPlugin.getWorkspace().getRoot();
- }
- return root_;
- }
-
- /**
- * Returns the IWorkspace object.
- *
- * @return The IWorkspace object.
- */
- public static IWorkspace getWorkspace ()
- {
- if (workspace_ == null)
- {
- if (root_ == null)
- {
- root_ = ResourcesPlugin.getWorkspace().getRoot();
- }
-
- workspace_ = root_.getWorkspace();
- }
-
- return workspace_;
- }
-
- /**
- *
- * @return returns an array of three common choices. (ie. Yes, yes all, and cancel )
- */
- public static Choice[] getThreeStateFileOptions()
- {
- Vector choices = new Vector();
-
- choices.add(new Choice( 'Y', EnvironmentMessages.LABEL_YES));
- choices.add(new Choice( 'A', EnvironmentMessages.LABEL_YES_TO_ALL));
- choices.add(new Choice( 'C', EnvironmentMessages.LABEL_CANCEL));
-
- return (Choice[])choices.toArray(new Choice[choices.size()]);
- }
-
- /**
- * Returns an
- * {@link org.eclipse.core.resources.IResource IResource}
- * of the given absolute pathname or null if no such resource exists.
- * @param absolutePathname The absolute path of the resource.
- * @return The <code>IResource</code>.
- */
- public static IResource findResource ( String absolutePathname )
- {
- if (absolutePathname == null)
- {
- return null;
- }
-
- return findResource(new Path(absolutePathname));
- }
-
- /**
- * Returns an
- * {@link org.eclipse.core.resources.IResource IResource}
- * of the given absolute path or null if no such resource exists.
- * @param absolutePath The absolute <code>IPath</code> of the resource.
- * @return The <code>IResource</code>.
- */
- public static IResource findResource ( IPath absolutePath )
- {
- if (absolutePath == null)
- {
- return null;
- }
-
- return FileResourceUtils.getWorkspaceRoot().findMember(absolutePath);
- }
-
- /**
- * Copies a file from a plugin's installation location
- * to an Eclipse folder.
- * @param plugin The plugin containing the files to copy.
- * Must not be null.
- * @param sourcePath The path, relative to the <code>plugin</code>
- * install location, containing the files to copy.
- * If null, then the plugin install location is the source path
- * (ie. null is equivalent to ".").
- * @param pathname The pathname of the file to copy.
- * The pathname is relative to the <code>plugin sourcePath</code>.
- * Must not be null.
- * @param targetPath The absolute Eclipse path of the folder to
- * which the file will be copied. The relative pathname of the
- * file is preserved.
- * Must not be null.
- * @param createFolders The intermediate folder creation policy, one of
- * {@link #CREATE CREATE} or {@link #DONT_CREATE DONT_CREATE}.
- * <ul>
- * <li><code>CREATE</code> -
- * If any intermediate folders in the given <code>absolutePath</code>
- * do not exist, they will be created.
- * <li><code>DONT_CREATE</code> -
- * If any intermediate folders in the given <code>absolutePath</code>
- * do not exist, the method will throw a <code>CoreException</code>.
- * </ul>
- * @param overwriteFile The policy for existing files, one of
- * {@link #OVERWRITE OVERWRITE} or {@link #DONT_OVERWRITE DONT_OVERWRITE}.
- * <ul>
- * <li><code>OVERWRITE</code> -
- * If a resource of the same name as the given
- * <code>absolutePath</code> already exists and is a file,
- * it will be replaced.
- * If the resource already exists and it is not a file,
- * then no file will be created and
- * a <code>CoreException</code> will be thrown.
- * <li><code>DONT_OVERWRITE</code> -
- * If any resource of the same name as the given
- * <code>absolutePath</code> already exists,
- * then no file will be created and
- * a <code>CoreException</code> will be thrown.
- * </ul>
- * @param progressMonitor The progress monitor for the operation, or null.
- * @throws CoreException An exception containing an
- * {@link org.eclipse.core.runtime.IStatus IStatus}
- * with a severity of <code>IStatus.ERROR</code> and a
- * locale-specific description of the cause.
- */
- static public void copyFile( ResourceContext resourceContext,
- Plugin plugin,
- IPath sourcePath,
- IPath pathname,
- IPath targetPath,
- IProgressMonitor progressMonitor,
- IStatusHandler statusMonitor )
- throws CoreException
- {
- try
- {
- IPath target = targetPath.append(pathname);
- IPath source = sourcePath == null ? pathname : sourcePath.append(pathname);
- InputStream input = plugin.openStream(source);
- createFile(resourceContext, target, input, progressMonitor, statusMonitor);
- }
- catch (IOException e)
- {
- throw new CoreException(new Status(IStatus.ERROR,
- plugin.getBundle().getSymbolicName(),
- 0,
- EnvironmentMessages.MSG_ERROR_IO,e));
- }
- }
-
- /**
- * Deletes a file under a container.
- * The container must already exist.
- * @param file - the IFile to be deleted
- * @param progressMonitor
- * @param statusMonitor
- * @return True if the file does not exist or if it exists and is successfully deleted. False otherwise.
- */
- public static boolean deleteFile( ResourceContext resourceContext,
- IFile file,
- IProgressMonitor progressMonitor,
- IStatusHandler statusMonitor)
- throws CoreException
- {
- if (file.exists())
- {
- if (!resourceContext.isOverwriteFilesEnabled())
- {
- IStatus status
- = StatusUtils.warningStatus( NLS.bind(EnvironmentMessages.MSG_ERROR_FILE_OVERWRITE_DISABLED,
- new Object[]{ file.getParent().getFullPath().toString(),
- file.getName()}) );
-
-
- Choice choice = statusMonitor.report( status, getThreeStateFileOptions() );
-
- if( choice.getShortcut() == 'C' ) return false;
-
- if( choice.getShortcut() == 'A' ) resourceContext.setOverwriteFilesEnabled(true);
- }
-
- //We have permission to overwrite so check if file is read-only
- if (file.isReadOnly())
- {
- if (!resourceContext.isCheckoutFilesEnabled())
- {
- IStatus status
- = StatusUtils.warningStatus( NLS.bind(EnvironmentMessages.MSG_ERROR_FILE_CHECKOUT_DISABLED,
- new Object[]{ file.getParent().getFullPath().toString(),
- file.getName()}) );
-
- Choice choice = statusMonitor.report( status, getThreeStateFileOptions() );
-
- if( choice.getShortcut() == 'C' ) return false;
-
- if( choice.getShortcut() == 'A' ) resourceContext.setCheckoutFilesEnabled(true);
- }
-
- IFile[] files = new IFile[1];
- files[0] = file;
- IStatus status = getWorkspace().validateEdit(files, null);
-
- if( status.getSeverity() == IStatus.ERROR )
- {
- statusMonitor.reportError( status );
- return false;
- }
- }
-
- file.delete(true, null);
- }
- //At this point, either the file did not exist or we successfully deleted
- // it. Return success.
- return true;
- }
-
- /**
- * Deletes a folder under a container.
- * @param folder - the IFolder to be deleted
- * @param progressMonitor
- * @param statusMonitor
- * @return True if the folder does not exist or if it exists and is successfully deleted along with its members. False otherwise.
- */
- public static boolean deleteFolder( ResourceContext resourceContext,
- IFolder folder,
- IProgressMonitor progressMonitor,
- IStatusHandler statusMonitor )
- throws CoreException
- {
- if (!folder.exists()) return true;
-
- boolean deleted = true;
- IResource[] resources = folder.members();
-
- for (int i=0; i<resources.length; i++)
- {
- IResource resource = resources[i];
- if (resource instanceof IFile)
- {
- deleted = deleteFile(resourceContext, (IFile)resource, progressMonitor, statusMonitor);
- }
- if (resource instanceof IFolder)
- {
- deleted = deleteFolder( resourceContext, (IFolder)resource, progressMonitor, statusMonitor);
- }
-
- if( !deleted ) break;
- }
-
- if( deleted )
- {
- folder.delete(true, true, null);
- return true;
- }
- else
- return false;
- }
-
- /**
- * Creates a file of the given <code>absolutePath</code>
- * and returns its handle as an <code>IFile</code>.
- * If the file cannot be created, a
- * <code>CoreException</code> containing an
- * <code>IStatus</code> object is thrown.
- * @param absolutePath The absolute path of the file to create.
- * The project at the beginning of the path must already exist,
- * that is, this method cannot be used to create projects.
- * @param progressMonitor The progress monitor for the operation, or null.
- * @return The {@link org.eclipse.core.resources.IFile IFile}
- * handle of the file.
- * @throws CoreException An exception containing an
- * {@link org.eclipse.core.runtime.IStatus IStatus}
- * with a severity of <code>IStatus.ERROR</code> and a
- * locale-specific description of the cause.
- */
- public static IFile createFile (
- ResourceContext resourceContext,
- IPath absolutePath,
- InputStream inputStream,
- IProgressMonitor progressMonitor,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- if (!absolutePath.isAbsolute())
- {
- throw new CoreException(new Status(IStatus.ERROR, "ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_NOT_ABSOLUTE,new Object[] {absolutePath.toString()}),null));
- }
- if (absolutePath.segmentCount() < 1)
- {
- throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_EMPTY,new Object[] {absolutePath.toString()}),null));
- }
- if (absolutePath.segmentCount() < 2)
- {
- throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_NOT_FOLDER,new Object[] {absolutePath.toString()}),null));
- }
- IContainer parent = makeFolderPath(resourceContext, absolutePath.removeLastSegments(1), progressMonitor, statusHandler);
- String fileName = absolutePath.lastSegment();
-
- return makeFile(resourceContext, parent, fileName, inputStream, progressMonitor, statusHandler);
- }
-
- /**
- * Creates under the given <code>project</code>
- * a file of the given <code>relativePath</code>
- * and returns its handle as an <code>IFile</code>.
- * If the file cannot be created, a
- * <code>CoreException</code> containing an
- * <code>IStatus</code> object is thrown.
- * @param absolutePath The absolute path of the file to create.
- * The project at the beginning of the path must already exist,
- * that is, this method cannot be used to create projects.
- * @param createFolders The intermediate folder creation policy, one of
- * {@link #CREATE CREATE} or {@link #DONT_CREATE DONT_CREATE}.
- * <ul>
- * <li><code>CREATE</code> -
- * If any intermediate folders in the given <code>absolutePath</code>
- * do not exist, they will be created.
- * <li><code>DONT_CREATE</code> -
- * If any intermediate folders in the given <code>absolutePath</code>
- * do not exist, the method will throw a <code>CoreException</code>.
- * </ul>
- * @param overwriteFile The policy for existing files, one of
- * {@link #OVERWRITE OVERWRITE} or {@link #DONT_OVERWRITE DONT_OVERWRITE}.
- * <ul>
- * <li><code>OVERWRITE</code> -
- * If a resource of the same name as the given
- * <code>absolutePath</code> already exists and is a file,
- * it will be replaced.
- * If the resource already exists and it is not a file,
- * then no file will be created and
- * a <code>CoreException</code> will be thrown.
- * <li><code>DONT_OVERWRITE</code> -
- * If any resource of the same name as the given
- * <code>absolutePath</code> already exists,
- * then no file will be created and
- * a <code>CoreException</code> will be thrown.
- * </ul>
- * @param progressMonitor The progress monitor for the operation, or null.
- * @return The {@link org.eclipse.core.resources.IFile IFile}
- * handle of the file.
- * @throws CoreException An exception containing an
- * {@link org.eclipse.core.runtime.IStatus IStatus}
- * with a severity of <code>IStatus.ERROR</code> and a
- * locale-specific description of the cause.
- */
- public static IFile createFile (
- ResourceContext resourceContext,
- IProject project,
- IPath relativePath,
- InputStream inputStream,
- IProgressMonitor progressMonitor,
- IStatusHandler statusMonitor )
-
- throws CoreException
- {
- IPath absolutePath = project.getFullPath().append(relativePath);
- return createFile(resourceContext, absolutePath, inputStream, progressMonitor, statusMonitor);
- }
-
- /**
- * Creates an output stream that can be used to write to the
- * given <code>file</code>. Actual changes to the workspace
- * may occur during creation of the stream, while writing to
- * the stream, or when the stream is closed.
- * A <code>CoreException</code> containing
- * an <code>IStatus</code> will be thrown
- * at some point in the lifecycle of the stream
- * if the file resource cannot be created.
- * @param file The {@link org.eclipse.core.resources.IFile IFile}
- * handle of the file resource to create. The project implied by the
- * pathname of the file must already exist,
- * that is, this method cannot be used to create projects.
- * @param progressMonitor The progress monitor for the operation, or null.
- * @return An <code>OutputStream</code> tied to the file resource.
- * Actual checks of or changes to the workspace may occur as early during
- * stream creation, closure, or any time in between.
- * @throws CoreException An exception containing an
- * {@link org.eclipse.core.runtime.IStatus IStatus}
- * with a severity of <code>IStatus.ERROR</code> and a
- * locale-specific description of the cause.
- * Reasons include:
- * <ol>
- * <li>The project of the given file's path does not exist.
- * <li>A non-file resource of the same name of the given file
- * already exists.
- * <li>A file resource of the same name of the given file
- * already exists, and <code>overwriteFile</code> is false.
- * <li>One or more intermediate folders to the given file
- * do not exist, and <code>createFolders</code> is false.
- * </ol>
- */
-
- public static OutputStream newFileOutputStream (
- ResourceContext context,
- IPath file,
- IProgressMonitor progressMonitor,
- IStatusHandler statusHandler )
-
- {
- return new FileResourceOutputStream(context, file, progressMonitor, statusHandler);
- }
-
- //----------------------------------------------------------------------
- // Naughty bits...
- //----------------------------------------------------------------------
-
- //
- // Creates a path of folders.
- // Do not call with an absolutePath of less than one segment.
- //
- /**
- * Creates a path of folders.
- * Do not call with an absolutePath of less than one segment.
- * @param resourceContext the resource context for making folders.
- * @param absolutePath the path of folders that will be created.
- * @param progressMonitor the progress monitor to be used.
- * @param statusHandler the status handler.
- * @return returns the IContainer of the created folder.
- */
- public static IContainer makeFolderPath (
- ResourceContext resourceContext,
- IPath absolutePath,
- IProgressMonitor progressMonitor,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- if (absolutePath.segmentCount() <= 1)
- {
- return getWorkspaceRoot().getProject(absolutePath.segment(0));
- }
- else
- {
- IContainer parent = makeFolderPath(resourceContext, absolutePath.removeLastSegments(1), progressMonitor, statusHandler );
- String folderName = absolutePath.lastSegment();
-
- checkParent( parent, absolutePath );
- return makeFolder(resourceContext, parent,folderName, progressMonitor , statusHandler );
- }
- }
-
- private static void checkParent( IContainer parent, IPath absolutePath ) throws CoreException
- {
- if( parent == null )
- {
- // The parent is null, so there must have been problems creating it. We will throw
- // a CoreException warning for this problem.
- IPath parentPath = absolutePath.removeLastSegments(1);
- String folderPath = absolutePath.lastSegment();
- throw new CoreException( StatusUtils.warningStatus(
- NLS.bind(EnvironmentMessages.MSG_ERROR_FOLDER_CREATION_DISABLED,
- new Object[]{ parentPath.toString(), folderPath} ) ) );
- }
- }
-
- //
- // Creates a folder under a container.
- // The container must already exist.
- //
- private static IFolder makeFolder (
- ResourceContext resourceContext,
- IContainer parent,
- String folderName,
- IProgressMonitor progressMonitor,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- IResource child = parent.findMember(folderName);
- Choice result = null;
-
- if( child == null )
- {
- if (!resourceContext.isCreateFoldersEnabled())
- {
- result = statusHandler.report(
- StatusUtils.warningStatus(
- NLS.bind(EnvironmentMessages.MSG_ERROR_FOLDER_CREATION_DISABLED,
- new Object[]{ parent.getFullPath().toString(), folderName} ) ),
- getThreeStateFileOptions() );
-
- if( result == null || result.getShortcut() == 'C' )
- {
- return null;
- }
- else if( result.getShortcut() == 'A' )
- {
- resourceContext.setCreateFoldersEnabled(true);
- }
- }
-
- IFolder folder = parent.getFolder(new Path(folderName));
- folder.create(true,true,null);
- return folder;
- }
- else if( child.getType() == IResource.FOLDER )
- {
- return (IFolder)child;
- }
- else
- {
- throw new CoreException(
- new Status( IStatus.ERROR,
- "ResourceUtils",
- 0,
- NLS.bind(EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FOLDER,
- new Object[]{ parent.getFullPath().append(folderName).toString() }),
- null ) );
- }
- }
-
- //
- // Creates a file under a container.
- // The container must already exist.
- //
- private static IFile makeFile (
- ResourceContext resourceContext,
- IContainer parent,
- String fileName,
- InputStream inputStream,
- IProgressMonitor progressMonitor,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- IResource child = parent.findMember(fileName);
- Choice result = null;
-
- if( child != null )
- {
- if( child.getType() == IResource.FILE )
- {
- if( !resourceContext.isOverwriteFilesEnabled() )
- {
- result = statusHandler.report(
- StatusUtils.warningStatus( NLS.bind(EnvironmentMessages.MSG_ERROR_FILE_OVERWRITE_DISABLED,
- new Object[] {parent.getFullPath().toString(),fileName}) ),
- getThreeStateFileOptions() );
-
- if( result == null || result.getShortcut() == 'C' )
- {
- return null;
- }
- else if( result.getShortcut() == 'A' )
- {
- resourceContext.setOverwriteFilesEnabled(true);
- }
- }
-
- //We have permission to overwrite so check if file is read-only
- if( child.getResourceAttributes().isReadOnly() )
- {
- if( !resourceContext.isCheckoutFilesEnabled() )
- {
- result = statusHandler.report(
- StatusUtils.errorStatus( NLS.bind(EnvironmentMessages.MSG_ERROR_FILE_CHECKOUT_DISABLED,
- new Object[]{ parent.getFullPath().toString(),fileName} ) ),
- getThreeStateFileOptions() );
-
- if( result == null || result.getShortcut() == 'C' )
- {
- return null;
- }
- else if( result.getShortcut() == 'A' )
- {
- resourceContext.setCheckoutFilesEnabled(true);
- }
- }
-
- IFile[] files = new IFile[1];
- files[0] = (IFile)child;
-
- IStatus status = getWorkspace().validateEdit(files,null);
-
- try
- {
- statusHandler.report( status );
- }
- catch( StatusException exc )
- {
- return null;
- }
- }
-
- //Change the contents of the existing file.
- IFile file = parent.getFile( new Path(fileName) );
- file.setContents( inputStream, true, true, null );
-
- return file;
-
- }
- else
- {
- throw new CoreException(
- new Status( IStatus.ERROR,
- "ResourceUtils",
- 0,
- NLS.bind(EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FILE,
- new Object[] {parent.getFullPath().append(fileName)}),
- null ) );
- }
- }
- else
- {
- //Create a new file.
- IFile file = parent.getFile( new Path(fileName) );
- file.create( inputStream, true, null);
-
- return file;
- }
- }
-
-
- /**
- * Creates a file of the given <code>absolutePath</code>
- * and returns its handle as an <code>IFile</code>.
- * If the file cannot be created, a
- * <code>CoreException</code> containing an
- * <code>IStatus</code> object is thrown.
- * @param absolutePath The absolute path of the file to create.
- * The project at the beginning of the path must already exist,
- * that is, this method cannot be used to create projects.
- * @param progressMonitor The progress monitor for the operation, or null.
- * @return The {@link org.eclipse.core.resources.IFile IFile}
- * handle of the file.
- * @throws CoreException An exception containing an
- * {@link org.eclipse.core.runtime.IStatus IStatus}
- * with a severity of <code>IStatus.ERROR</code> and a
- * locale-specific description of the cause.
- */
- public static IFile createFileAtLocation (
- ResourceContext resourceContext,
- IPath absolutePath,
- InputStream inputStream,
- IProgressMonitor progressMonitor,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- if (!absolutePath.isAbsolute())
- {
- throw new CoreException(new Status(IStatus.ERROR, "ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_NOT_ABSOLUTE,new Object[] {absolutePath.toString()}),null));
- }
- if (absolutePath.segmentCount() < 1)
- {
- throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_EMPTY,new Object[] {absolutePath.toString()}),null));
- }
- if (absolutePath.segmentCount() < 2)
- {
- throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,NLS.bind(EnvironmentMessages.MSG_ERROR_PATH_NOT_FOLDER,new Object[] {absolutePath.toString()}),null));
- }
- IContainer parent = makeFolderPathAtLocation(resourceContext, absolutePath.removeLastSegments(1), progressMonitor, statusHandler);
- String fileName = absolutePath.lastSegment();
-
- checkParent( parent, absolutePath );
-
- return makeFile(resourceContext, parent, fileName, inputStream, progressMonitor, statusHandler);
- }
-
-/**
- * Creates a path of folders using absolute filenames.
- * Do not call with an absolutePath of less than one segment.
- * @param resourceContext the resource context for making folders.
- * @param resource the resource that will be created.
- * @param progressMonitor the progress monitor to be used.
- * @param statusHandler the status handler.
- * @return returns the IContainer of the created folder.
- */
- public static IContainer makeFolderPathAtLocation (
- ResourceContext resourceContext,
- IContainer resource,
- IProgressMonitor progressMonitor,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- if (resource.exists())
- {
- if (resource instanceof IContainer)
- {
- return (IContainer) resource;
- }
- else
- {
- throw new CoreException(
- new Status( IStatus.ERROR,
- "ResourceUtils",
- 0,
- NLS.bind(EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FOLDER,
- new Object[]{ resource.getFullPath().toString() }),
- null ) );
- }
- }
- else
- {
- IContainer parent = makeFolderPathAtLocation(resourceContext, resource.getParent(), progressMonitor, statusHandler );
- String folderName = resource.getName();
-
- return makeFolder(resourceContext, parent, folderName, progressMonitor , statusHandler );
- }
- }
-
- /**
- * Creates a path of folders.
- * Do not call with an absolutePath of less than one segment.
- * @param resourceContext the resource context for making folders.
- * @param absolutePath the path of folders that will be created.
- * @param progressMonitor the progress monitor to be used.
- * @param statusHandler the status handler.
- * @return returns the IContainer of the created folder.
- */
- public static IContainer makeFolderPathAtLocation (
- ResourceContext resourceContext,
- IPath absolutePath,
- IProgressMonitor progressMonitor,
- IStatusHandler statusHandler )
-
- throws CoreException
- {
- return makeFolderPathAtLocation(resourceContext,
- getWorkspaceRoot().getContainerForLocation(absolutePath),
- progressMonitor, statusHandler);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java
deleted file mode 100644
index b74ea9575..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
- * This class contains some useful string utilities that are not provided by
- * either String or StringBuffer.
- *
- * @author Peter Moogk
- * @date July 13, 2000
-**/
-public final class StringUtils
-{
- /**
- * The platform-specific line separator.
- */
- public static final String NEWLINE = System.getProperty("line.separator");
-
- private StringUtils(){};
-
- /**
- * This method splits a single line of text into multiple lines
- * based on a maximum line length. The method will try to fit as
- * many words as possible onto a line without exceeding the maximum
- * line length. Note: the only case where a line might exceed the
- * maximum is if a single word is longer than the maximum.
- * @param text a single line a text that is to be split.
- * @param max_length the maximum length of each split line.
- * @return a string array of the split lines.
- **/
- public static String[] splitter( String text, int max_length )
- {
- Vector return_text = new Vector(20);
- String[] return_str;
- int index = 0;
-
- while( index < text.length() )
- {
- String str = text.substring( index, Math.min( max_length + index,
- text.length() ) );
- int space_index = str.lastIndexOf( " " );
-
- if( index + str.length() < text.length() &&
- text.charAt( index + str.length() - 1 ) != ' ' &&
- text.charAt( index + str.length() ) != ' ' &&
- space_index != -1 )
- {
- return_text.addElement( str.substring( 0, space_index ) );
- index += space_index + 1;
- }
- else
- {
- return_text.addElement( str.trim() );
- index += str.length();
- }
- }
-
- return_str = new String[return_text.size()];
-
- for( index = 0; index < return_text.size(); index++ )
- {
- return_str[index] = (String)(return_text.elementAt(index));
- }
-
- return return_str;
- }
-
- /**
- * This method returns a string with a repeated number of characters.
- * @param the_char the character to be repeated.
- * @param count the number of time this character should be repeated.
- * @return the resulting string of repeated characters.
- **/
- static public String repeat( char the_char, int count )
- {
- StringBuffer buf = new StringBuffer( count );
-
- for( int index = 0; index < count; index++ )
- {
- buf.append( the_char );
- }
-
- return buf.toString();
- }
-
- /**
- * This method flattens an array of arguments to a string.
- * The method respects embedded whitespace and quotes.
- * <ul>
- * <li>Any argument with embedded whitespace will be flattened out
- * with enclosing quotes. For example, the single argument
- * <u>Hello World</u>
- * will be returned as
- * <u>"Hello World"</u>.
- * <li>Any argument with quotes will be flattened out with the
- * quotes escaped. For example, the single argument
- * <u>"Happy days"</u>
- * will be returned as
- * <u>\"Happy days\"</u>.
- * </ul>
- * @param arguments The array of strings to flatten.
- * @return the flattened string.
- */
- static public String flattenArguments ( String[] arguments )
- {
- StringBuffer buf = new StringBuffer();
-
- for (int i=0; i<arguments.length; i++)
- {
- //
- // Append a separator (except the first time).
- //
- if (i > 0) buf.append(' ');
-
- //
- // Look for whitespace.
- //
- boolean whitespace = false;
- char[] chars = arguments[i].toCharArray();
- for (int j=0; !whitespace && j<chars.length; j++)
- {
- if (Character.isWhitespace(chars[j]))
- {
- whitespace = true;
- }
- }
-
- //
- // Append the argument, quoted as necessary.
- //
- if (whitespace) buf.append('"');
- for (int j=0; j<chars.length; j++)
- {
- if (chars[j] == '"') buf.append('\\');
- buf.append(chars[j]);
- }
- if (whitespace) buf.append('"');
- }
-
- return buf.toString();
- }
-
- /**
- * This method parses whitespace-delimitted filenames from
- * the given <code>input</code> stream. <b>Limitation:</b>
- * Quoted filenames or filenames with embedded whitespace
- * are not currently supported.
- * @param input The input stream.
- * @return An enumeration of filenames from the stream.
- */
- static public Enumeration parseFilenamesFromStream ( InputStream input )
- throws IOException
- {
- Vector filenames = new Vector(64,64);
- StringBuffer buffer = null;
- byte state = STATE_WS;
- int ic = input.read();
- while (ic >= 0)
- {
- char c = (char)ic;
- switch (state)
- {
- case STATE_WS:
- if (!Character.isWhitespace(c))
- {
- buffer = new StringBuffer();
- buffer.append(c);
- state = STATE_NWS;
- }
- break;
- case STATE_NWS:
- if (!Character.isWhitespace(c))
- {
- buffer.append(c);
- }
- else
- {
- String filename = buffer.toString();
- filenames.add(filename);
- buffer = null;
- state = STATE_WS;
- }
- break;
- default:
- break;
- }
- ic = input.read();
- }
- return filenames.elements();
- }
-
- private static final byte STATE_WS = 0;
- private static final byte STATE_NWS = 1;
-
-
- /**
- * Returns true is the type passed in is a primtive java type
- * @param class name String
- * @return true is primitive type
- */
- public static boolean isPrimitiveType(String typeName)
- {
-
- if (typeName.equalsIgnoreCase("boolean") ||
- typeName.equalsIgnoreCase("byte") ||
- typeName.equalsIgnoreCase("double") ||
- typeName.equalsIgnoreCase("float") ||
- typeName.equalsIgnoreCase("int") ||
- typeName.equalsIgnoreCase("long") ||
- typeName.equalsIgnoreCase("short") ||
- typeName.equalsIgnoreCase("char"))
- return true;
- return false;
-
- }
-
- /**
- * The method replace the characters that are allowed in URIs
- * and not allowed in Java class names to an underscore ('_')
- * @param URI String
- * @return valid Java class name String
- */
- public static String URI2ClassName( String uri ) {
- String className = uri;
- for ( int i = 0; i < URI_SYMBOLS.length; i++ ) {
- className = className.replace ( URI_SYMBOLS[i], UNDERSCORE );
- }
- return className;
- }
-
- /**
- * Creates and array of strings containing the exception traceback information of
- * a Throwable. This is the same traceback data that is displayed by exc.printStackTrace().
- * @param exc the exception
- * @return a string array of the traceback information.
- */
- public static String[] getStackTrace( Throwable exc )
- {
- Vector lines = new Vector();
- StringWriter stringWriter = new StringWriter();
- PrintWriter printWriter = new PrintWriter( stringWriter );
-
- exc.printStackTrace( printWriter );
-
- try
- {
- printWriter.close();
- stringWriter.close();
- }
- catch( Exception nestedExc )
- {
- return new String[0];
- }
-
- StringReader stringReader = new StringReader( stringWriter.toString() );
- BufferedReader reader = new BufferedReader( stringReader );
- String line = null;
-
- try
- {
- line = reader.readLine();
-
- while( line != null )
- {
- lines.add( line.trim() );
- line = reader.readLine();
- }
- }
- catch( Exception nestedExc )
- {
- return new String[0];
- }
-
- return (String[])lines.toArray( new String[0] );
- }
-
- private static final char[] URI_SYMBOLS = {'-', '~', '#', '/', '.'};
- private static final char UNDERSCORE = '_';
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
deleted file mode 100644
index d3d51ef35..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class WaitForAutoBuildCommand extends AbstractDataModelOperation
-{
- public IStatus execute( IProgressMonitor montitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- try
- {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
- }
- catch( InterruptedException exc )
- {
- // UISynchronizer.syncExec seems to interrupt the UI tread when the autobuilder is done. Not sure, why.
- // I'm assuming here that the autobuilder has actually completed its stuff.
- }
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java
deleted file mode 100644
index 7eda9dc6f..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070522 184006 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.context;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-
-
-public class ActionDialogPreferenceTypeRegistry
-{
- private Vector preferences_;
-
- private static ActionDialogPreferenceTypeRegistry registry_;
-
- private ActionDialogPreferenceTypeRegistry()
- {
- preferences_ = new Vector();
-
- loadDialogsPreferences();
- }
-
- static public ActionDialogPreferenceTypeRegistry getInstance()
- {
- if( registry_ == null )
- {
- registry_ = new ActionDialogPreferenceTypeRegistry();
- }
-
- return registry_;
- }
-
- //
- private void loadDialogsPreferences ()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor( "org.eclipse.wst.command.env",
- "actionDialogPreferenceType");
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- ActionDialogPreferenceType dialog = new ActionDialogPreferenceType();
-
- dialog.setId( elem.getAttribute("id") );
- dialog.setName( elem.getAttribute("name") );
- dialog.setInfopop( elem.getAttribute("infopop") );
- dialog.setTooltip( elem.getAttribute("tooltip") );
- dialog.setCategory( elem.getAttribute("category") );
-
- String showCheckbox = elem.getAttribute( "showcheckbox" );
- String alwaysHide = elem.getAttribute( "alwayshide" );
-
- dialog.setShowCheckbox( showCheckbox == null ? true : showCheckbox.equals( "true" ) );
- dialog.setAlwaysHide( alwaysHide == null ? false : alwaysHide.equals( "true" ) );
-
- setObjectIds( elem.getAttribute( "objectids" ), dialog );
-
- preferences_.add(dialog);
- }
- }
-
- private void setObjectIds( String idList, ActionDialogPreferenceType dialog )
- {
- if( idList != null )
- {
- String[] ids = idList.split( " " );
-
- for( int index = 0; index < ids.length; index++ )
- {
- dialog.addObjectId( ids[index] );
- }
- }
- }
-
- /**
- * Returns all registered <code>WebServiceType</code> objects.
- * @return All registered <code>WebServiceType</code> objects.
- */
- public ActionDialogPreferenceType[] getActionDialogsPrefrences ()
- {
- return (ActionDialogPreferenceType[])preferences_.toArray( new ActionDialogPreferenceType[0]);
- }
-
- public ActionDialogPreferenceType getActionDialogsPrefrence( String id )
- {
- int length = preferences_.size();
- ActionDialogPreferenceType result = null;
-
- for( int index = 0; index < length; index++ )
- {
- ActionDialogPreferenceType preference = (ActionDialogPreferenceType)preferences_.elementAt( index );
-
- if( preference.getObjectIds().contains( id ) )
- {
- result = preference;
- break;
- }
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java
deleted file mode 100644
index 7d2a61c82..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070522 184006 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-
-
-public class PersistentActionDialogsContext extends PersistentContext
-{
- private ActionDialogPreferenceTypeRegistry registry;
-
- private static PersistentActionDialogsContext instance_ = null;
-
- private PersistentActionDialogsContext()
- {
- super(EnvPlugin.getInstance());
- }
-
- static public PersistentActionDialogsContext getInstance()
- {
- if( instance_ == null )
- {
- instance_ = new PersistentActionDialogsContext();
- instance_.load();
- }
-
- return instance_;
- }
-
- public void load()
- {
- registry = ActionDialogPreferenceTypeRegistry.getInstance();
- ActionDialogPreferenceType[] dialogs = registry.getActionDialogsPrefrences();
-
- for (int i = 0; i < dialogs.length; i++)
- {
- setDefault(dialogs[i].getId(), false);
- }
- }
-
- public ActionDialogPreferenceType[] getDialogs()
- {
- return registry.getActionDialogsPrefrences();
- }
-
- public void setActionDialogEnabled(String id, boolean value)
- {
- setValue(id, value);
- }
-
- // This method is usually called from the popup wizard with the Id
- // of the ObjectContribution defining the popup.
- public void setObjectActionDialogEnabled( String id, boolean value )
- {
- // Need to first find the dialog object that references the popup.
- ActionDialogPreferenceType dialog = registry.getActionDialogsPrefrence( id );
-
- if( dialog != null )
- {
- setActionDialogEnabled( dialog.getId(), value );
- }
- }
-
- public boolean isActionDialogEnabled(String id)
- {
- if (id == null) return true;
- return getValueAsBoolean(id);
- }
-
- public boolean showDialog( String id )
- {
- ActionDialogPreferenceType dialog = registry.getActionDialogsPrefrence( id );
-
- // We are trying to determine if the popup wizard should be displayed
- // or not with this logic. If the dialog variable is null then
- // there was no popup extension point point defined for this wizard. In
- // this case we will assume that the popup should always be displayed.
- // In the case where the extension says that the show check box control
- // should be displayed we need to ensure that wizard should not always
- // be hidden, as well we need to check the current setting of the check
- // box via the isActionDialogEnabled call. If the show check box state
- // defined in the extension is false, but always hide is also false then
- // we will display the pop wizard.
- return dialog == null ||
- ( ( dialog.getShowCheckbox() &&
- !dialog.getAlwaysHide() &&
- !isActionDialogEnabled( dialog.getId()) ) ||
- ( !dialog.getShowCheckbox() &&
- !dialog.getAlwaysHide() ) );
- }
-
- public boolean showCheckbox( String id )
- {
- ActionDialogPreferenceType dialog = registry.getActionDialogsPrefrence( id );
-
- return dialog == null ? false : dialog.getShowCheckbox();
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java
deleted file mode 100644
index faa5bd15c..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.command.internal.env.core.context.Context;
-
-/**
- * This class is used as the base class for types that what to persist preference
- * data in the plugin preferences area.
- *
- *
- */
-public abstract class PersistentContext implements Context
-{
- protected Preferences preferences_;
- protected Plugin plugin_;
-
- public PersistentContext ( Plugin plugin)
- {
- plugin_ = plugin;
- preferences_ = plugin.getPluginPreferences();
- }
-
- /**
- * Sets the default for a boolean preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setDefault (String name, boolean value) {
- preferences_.setDefault(name, value);
- }
-
- /**
- * Sets the default for a string preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setDefault (String name, String value) {
- preferences_.setDefault(name,value);
- }
-
- /**
- * Sets the default for a int preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setDefault (String name, int value) {
- preferences_.setDefault(name,value);
- }
-
- /**
- * Sets the value for a string preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setValue (String name, String value) {
- preferences_.setValue(name,value);
- plugin_.savePluginPreferences();
- }
-
- /**
- * Sets the value for a boolean preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setValue (String name, boolean value) {
- preferences_.setValue(name, value);
- plugin_.savePluginPreferences();
- }
-
- /**
- * Sets the value for a int preference.
- * @param name the preference name.
- * @param value the preference value.
- */
- public void setValue (String name, int value) {
- preferences_.setValue(name, value);
- plugin_.savePluginPreferences();
- }
-
- /**
- * Gets the value for a string preference.
- * @param name the preference name.
- * @return the preference value.
- */
- public String getValueAsString ( String name) {
- return preferences_.getString(name);
- }
-
- /**
- * Gets the value for a boolean preference.
- * @param name the preference name.
- * @return the preference value.
- */
- public boolean getValueAsBoolean ( String name) {
- return preferences_.getBoolean(name);
- }
-
- /**
- * Gets the value for a int preference.
- * @param name the preference name.
- * @return the preference value.
- */
- public int getValueAsInt( String name) {
- return preferences_.getInt(name);
- }
-
- /**
- * Gets the default value for a string preference.
- * @param name the preference name.
- * @return the default preference value.
- */
- public String getDefaultString(String name)
- {
- return preferences_.getDefaultString(name);
- }
-
- /**
- * Gets the default value for a boolean preference.
- * @param name the preference name.
- * @return the default preference value.
- */
- public boolean getDefaultBoolean(String name)
- {
- return preferences_.getDefaultBoolean(name);
- }
-
- /**
- * Gets the default value for a int preference.
- * @param name the preference name.
- * @return the default preference value.
- */
- public int getDefaultInt(String name)
- {
- return preferences_.getDefaultInt(name);
- }
-
- /**
- * Sets the default value for a string preference if a default value has
- * not already been set.
- * @param name the preference name.
- * @param value the default preference value
- */
- public void setDefaultStringIfNoDefault( String key, String value )
- {
- // If the key already has a default value we don't want to override it.
- if( preferences_.getDefaultString( key ).equals("") )
- {
- preferences_.setDefault( key, value );
- }
- }
-
- /**
- * Sets the default value for a boolean preference if a default value has
- * not already been set.
- * @param name the preference name.
- * @param value the default preference value
- */
- public void setDefaultBooleanIfNoDefault( String key, boolean value )
- {
- // If the key already has a default value we don't want to override it.
- if( preferences_.getDefaultString( key ).equals("") )
- {
- preferences_.setDefault( key, value );
- }
- }
-
- /**
- * Sets the default value for a int preference if a default value has
- * not already been set.
- * @param name the preference name.
- * @param value the default preference value
- */
- public void setDefaultIntIfNoDefault( String key, int value )
- {
- // If the key already has a default value we don't want to override it.
- if( preferences_.getDefaultString( key ).equals("") )
- {
- preferences_.setDefault( key, value );
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java
deleted file mode 100644
index b2fb4bc64..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.context.ResourceDefaults;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-
-
-public class PersistentResourceContext extends PersistentContext implements ResourceContext
-{
- private static PersistentResourceContext context_ = null;
-
- public static PersistentResourceContext getInstance()
- {
- if( context_ == null )
- {
- context_ = new PersistentResourceContext();
- context_.load();
- }
-
- return context_;
- }
-
- private PersistentResourceContext()
- {
- super(EnvPlugin.getInstance());
- }
-
- public void load()
- {
- setDefault(PREFERENCE_OVERWRITE, ResourceDefaults
- .getOverwriteFilesDefault());
- setDefault(PREFERENCE_CREATE_FOLDERS, ResourceDefaults
- .getCreateFoldersDefault());
- setDefault(PREFERENCE_CHECKOUT, ResourceDefaults.getCheckoutFilesDefault());
- }
-
- public void setOverwriteFilesEnabled(boolean enable)
- {
- setValue(PREFERENCE_OVERWRITE, enable);
- }
-
- public boolean isOverwriteFilesEnabled()
- {
- return getValueAsBoolean(PREFERENCE_OVERWRITE);
- }
-
- public void setCreateFoldersEnabled(boolean enable)
- {
- setValue(PREFERENCE_CREATE_FOLDERS, enable);
- }
-
- public boolean isCreateFoldersEnabled()
- {
- return getValueAsBoolean(PREFERENCE_CREATE_FOLDERS);
- }
-
- public void setCheckoutFilesEnabled(boolean enable)
- {
- setValue(PREFERENCE_CHECKOUT, enable);
- }
-
- public boolean isCheckoutFilesEnabled()
- {
- return getValueAsBoolean(PREFERENCE_CHECKOUT);
- }
-
- public ResourceContext copy()
- {
- ResourceContext cc = new TransientResourceContext();
- cc.setOverwriteFilesEnabled(isOverwriteFilesEnabled());
- cc.setCreateFoldersEnabled(isCreateFoldersEnabled());
- cc.setCheckoutFilesEnabled(isCheckoutFilesEnabled());
- return cc;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/AccumulateStatusHandler.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/AccumulateStatusHandler.java
deleted file mode 100644
index 2c030f443..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/AccumulateStatusHandler.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070510 180567 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.eclipse;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-
-public class AccumulateStatusHandler extends BaseStatusHandler{
-
- ArrayList statusList_ = null;
- ArrayList errorList_ = null;
- ArrayList warningList_ = null;
-
- /**
- * Constructor
- */
- public AccumulateStatusHandler(){
- resetStatus();
- }
-
- /**
- * Constructor for reloading status values and using the utility methods
- */
- public AccumulateStatusHandler(IStatus[] status){
- resetStatus();
- for (int i=0;i<status.length;i++)
- statusList_.add(status[i]);
- }
-
- public IStatus getStatus() {
- IStatus worstStatus = Status.OK_STATUS;
-
- // Find the worst error status code
- for( int index = 0; index < statusList_.size(); index++ )
- {
- IStatus status = (IStatus)statusList_.get( index );
-
- if( status.getSeverity() > worstStatus.getSeverity() )
- {
- worstStatus = status;
- }
- }
-
- return worstStatus;
- }
-
- public void resetStatus() {
- statusList_ = new ArrayList();
- errorList_ = null;
- warningList_ = null;
- }
-
- public void report(IStatus status) throws StatusException {
- statusList_.add(status);
- }
-
- public Choice report(IStatus status, Choice[] choices) {
- Choice result = null;
-
- // Always take the first choice if available.
- if( choices != null && choices.length > 0 )
- {
- result = choices[0];
- }
-
- statusList_.add( status );
-
- return result;
- }
-
- public void reportError(IStatus status) {
- statusList_.add(status);
- }
-
- public void reportInfo(IStatus status) {
- statusList_.add(status);
- }
-
- /**
- * For use by assertion methods
- * @return IStatus[]
- */
- public IStatus[] getAllReports(){
- if (statusList_==null || statusList_.isEmpty()){
- return new IStatus[]{Status.OK_STATUS};
- }
- return (IStatus[])statusList_.toArray(new IStatus[0]);
- }
-
- /**
- * Get error statuses only
- * @return IStatus[]
- */
- public IStatus[] getErrorReports(){
- if (errorList_==null)
- sortReports();
- return (IStatus[])errorList_.toArray(new IStatus[0]);
- }
-
- /**
- * Get warning statuses only
- * @return IStatus[]
- */
- public IStatus[] getWarningReports(){
- if (warningList_==null)
- sortReports();
- return (IStatus[])warningList_.toArray(new IStatus[0]);
- }
-
- /**
- * Sort all status reports
- */
- private void sortReports(){
- errorList_ = new ArrayList();
- warningList_ = new ArrayList();
-
- // Sort according to error status code
- for( int index = 0; index < statusList_.size(); index++ )
- {
- IStatus status = (IStatus)statusList_.get(index);
-
- if( status.getSeverity()== IStatus.ERROR){
- errorList_.add(status);
- }
- else if (status.getSeverity()==IStatus.WARNING){
- warningList_.add(status);
- }
- }
-
-
- }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java
deleted file mode 100644
index e30a43016..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.eclipse;
-
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
- * This interface adds resources to the base IEnvironment.
- */
-public interface BaseEclipseEnvironment extends IEnvironment
-{
- /**
- *
- * @return returns a ResourceContext object for this environment.
- */
- public ResourceContext getResourceContext();
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseStatusHandler.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseStatusHandler.java
deleted file mode 100644
index 7959c4e49..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseStatusHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.eclipse;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-
-public class BaseStatusHandler implements IEclipseStatusHandler
-{
- private IStatus worstStatus = Status.OK_STATUS;
-
- public IStatus getStatus()
- {
- return worstStatus;
- }
-
- public void resetStatus()
- {
- worstStatus = Status.OK_STATUS;
- }
-
- public void report(IStatus status) throws StatusException
- {
- checkStatus(status);
- }
-
- public Choice report(IStatus status, Choice[] choices)
- {
- checkStatus(status);
- return choices == null || choices.length == 0? null : choices[0];
- }
-
- public void reportError(IStatus status)
- {
- checkStatus(status);
- }
-
- public void reportInfo(IStatus status)
- {
- checkStatus(status);
- }
-
- protected void checkStatus( IStatus status )
- {
- if( status.getSeverity() > worstStatus.getSeverity() )
- {
- worstStatus = status;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EclipseEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EclipseEnvironment.java
deleted file mode 100644
index 78655b6fd..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EclipseEnvironment.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.eclipse;
-
-import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.environment.uri.SimpleURIFactory;
-import org.eclipse.wst.common.environment.uri.IURIFactory;
-import org.eclipse.wst.common.environment.uri.IURIScheme;
-
-
-/**
- * This class implements an IEnvironment class for the Eclipse IEnvironment.
- * This IEnvironment currently supports the "platform" protocol and the "file"
- * protocol.
- *
- */
-public class EclipseEnvironment implements BaseEclipseEnvironment
-{
- private CommandManager commandManager_ = null;
- private SimpleURIFactory uriFactory_ = null;
- private ResourceContext resourceContext_ = null;
- private IStatusHandler statusHandler_ = null;
- private ILog logger_ = null;
-
- public EclipseEnvironment( CommandManager commandManager,
- ResourceContext resourceContext,
- IStatusHandler statusHandler )
- {
- IURIScheme eclipseScheme = EnvironmentService.getEclipseScheme();
- IURIScheme fileScheme = EnvironmentService.getFileScheme();
-
- commandManager_ = commandManager;
- resourceContext_ = resourceContext;
- uriFactory_ = new SimpleURIFactory();
- statusHandler_ = statusHandler;
-
- uriFactory_.registerScheme( "platform", eclipseScheme );
- uriFactory_.registerScheme( "file", fileScheme );
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getCommandManager()
- */
- public CommandManager getCommandManager()
- {
- return commandManager_;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getLog()
- */
- public ILog getLog()
- {
- if( logger_ == null )
- {
- logger_ = EnvironmentService.getEclipseLog();
- };
-
- return logger_;
- }
-
- /**
- *
- * @param logger the new logger for this environment.
- */
- public void setLog( ILog logger )
- {
- logger_ = logger;
- }
-
- /**
- * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getStatusHandler()
- */
- public IStatusHandler getStatusHandler()
- {
- return statusHandler_;
- }
-
- /** (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getURIFactory()
- */
- public IURIFactory getURIFactory()
- {
- return uriFactory_;
- }
-
- /**
- * @return returns a ResourceContext for this IEnvironment.
- */
- public ResourceContext getResourceContext()
- {
- return resourceContext_;
- }
-
- public void setCommandManager( CommandManager manager )
- {
- commandManager_ = manager;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EnvironmentManager.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EnvironmentManager.java
deleted file mode 100644
index 354216577..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/EnvironmentManager.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.eclipse;
-
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-
-public class EnvironmentManager
-{
- /**
- * Returns a new instance of an IEnvironment for the Eclipse non-GUI.
- */
- public static BaseEclipseEnvironment getNewEnvironment()
- {
- PersistentResourceContext context = PersistentResourceContext.getInstance();
- IEclipseStatusHandler handler = new BaseStatusHandler();
- EclipseEnvironment environment = new EclipseEnvironment( null, context, handler );
-
- return environment;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/IEclipseStatusHandler.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/IEclipseStatusHandler.java
deleted file mode 100644
index 4d8098708..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/IEclipseStatusHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070314 176886 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.eclipse;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-public interface IEclipseStatusHandler extends IStatusHandler
-{
- /**
- *
- * @return returns the worst status that has been reported.
- */
- public IStatus getStatus();
-
- /**
- * Resets the worst status reported to be OK.
- *
- */
- public void resetStatus();
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java
deleted file mode 100644
index 69e10705d..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EnvPlugin extends Plugin {
-
- //The shared instance.
- private static EnvPlugin instance;
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.wst.command.env";
-
- /**
- * The constructor.
- */
- public EnvPlugin() {
- super();
- instance = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static EnvPlugin getInstance() {
- return instance;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java
deleted file mode 100644
index bdf1c1633..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070522 184006 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.preferences;
-
-import java.util.HashSet;
-
-/**
- * This class is used to define preference ids. It corresponds to information
- * specified by a actionDialogPreferenceType extension point.
- * Each actionDialogPreferenceType entry will result in an entry in the
- * action dialogs preference page if the showcheckbox field is true.
- *
- * Here is an example of this extension point.
- *
- * <pre>
- * &lt;extension
- * point="org.eclipse.wst.command.env.actionDialogPreferenceType"&gt;
- * &lt;actionDialogPreferenceType
- * showcheckbox="true"
- * name="%CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG"
- * category="org.eclipse.jst.wss.popup.category"
- * tooltip="%TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY"
- * infopop="org.eclipse.jst.ws.consumption.ui.PPAD0004"
- * objectids="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard.file"
- * alwayshide="false"
- * id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- * &lt;/actionDialogPreferenceType&gt;
- * </pre>
- *
- * This actionDialogPreferenceType extension point is associated with an ObjectContribution
- * extension point. For example:
- *
- * <objectContribution
- * objectClass="org.eclipse.core.resources.IFile"
- * nameFilter="*.wsdl"
- * id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard.file">
- * <!-- WSDL To Java Bean Proxy -->
- * <action
- * label="%ACTION_GENERATE_JAVA_PROXY"
- * class="org.eclipse.wst.command.env.ui.widgets.popup.DynamicPopupWizard"
- * menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- * id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard">
- * </action>
- * </objectContribution>
- *
- * The ObjectContribution entry is linked with the actionDialogPreferenceType entry
- * via the id attribute of the ObjectContirbution and the id attribute of actionDialogPreferenceType.
- * Note: the id in the action entry is always associated with the dynamic wizard that
- * should be popuped up. In the example above the ObjectionContribution id and the
- * action ids are the same, but this need not be the case.
- */
-public class ActionDialogPreferenceType
-{
- private String id_;
- private String name_;
- private String infopop_;
- private String tooltip_;
- private boolean showCheckbox_;
- private boolean alwaysHide_;
- private String category_;
- private HashSet objectIds_ = new HashSet();
-
- public HashSet getObjectIds()
- {
- return objectIds_;
- }
-
- public void addObjectId( String id )
- {
- objectIds_.add( id );
- }
-
- /**
- * Sets the id for this popup action. This id link the actionDialogPreference
- * with an ObjectContribution.
- * @param id the id.
- */
- public void setId(String id)
- {
- id_ = id;
- }
-
- /**
- * Gets the id for this popup action.
- * @return the id.
- */
- public String getId()
- {
- return id_;
- }
-
- /**
- * Sets the name for this popup action. This name is displayed on the
- * dialog preferences page and must be translated.
- * @param name the name of the popup check box.
- */
- public void setName(String name)
- {
- name_ = name;
- }
-
- /**
- * Gets the display value for this popup check box.
- * Note: this value may be null if the getShowCheckBox method returns false.
- * @return the name.
- */
- public String getName()
- {
- return name_;
- }
-
- /**
- * Sets the info pop value for this popup check box.
- * @param infopop
- */
- public void setInfopop(String infopop)
- {
- infopop_ = infopop;
- }
-
- /**
- * Gets the info pop value for this popup check box.
- * Note: this value may be null if the getShowCheckBox method returns false.
- *
- * @return the infopop value.
- */
- public String getInfopop()
- {
- return infopop_;
- }
-
- /**
- * Sets the tooltip value for this popup check box.
- * @param tooltip
- */
- public void setTooltip(String tooltip)
- {
- tooltip_ = tooltip;
- }
-
- /**
- * Gets the tooltip value for this popup check box.
- * Note: this value may be null if the getShowCheckBox method returns false.
- *
- * @return the tooltip value.
- */
- public String getTooltip()
- {
- return tooltip_;
- }
-
- /**
- * Sets the show check box value for this popup. If the value is true then
- * this popup will appear on an action dialogs preference page. Also if this
- * value is true and the always hide value is false then a check box will be displayed
- * on the first page of this popup which asks the user if they want the popup
- * to be displayed the next time are to just execute the popup action.
- * @param value the show check box value.
- */
- public void setShowCheckbox( boolean value )
- {
- showCheckbox_ = value;
- }
-
- /**
- * Gets the show check box value.
- * @return the show check box value.
- */
- public boolean getShowCheckbox()
- {
- return showCheckbox_;
- }
-
- /**
- * Sets the always hide value. This value specifies that the popup should always
- * be executed without bringing up the popup wizard.
- * @param value the always hide value.
- */
- public void setAlwaysHide( boolean value )
- {
- alwaysHide_ = value;
- }
-
- /**
- *
- * @return returns the always hide value.
- */
- public boolean getAlwaysHide()
- {
- return alwaysHide_;
- }
-
- /**
- * Sets the category id for popup action. All popup actions with the same
- * category id will be grouped together on the same popup action preference page.
- * @param value the category.
- */
- public void setCategory( String value )
- {
- category_ = value;
- }
-
- /**
- *
- * @return the category id.
- */
- public String getCategory()
- {
- return category_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/.classpath b/bundles/org.eclipse.wst.ws.explorer/.classpath
deleted file mode 100644
index 2a93ce86c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="wsexplorer-properties"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.ws.explorer/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/.cvsignore
deleted file mode 100644
index 80aae3b94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-bin
-build
-webapps
-temp.folder
-build.xml
-*.war
-explorersrc.zip
-javaCompiler.*.args
-*.jar
diff --git a/bundles/org.eclipse.wst.ws.explorer/.project b/bundles/org.eclipse.wst.ws.explorer/.project
deleted file mode 100644
index 9621998fa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.ws.explorer</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4e68f51eb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Dec 22 19:56:34 EST 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7e1612242..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-#Wed Jun 06 14:32:37 EDT 2007
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 1300f7816..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 03 00:32:02 EDT 2005
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 5c1e93a91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 30 10:40:04 EST 2006
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e57c44d9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.explorer; singleton:=true
-Bundle-Version: 1.0.305.qualifier
-Bundle-ClassPath: explorer.jar
-Bundle-Activator: org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.ws.internal.explorer;x-internal:=true,
- org.eclipse.wst.ws.internal.explorer.favorites;x-internal:=true,
- org.eclipse.wst.ws.internal.explorer.plugin;x-internal:=true,
- org.eclipse.wst.ws.internal.explorer.popup;x-internal:=true,
- org.eclipse.wst.ws.internal.explorer.transport;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.help.appserver;bundle-version="[3.1.100,3.2.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
- org.uddi4j;bundle-version="[2.0.4,2.1.0)",
- org.apache.axis;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.equinox.http.jetty,
- org.eclipse.equinox.jsp.jasper.registry,
- org.eclipse.equinox.http.registry
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.servlet;version="2.4.0",
- javax.servlet.http;version="2.4.0",
- org.osgi.service.http;version="1.2.0"
diff --git a/bundles/org.eclipse.wst.ws.explorer/about.html b/bundles/org.eclipse.wst.ws.explorer/about.html
deleted file mode 100644
index 73db36ed5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.ws.explorer/build.properties b/bundles/org.eclipse.wst.ws.explorer/build.properties
deleted file mode 100644
index 6906de6c2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/build.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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
-###############################################################################
-source.explorer.jar = src/,wsexplorer-properties/
-jars.compile.order = explorer.jar
-
-output.wsexplorer/WEB-INF/lib/wsexplorer.jar = bin/
-bin.includes = plugin.xml,\
- .,\
- explorer.jar,\
- plugin.properties,\
- properties/,\
- META-INF/,\
- about.html,\
- icons/,\
- wsexplorer/,\
- wsexplorer-properties/
-
-
-customBuildCallbacks=buildJSPs.xml
-
-
-src.includes = schema/
diff --git a/bundles/org.eclipse.wst.ws.explorer/buildJSPs.xml b/bundles/org.eclipse.wst.ws.explorer/buildJSPs.xml
deleted file mode 100644
index bd4ba35c9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/buildJSPs.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-
-<!-- ===================================================================== -->
-<!-- Ant build script for JSPs -->
-<!-- ===================================================================== -->
-<project name="JSP Build">
-
- <!-- ===================================================================== -->
- <!-- Workspace (dev) build; called as an Ant builder -->
- <!-- ===================================================================== -->
- <target name="build">
-
- <!-- Construct the full classpath -->
- <path id="explorer.jar.classpath" >
- <pathelement path="${target.folder}"/>
- <dirset dir="${workspace_loc}">
- <patternset>
- <include name="org.eclipse.wst.ws.explorer/bin"/>
-
- </patternset>
- </dirset>
- <fileset dir="${target_home}/plugins">
- <patternset>
- <include name="javax.servlet*.jar"/>
- <include name="javax.servlet.jsp*.jar"/>
- <include name="org.apache.ant*/lib/ant.jar"/>
- <include name="org.apache.commons.el*.jar"/>
- <include name="org.apache.commons.logging*.jar"/>
- <include name="org.apache.jasper*.jar"/>
-
- </patternset>
- </fileset>
- </path>
-
- <!-- Compile the JSPs -->
- <antcall target="compile">
- <reference refid="explorer.jar.classpath"/>
- </antcall>
-
- </target>
-
- <property name="wsexplorerDir" value="${basedir}/wsexplorer"/>
-
- <!-- ===================================================================== -->
- <!-- Compile the JSPs -->
- <!-- ===================================================================== -->
- <target name="compile">
-
- <!-- Invoke Jasper compiler -->
- <java
- classname="org.apache.jasper.JspC"
- classpathref="explorer.jar.classpath"
- fork="true"
- failonerror="true">
- <arg value="-compile"/>
- <arg value="-d"/>
- <arg value="${wsexplorerDir}" />
- <arg value="-p"/>
- <arg value="org.eclipse.wst.ws.explorer.jsp"/>
- <arg value="-webapp"/>
- <arg value="${wsexplorerDir}"/>
- <arg value="-die"/>
- <classpath>
- <pathelement path="${target.folder}"/>
- <dirset dir="${basedir}">
- <include name="*/@dot" />
- </dirset>
- <fileset dir="${basedir}">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- </java>
-
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target build.jars -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="pre.build.jars">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target build.jars -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="post.build.jars">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target build.sources -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="pre.build.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target build.sources -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="post.build.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the compilation target <name> -->
- <!-- Substitute "name" with the name of the compilation target, eg @dot -->
- <!-- Available parameters : -->
- <!-- source.foldern : n = 1 ... N, the source folders -->
- <!-- target.folder : where the results of the compilation go -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="pre.explorer.jar">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do during the compilation target <name>, after the compile -->
- <!-- but before jaring. Substitute "name" with the name of the compilation-->
- <!-- target, eg @dot -->
- <!-- Available parameters : -->
- <!-- source.foldern : n = 1 ... N, the source folders -->
- <!-- target.folder : where the results of the compilation go -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="post.compile.explorer.jar">
-
- <!-- Compile the JSPs -->
- <antcall target="compile">
- <reference refid="explorer.jar.classpath"/>
- </antcall>
-
- <!-- JspC always generates .java files; delete them -->
- <delete>
- <fileset dir="${target.folder}" includes="**/*.java"/>
- </delete>
-
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the compilation target <name> -->
- <!-- Substitute "name" with the name of the compilation target, eg @dot -->
- <!-- Available parameters : -->
- <!-- jar.location - the location of the compilation results -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="post.explorer.jar">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder containing the build results -->
- <!-- target.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.bin.parts">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder containing the build results -->
- <!-- target.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.bin.parts">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.sources -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.sources -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.logs -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.logs">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.logs -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.logs">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target clean -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.clean">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target clean -->
- <!-- Available parameters : -->
- <!-- plugin.destination - final destination of the build -->
- <!-- build.result.folder - results of the compilation -->
- <!-- temp.folder - temporary folder -->
- <!-- ===================================================================== -->
- <target name="post.clean">
- </target>
-
- <target name="pre.wsexplorer-properties.jar">
- </target>
- <target name="post.wsexplorer-properties.jar">
- </target>
- <target name="post.compile.wsexplorer-properties.jar">
- </target>
-
-</project>
diff --git a/bundles/org.eclipse.wst.ws.explorer/icons/etool16/launch_ws_explorer.gif b/bundles/org.eclipse.wst.ws.explorer/icons/etool16/launch_ws_explorer.gif
deleted file mode 100644
index 21a0baa20..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/icons/etool16/launch_ws_explorer.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/plugin.properties b/bundles/org.eclipse.wst.ws.explorer/plugin.properties
deleted file mode 100644
index b0986d755..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/plugin.properties
+++ /dev/null
@@ -1,59 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
-# 20070820 191585 pmoogk@ca.ibm.com - Peter Moogk
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Explorer
-PLUGIN_PROVIDER=Eclipse.org
-
-XP_WSE_TRANSPORT_PROVIDER=Web Services Explorer Transport Provider
-SOAP_TRANSPORT_PROVIDER=Default SOAP Transport Provider
-
-#
-# Messages for the client type extension
-#
-WEBSERVICECLIENTTYPE_NAME_WSEXPLORER=Stubless (Web Services Explorer)
-TASK_LABEL_EXPLORE_WSDL_USING_WSE=Explorer WSDL using Web Services Explorer.
-
-#
-# Messages for the WSExplorer type extension
-#
-MSG_ERROR_LAUNCH_WSEXPLORER=IWAB0366E Unable to launch Web Services Explorer.
-MSG_ERROR_LOAD_LAUNCH_OPTIONS=IWAB0367E Unable to load launch options.
-MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8=Broken VM does not support UTF-8.
-
-#
-# Messages for popup action (Test with Web Services Explorer)
-#
-POPUP_TEST_WSDL=Test with Web Services Explorer
-
-#
-# SOAP transport messages
-#
-MSG_ERROR_UNSUPPORTED_BINDING={0} binding is unsupported.
-MSG_ERROR_UNSUPPORTED_TRANSPORT={0} transport is unsupported.
-
-#
-# WebServicePublishPage
-#
-TOOLTIP_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-COMMAND_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-
-#
-# Pop-up actions
-#
-MENU_RUN=&Run
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/plugin.xml b/bundles/org.eclipse.wst.ws.explorer/plugin.xml
deleted file mode 100644
index df84c0e64..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/plugin.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
- <extension-point id="wseTransportProvider" name="%XP_WSE_TRANSPORT_PROVIDER" schema="schema/wseTransportProvider.exsd"/>
-
-
-<!-- ================================================================= -->
-<!-- Extension point: Eclipse Popup Action (org.eclipse.ui.popupMenus) -->
-<!-- ================================================================= -->
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.wst.ws.ui.action.WSDLFileMenu.file.wsdl">
- <action
- label="%POPUP_TEST_WSDL"
- class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
- menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.wst.ws.ui.action.WSDLFileMenu.wsdlres">
- <action
- label="%POPUP_TEST_WSDL"
- class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
- menubarPath="additions"
- id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.wst.ws.ui.action.WSDLFileMenu.service"
- adaptable="true">
- <action
- label="%POPUP_TEST_WSDL"
- class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
- menubarPath="additions"
- id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
- </action>
- </objectContribution>
- </extension>
- <extension
- point="org.eclipse.wst.ws.explorer.wseTransportProvider">
- <soapTransportProvider
- class="org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.SOAPTransportProvider"
- id="org.eclipse.wst.ws.explorer.soapTransportProvider"
- name="%SOAP_TRANSPORT_PROVIDER"
- namespaceURI="http://schemas.xmlsoap.org/wsdl/soap/"
- transportURI="http://schemas.xmlsoap.org/soap/http"/>
- </extension>
- <extension
- point="org.eclipse.equinox.http.registry.httpcontexts">
- <httpcontext
- id="wse">
- <resource-mapping
- path="/wsexplorer">
- </resource-mapping>
- </httpcontext>
- </extension>
- <extension
- point="org.eclipse.equinox.http.registry.resources">
- <resource
- alias="/"
- base-name="/"
- httpcontextId="wse">
- </resource>
- <serviceSelector
- filter="(other.info=org.eclipse.wst.ws.explorer)">
- </serviceSelector>
- </extension>
- <extension
- point="org.eclipse.equinox.http.registry.servlets">
- <servlet
- alias="/*.jsp"
- class="org.eclipse.equinox.jsp.jasper.registry.JSPFactory:/"
- httpcontextId="wse">
- </servlet>
- <serviceSelector
- filter="(other.info=org.eclipse.wst.ws.explorer)">
- </serviceSelector>
- </extension>
-
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension
- targetID="org.eclipse.jst.j2ee.J2EEPerspective">
- <actionSet
- id="org.eclipse.wst.ws.explorer.explorer">
- </actionSet>
- </perspectiveExtension>
- </extension>
-
-
- <!-- Main Menu Actions -->
-
- <extension point="org.eclipse.ui.actionSets">
-
- <actionSet
- label="%COMMAND_LAUNCH_WS_EXPLORER"
- visible="false"
- id="org.eclipse.wst.ws.explorer.explorer">
- <menu
- label="%MENU_RUN"
- path="additions"
- id="org.eclipse.ui.run">
- <separator name="explorer">
- </separator>
- </menu>
- <action
- label="%COMMAND_LAUNCH_WS_EXPLORER"
- icon="icons/etool16/launch_ws_explorer.gif"
- tooltip="%TOOLTIP_LAUNCH_WS_EXPLORER"
- class="org.eclipse.wst.ws.internal.explorer.action.LaunchWSEAction"
- menubarPath="org.eclipse.ui.run/explorer"
- toolbarPath="additions"
- id="org.eclipse.wst.ws.internal.explorer.action.LaunchWSEAction">
- </action>
- </actionSet>
-
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil b/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil
deleted file mode 100644
index 14b702d9c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inspection xmlns="http://schemas.xmlsoap.org/ws/2001/10/inspection/"
- xmlns:wsilwsdl="http://schemas.xmlsoap.org/ws/2001/10/inspection/wsdl/"
- xmlns:wsiluddi="http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/"
- xmlns:uddi="urn:uddi-org:api">
- <abstract xml:lang="en-US">v5_0_1_0</abstract>
-
- <link referencedNamespace="urn:uddi-org:api">
- <abstract xml:lang="en-US">%Registry Name</abstract>
- <abstract xml:lang="en-US">Fill In Inquiry URL</abstract>
- <abstract xml:lang="en-US">Fill In Publish URL</abstract>
- <abstract xml:lang="en-US">File In Site</abstract>
- </link>
-
-
-
- <link referencedNamespace="http://schemas.xmlsoap.org/ws/2001/10/inspection/" location="http://www.xmethods.com/inspection.wsil"/>
-</inspection>
diff --git a/bundles/org.eclipse.wst.ws.explorer/schema/wseTransportProvider.exsd b/bundles/org.eclipse.wst.ws.explorer/schema/wseTransportProvider.exsd
deleted file mode 100644
index 232eef339..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/schema/wseTransportProvider.exsd
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.ws.explorer">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.ws.explorer" id="wseTransportProvider" name="Web Services Explorer Transport Provider"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="soapTransportProvider"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- A fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- An optional identifier for this extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- An optional name this extension instance
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="soapTransportProvider">
- <annotation>
- <documentation>
- This extension point entry allows an extender to plug in a new factory for creating org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport instances. The ISOAPTranport is used by the Web Services Explorer for invoking web services operations that uses the SOAP message protocol.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- This class must implement the org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider interface.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This id uniquely identifies this soapTransportProvider element.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The name of this soapTransportProvider element.
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="namespaceURI" type="string">
- <annotation>
- <documentation>
- The namespace URI of the soap:binding element that this transport provider claims support for. For example, if this transport provider supports the SOAP 1.1 binding, the value of this attribute would be http://schemas.xmlsoap.org/wsdl/soap/. If unspecified, this transport provider claims support for all SOAP bindings.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="transportURI" type="string">
- <annotation>
- <documentation>
- The transport protocol URI of the soap:binding element that this transport provider claims support for. For example, if this transport provider supports SOAP over HTTP, the value of this attribute would be http://schemas.xmlsoap.org/soap/http. If unspecified, this transport provider claims support for all transport protocols.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2007 IBM Corporation and others.&lt;br&gt;
-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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.ws.explorer/servletapi/org.eclipse.equinox.servlet.api_1.0.0.v20060206.jar b/bundles/org.eclipse.wst.ws.explorer/servletapi/org.eclipse.equinox.servlet.api_1.0.0.v20060206.jar
deleted file mode 100644
index 2dad57752..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/servletapi/org.eclipse.equinox.servlet.api_1.0.0.v20060206.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/JettyRunnable.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/JettyRunnable.java
deleted file mode 100644
index e3742c974..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/JettyRunnable.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer;
-
-import org.eclipse.help.internal.appserver.AppserverPlugin;
-
-
-public class JettyRunnable {
-
- private static JettyRunnable jettyRunnable_;
-
- private JettyRunnable() {
- }
-
- public static JettyRunnable getJettyRunnable() {
- if (jettyRunnable_ == null) {
- jettyRunnable_ = new JettyRunnable();
- jettyRunnable_.init();
- }
- return jettyRunnable_;
- }
-
- public boolean isJettyStarted() {
- try {
- return AppserverPlugin.getDefault().getAppServer().isRunning();
- } catch (Throwable t) {
- return false;
- }
- }
-
- public int getJettyPort() {
- return WebappManager.getPort();
- }
-
- public String getJettyHost() {
- return WebappManager.getHost();
- }
-
-
- private void init() {
- try {
- WebappManager.start("wse");
- } catch (Throwable t) {
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java
deleted file mode 100644
index 3666ede76..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer;
-
-/**
- * @author cbrealey@ca.ibm.com
- *
- * This simple class is used to hold a single Web Services
- * Explorer launch option property and its value. Allowed
- * launch option properties are defined by
- * <code>{@link LaunchOptions}</code>.
- */
-public class LaunchOption {
- private String key_;
-
- private String option_;
-
- /*
- * Constructs a new launch option with the given
- * property name and value.
- */
- public LaunchOption(String key, String option) {
- key_ = key;
- option_ = option;
- }
-
- /**
- * Returns the property name of this launch option.
- * @return The property name.
- */
- public String getKey() {
- return key_;
- }
-
- /**
- * Returns the property value of this launch option.
- * @return The property value.
- */
- public String getOption() {
- return option_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java
deleted file mode 100644
index 392f03b11..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer;
-
-/**
- * @author cbrealey@ca.ibm.com
- *
- * This class defines the property names understood by the Web Services Explorer
- * and used to configure it's initial appearance and behaviour at the time it is
- * launched.
- * @see LaunchOption
- */
-public class LaunchOptions {
- // General purpose preload constants
-
- public static final String STATE_LOCATION = "stateLocation";
-
- public static final String DEFAULT_FAVORITES_LOCATION = "defaultFavoritesLocation";
-
- // WSDL Page preload constants
-
- public static final String WSDL_URL = "wsdl";
-
- public static final String WEB_SERVICE_ENDPOINT = "webServiceEndpoint";
-
- public static final String SERVICE_QNAME_STRING = "serviceQNameString";
-
- public static final String BINDING_NAME_STRING = "bindingNameString";
-
- // UDDI Page preload constants
-
- public static final String INQUIRY_URL = "inquiry";
-
- public static final String PUBLISH_URL = "publish";
-
- public static final String SERVICE_NAME = "serviceName";
-
- public static final String SERVICE_KEY = "serviceKey";
-
- public static final String CATEGORIES_DIRECTORY = "categoriesDirectory";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.java
deleted file mode 100644
index 4d8b6977b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-
-public class LaunchWizardRunnable extends Thread implements Runnable {
- private String id;
-
- private String wsdlURL;
-
- private boolean finish;
-
- public LaunchWizardRunnable(String id, String wsdlURL) {
- this.id = id;
- this.wsdlURL = (wsdlURL != null) ? wsdlURL : "";
- finish = false;
- }
-
- public boolean isFinish() {
- return finish;
- }
-
- public void run() {
- try {
- DynamicWizard wizard = new DynamicWizard();
- wizard.setInitialData(id);
- IStructuredSelection sel = new StructuredSelection(wsdlURL);
- wizard.init(null, sel);
- WizardDialog wd = new WizardDialog(new Shell(Display.getDefault(),
- SWT.APPLICATION_MODAL), wizard);
- wd.open();
- } catch (Exception e) {
- } finally {
- finish = true;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java
deleted file mode 100644
index c0215379d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer;
-
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-public class LaunchWizardTask {
- // singleton
- private static LaunchWizardTask task_;
-
- // the shell for the wizard to be launched
- private Shell shell_;
-
- // the LaunchWizardRunnable that is currently running
- private LaunchWizardRunnable runnable_;
-
- private LaunchWizardTask(Shell shell) {
- shell_ = shell;
- runnable_ = null;
- }
-
- public static LaunchWizardTask getInstance() {
- if (task_ == null)
- task_ = new LaunchWizardTask(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell());
- return task_;
- }
-
- public void asyncExec(Runnable runnable) throws SWTException {
- shell_.getDisplay().asyncExec(runnable);
- }
-
- public boolean checkAndAsyncExec(LaunchWizardRunnable runnable) {
- try {
- if (!getIsExecuting()) {
- asyncExec(runnable);
- runnable_ = runnable;
- return true;
- } else
- return false;
- } catch (Exception e) {
- return false;
- }
- }
-
- public boolean getIsExecuting() {
- if (runnable_ != null) {
- boolean isFinish = runnable_.isFinish();
- if (isFinish)
- runnable_ = null;
- return !isFinish;
- } else
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java
deleted file mode 100644
index 7d2c4f0ce..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060721 151409 makandre@ca.ibm.com - Andrew Mak, WSE does not open in external browser on RH
- * 20060802 150428 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20061219 168620 makandre@ca.ibm.com - Andrew Mak, WSE does not open in external browser on Linux
- * 20070220 168620 makandre@ca.ibm.com - Andrew Mak, WSE does not open in external browser on Linux (cont.)
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer;
-
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-public class WSExplorer {
- private static WSExplorer instance;
-
- private static int launchOptionsKey_ = 0;
-
- private IWebBrowser internalBrowser_ = null;
-
- public WSExplorer() {
- }
-
- public static WSExplorer getInstance() {
- if (instance == null) {
- instance = new WSExplorer();
- }
- return instance;
- }
-
- public String getContextName() {
- return "wsexplorer";
- }
-
- public String getParentPluginID() {
- return ExplorerPlugin.ID;
- }
-
- public String getWebAppLocation() {
- return "wsexplorer";
- }
-
- public String getWelcomeURL() {
- return "wsexplorer.jsp";
- }
-
- public String getLaunchOptionRegistryURL() {
- return "launch_options_registry.jsp";
- }
-
- public String getBaseURL() {
- StringBuffer sb = new StringBuffer();
-
-
- sb.append("http://");
- sb.append(JettyRunnable.getJettyRunnable().getJettyHost());
- sb.append(":");
- sb.append(JettyRunnable.getJettyRunnable().getJettyPort());
- sb.append("/");
- sb.append("wse");
- sb.append("/");
- sb.append(getContextName());
- sb.append("/");
- return sb.toString();
- }
-
- public String getMetadataDirectory() {
- // <workspace>/.metadata/.plugins/org.eclipse.wst.ws.explorer/ (note
- // the trailing separator).
- return ExplorerPlugin.getInstance().getPluginStateLocation();
- }
-
- public IStatus launch(IWorkbench wb, IStructuredSelection sel,
- LaunchOption[] options, boolean forceLaunchOutsideIDE) {
- // launchOptionKey
- int launchOptionKey = getLaunchOptionsKey();
- // Web Services Explorer URL
- StringBuffer sb = new StringBuffer();
- sb.append(getBaseURL());
- sb.append(getWelcomeURL());
- sb.append("?");
- if (options != null && options.length > 0) {
- String encodedID = null;
- try {
- encodedID = URLEncoder.encode(ExplorerPlugin.ID,
- ExplorerPlugin.CHARSET);
- } catch (UnsupportedEncodingException e) {
- return new Status(
- IStatus.ERROR,
- ExplorerPlugin.ID,
- 0,
- ExplorerPlugin
- .getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
- e);
- }
- sb.append(encodedID);
- sb.append("=");
- sb.append(launchOptionKey);
- }
- // launch Web Services Explorer
- try {
- IWorkbenchBrowserSupport browserSupport = ExplorerPlugin.getInstance().getWorkbench().getBrowserSupport();
- IWebBrowser browser = null;
-
- if (forceLaunchOutsideIDE) {
-
- // external browser support uses swt Program.findProgram() to locate an appropriate browser for HTML files
- // certain versions of swt Program class need to be run from the UI thread, otherwise findProgram() does not
- // work properly (this applies to Linux only). The code below is to workaround this problem.
-
- // Display.getCurrent() will be null if this is not the UI thread
- if (Display.getCurrent() == null) {
-
- // create a runnable to open the browser, run it in the UI thread
- OpenBrowserRunnable runnable = new OpenBrowserRunnable(browserSupport, new URL(sb.toString()));
- Display.getDefault().syncExec(runnable);
-
- if (runnable.getException() != null)
- throw runnable.getException();
- }
- else {
- browser = browserSupport.getExternalBrowser();
- browser.openURL(new URL(sb.toString()));
- }
- }
- else {
- // browserId
- StringBuffer browserId = new StringBuffer();
- browserId.append(ExplorerPlugin.ID);
- browserId.append(getContextName());
-
- if (internalBrowser_==null)
- internalBrowser_ = browserSupport.createBrowser(browserId.toString());
- browser = internalBrowser_;
- browser.openURL(new URL(sb.toString()));
- }
- } catch (Exception e) {
- return new Status(IStatus.ERROR, ExplorerPlugin.ID, 0,
- ExplorerPlugin.getMessage("%MSG_ERROR_LAUNCH_WSEXPLORER"),
- e);
- }
- // register launch options
- if (options != null && options.length > 0) {
- try {
- StringBuffer launchOptionsRegURL = new StringBuffer();
- launchOptionsRegURL.append(getBaseURL());
- launchOptionsRegURL.append(getLaunchOptionRegistryURL());
- URL url = new URL(launchOptionsRegURL.toString());
- URLConnection connection = url.openConnection();
- connection.setDoOutput(true);
- PrintWriter out = new PrintWriter(connection.getOutputStream());
- StringBuffer params = new StringBuffer();
- String encodedID = null;
- try {
- encodedID = URLEncoder.encode(ExplorerPlugin.ID,
- ExplorerPlugin.CHARSET);
- } catch (UnsupportedEncodingException e) {
- return new Status(
- IStatus.ERROR,
- ExplorerPlugin.ID,
- 0,
- ExplorerPlugin
- .getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
- e);
- }
- params.append(encodedID);
- params.append("=");
- params.append(launchOptionKey);
- params.append("&");
- for (int i = 0; i < options.length; i++) {
- if (options[i] != null) {
- params.append(options[i].getKey());
- params.append("=");
- String option = null;
- try {
- option = URLEncoder.encode(options[i].getOption(),
- ExplorerPlugin.CHARSET);
- } catch (UnsupportedEncodingException e) {
- return new Status(
- IStatus.ERROR,
- ExplorerPlugin.ID,
- 0,
- ExplorerPlugin
- .getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
- e);
- }
- params.append(option);
- params.append("&");
- }
- }
- out.print(params.toString());
- out.close();
- out = null;
- InputStream is = connection.getInputStream();
- is.close();
- is = null;
- } catch (Exception e) {
- return new Status(IStatus.WARNING, ExplorerPlugin.ID, 0,
- ExplorerPlugin
- .getMessage("%MSG_ERROR_LOAD_LAUNCH_OPTIONS"),
- e);
- }
- }
- return new Status(IStatus.OK, ExplorerPlugin.ID, 0, "", null);
- }
-
- private static int getLaunchOptionsKey() {
- return launchOptionsKey_++;
- }
-
- public IStatus launch(IWorkbench wb, IStructuredSelection sel,
- String[] inquiryURL, String[] publishURL,
- boolean forceLaunchOutsideIDE) {
- int inquiryURLOptionLength = (inquiryURL != null) ? inquiryURL.length
- : 0;
- int publishURLOptionLength = (publishURL != null) ? publishURL.length
- : 0;
- LaunchOption[] options = new LaunchOption[inquiryURLOptionLength
- + publishURLOptionLength];
- int index = 0;
- if (inquiryURL != null) {
- for (int i = 0; i < inquiryURL.length; i++) {
- options[index] = new LaunchOption(LaunchOptions.INQUIRY_URL,
- inquiryURL[i]);
- index++;
- }
- }
- if (publishURL != null) {
- for (int i = 0; i < publishURL.length; i++) {
- options[index] = new LaunchOption(LaunchOptions.PUBLISH_URL,
- publishURL[i]);
- index++;
- }
- }
- return launch(wb, sel, options, forceLaunchOutsideIDE);
- }
-}
-
-/**
- * Helper class for opening a browser and storing the
- * Exception thrown if it was unsuccessful.
- */
-class OpenBrowserRunnable implements Runnable {
-
- private IWorkbenchBrowserSupport browserSupport;
- private URL url;
- private Exception exception = null;
-
- public OpenBrowserRunnable(IWorkbenchBrowserSupport browserSupport, URL url) {
- this.browserSupport = browserSupport;
- this.url = url;
- }
-
- public void run() {
- try {
- browserSupport.getExternalBrowser().openURL(url);
- }
- catch (Exception e) {
- exception = e;
- }
- }
-
- public Exception getException() {
- return exception;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java
deleted file mode 100644
index 077de5178..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer;
-
-public final class WSExplorerContext {
- public static final String ID = "org.eclipse.wst.ws.explorer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java
deleted file mode 100644
index bbc765abb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.Properties;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @author cbrealey@ca.ibm.com
- *
- * This <code>Command</code>, when executed, launches the
- * Web Services Explorer.
- */
-public class WSExplorerLauncherCommand extends AbstractDataModelOperation {
- private boolean forceLaunchOutsideIDE;
-
- private LaunchOption[] launchOptions;
-
- public WSExplorerLauncherCommand() {
- }
-
- public void writeCategoryInfo(String inquiryURL, String categoriesDirectory) {
- try {
- Properties p = new Properties();
- p.setProperty(LaunchOptions.CATEGORIES_DIRECTORY,
- categoriesDirectory);
- StringBuffer propertiesFileName = new StringBuffer();
- propertiesFileName.append(WSExplorer.getInstance()
- .getMetadataDirectory());
- File metadataDirectoryFile = new File(propertiesFileName.toString());
- if (!metadataDirectoryFile.exists()) {
- metadataDirectoryFile.mkdirs();
- }
- propertiesFileName.append(URLEncoder.encode(inquiryURL,"UTF-8")).append(
- ".properties");
- FileOutputStream fout = new FileOutputStream(propertiesFileName
- .toString());
- p.store(fout, null);
- fout.close();
- } catch (IOException e) {
- }
- }
-
- public IStatus execute() {
- return WSExplorer.getInstance().launch(null, null, launchOptions,
- forceLaunchOutsideIDE);
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- return execute();
- }
-
- /**
- * @param forceLaunchOutsideIDE
- * The forceLaunchOutsideIDE to set.
- */
- public void setForceLaunchOutsideIDE(boolean forceLaunchOutsideIDE) {
- this.forceLaunchOutsideIDE = forceLaunchOutsideIDE;
- }
-
- /**
- * @param launchOptions
- * The launchOptions to set.
- */
- public void setLaunchOptions(LaunchOption[] launchOptions) {
- this.launchOptions = launchOptions;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WebappManager.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WebappManager.java
deleted file mode 100644
index a450752fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WebappManager.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.equinox.http.jetty.JettyConfigurator;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-
-public class WebappManager {
-
- private static String host;
- private static int port = -1;
- private static final int AUTO_SELECT_JETTY_PORT = 0;
-
- public static void start(String webappName) throws Exception {
- Dictionary d = new Hashtable();
-
-
- d.put("http.port", new Integer(getPortParameter())); //$NON-NLS-1$
-
- // set the base URL
- d.put("context.path", "/wse"); //$NON-NLS-1$ //$NON-NLS-2$
- d.put("other.info", "org.eclipse.wst.ws.explorer"); //$NON-NLS-1$ //$NON-NLS-2$
-
- // suppress Jetty INFO/DEBUG messages to stderr
- Logger.getLogger("org.mortbay").setLevel(Level.WARNING); //$NON-NLS-1$
-
- JettyConfigurator.startServer(webappName, d);
- checkBundle();
-
- }
-
- /*
- * Ensures that the bundle with the specified name and the highest available
- * version is started and reads the port number
- */
- private static void checkBundle() throws InvalidSyntaxException, BundleException {
- Bundle bundle = Platform.getBundle("org.eclipse.equinox.http.registry"); //$NON-NLS-1$if (bundle != null) {
- if (bundle.getState() == Bundle.RESOLVED) {
- bundle.start(Bundle.START_TRANSIENT);
- }
- if (port == -1) {
- // Jetty selected a port number for us
- ServiceReference[] reference = bundle.getBundleContext().getServiceReferences("org.osgi.service.http.HttpService", "(other.info=org.eclipse.wst.ws.explorer)"); //$NON-NLS-1$ //$NON-NLS-2$
- Object assignedPort = reference[0].getProperty("http.port"); //$NON-NLS-1$
- port = Integer.parseInt((String)assignedPort);
- }
- }
-
- public static void stop(String webappName) throws CoreException {
- try {
- JettyConfigurator.stopServer(webappName);
- }
- catch (Exception e) {
- //HelpBasePlugin.logError("An error occured while stopping the help server", e); //$NON-NLS-1$
- }
- }
-
- public static int getPort() {
- return port;
- }
-
- /*
- * Get the port number which will be passed to Jetty
- */
- private static int getPortParameter() {
- if (port == -1) {
- return AUTO_SELECT_JETTY_PORT;
- }
- return port;
- }
-
- public static String getHost() {
- if (host == null) {
- String hostCommandLineOverride = ExplorerPlugin.getBundleContext().getProperty("server_host"); //$NON-NLS-1$
- if (hostCommandLineOverride != null && hostCommandLineOverride.trim().length() > 0) {
- host = hostCommandLineOverride;
- }
- else {
- host = "127.0.0.1"; //$NON-NLS-1$
- }
- }
- return host;
- }
-
- private WebappManager() {
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/action/LaunchWSEAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/action/LaunchWSEAction.java
deleted file mode 100644
index 6b324f943..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/action/LaunchWSEAction.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070820 191585 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.action;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-
-public class LaunchWSEAction implements IWorkbenchWindowActionDelegate
-{
- public void run(IAction action)
- {
- EclipseStatusHandler handler = new EclipseStatusHandler();
- TransientResourceContext context = new TransientResourceContext();
- EclipseEnvironment environment = new EclipseEnvironment( null, context, handler );
- WSExplorerLauncherCommand cmd = new WSExplorerLauncherCommand();
-
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- LaunchOption[] launchOptions = new LaunchOption[] {
- new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation),
- new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation)
- };
- cmd.setLaunchOptions(launchOptions);
- cmd.setEnvironment( environment );
- cmd.execute( null, null );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
- */
- public void dispose() { }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
- */
- public void init(IWorkbenchWindow window) { }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) { }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java
deleted file mode 100644
index b09c8141d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.favorites;
-
-import java.io.IOException;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesRegistryTypeAbstract;
-
-public class FavoritesRegistryTypeDefault extends FavoritesRegistryTypeAbstract {
- private static WSILDocument wsilDoc_;
-
- public static final String FAVORITES_DEFAULT = "properties/favorites_default.wsil";
-
- private String defaultFavorites_ = null;
-
- public FavoritesRegistryTypeDefault() {
- super();
- wsilDoc_ = null;
- }
-
- public FavoritesRegistryTypeDefault(String defaultFavorites) {
- super();
- wsilDoc_ = null;
- defaultFavorites_ = defaultFavorites;
- }
-
- public String getReadLocation() {
- StringBuffer readLocation = new StringBuffer();
- if (defaultFavorites_ == null)
- {
- readLocation.append(ExplorerPlugin.getInstance().getPluginInstallLocation());
- readLocation.append(FAVORITES_DEFAULT);
- }
- else
- {
- readLocation.append(defaultFavorites_);
- }
- return readLocation.toString();
- }
-
- public String getWriteLocation() {
- return null;
- }
-
- protected WSILDocument getWSILDocument() {
- if (wsilDoc_ == null) {
- wsilDoc_ = loadWSILDocument(getReadLocation(), true);
- getFavoritesUDDIRegistries();
- /* TODO: Public registry strings shouldn't be in properties - Ain't extensible.
- for (int i = 0; i < registries.length; i++) {
- registries[i].setName(WSPlugin.getResourceString(registries[i].getName()));
- }
- */
- }
- return wsilDoc_;
- }
-
- public WSILDocument getFavoritesDefault() {
- return getWSILDocument();
- }
-
- public void save() throws WSILException, IOException {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java
deleted file mode 100644
index da76a1e0e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.favorites;
-
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesRegistryTypeAbstract;
-
-
-public class FavoritesRegistryTypeWSE extends FavoritesRegistryTypeAbstract
-{
- private static WSILDocument wsilDoc_;
- public static final String FAVORITES_WSEXPLORER = "favorites.wsil";
- private String defaultFavorites_ = null;
- private String stateLocation_ = null;
-
- public FavoritesRegistryTypeWSE()
- {
- super();
- wsilDoc_ = null;
- }
-
- public FavoritesRegistryTypeWSE(String defaultFavorites, String stateLocation) {
- super();
- wsilDoc_ = null;
- defaultFavorites_ = defaultFavorites;
- stateLocation_ = stateLocation;
- }
-
- public String getReadLocation()
- {
- StringBuffer readLocation = new StringBuffer();
- readLocation.append(stateLocation_ == null ? ExplorerPlugin.getInstance().getPluginStateLocation() : stateLocation_);
- readLocation.append(FAVORITES_WSEXPLORER);
- return readLocation.toString();
- }
-
- public String getWriteLocation()
- {
- return getReadLocation();
- }
-
- protected WSILDocument getWSILDocument()
- {
- if (wsilDoc_ == null)
- {
- wsilDoc_ = loadWSILDocument(getReadLocation(), false);
- if (wsilDoc_ == null)
- {
- restoreFavoritesDefault();
- try
- {
- save();
- }
- catch (Throwable t)
- {
- }
- }
- }
- return wsilDoc_;
- }
-
- public void restoreFavoritesDefault()
- {
- wsilDoc_ = (new FavoritesRegistryTypeDefault(defaultFavorites_)).getWSILDocument();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java
deleted file mode 100644
index 2207fe501..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.CurrentNodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-
-// Abstract action class used for both Link and Form actions.
-public abstract class Action
-{
- protected Controller controller_;
- protected Hashtable propertyTable_;
- protected Vector removedProperties_;
-
- public Action()
- {
- this(null);
- }
-
- public Action(Controller controller)
- {
- controller_ = controller;
- propertyTable_ = new Hashtable();
- removedProperties_ = new Vector();
- }
-
- public final Controller getController()
- {
- return controller_;
- }
-
- /**
- * Read properties from an HttpServletRequest and add them to the property table.
- * @param HttpServletRequest The HttpServletRequest containing the embedded parameters.
- * @return boolean Whether or not the operation was successful.
- */
- public abstract boolean populatePropertyTable(HttpServletRequest request);
-
- /**
- * Get the property table.
- * @return Hashtable A hashtable containing the properties for this action.
- */
- public final Hashtable getPropertyTable()
- {
- return propertyTable_;
- }
-
- /**
- * Set the property table.
- * @return void
- */
- public void setPropertyTable(Hashtable propertyTable)
- {
- propertyTable_ = propertyTable;
- }
-
- /**
- * Add a property to the property table.
- * @param void
- */
- public final void addProperty(Object key, Object value)
- {
- propertyTable_.put(key, value);
- }
-
- /**
- * Remove a property from the property table. Track the deletions.
- * @param Object The key of the property being removed.
- */
- public final void removeProperty(Object key)
- {
- propertyTable_.remove(key);
- removedProperties_.addElement(key);
- }
-
- public final String[] getPropertyAsStringArray(Object key)
- {
- Object object = propertyTable_.get(key);
- if (object instanceof String[])
- return (String[])object;
- else if (object != null)
- return new String[] {object.toString()};
- else
- return new String[0];
- }
-
- public final boolean execute()
- {
- return execute(true);
- }
-
- public final boolean execute(boolean useActionEngine)
- {
- if (useActionEngine)
- return controller_.getActionEngine().executeAction(this);
- else
- return run();
- }
-
- // Abstract method for running this action.
- public abstract boolean run();
-
- /**
- * Return the transformers used to normalize the input/output parameters for this action
- * @return ITransformer[]
- */
- public ITransformer[] getTransformers()
- {
- return new ITransformer[] {new CurrentNodeSelectionTransformer(controller_)};
- }
-
- protected void handleUnexpectedException(Perspective perspective,MessageQueue messageQueue,String exceptionName,Throwable t)
- {
- messageQueue.addMessage(perspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage(exceptionName);
- messageQueue.addMessage(t.getMessage());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java
deleted file mode 100644
index 77832f6a0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class CheckWorkbenchFileReadOnlyAction extends Action
-{
- public static final String getActionLink()
- {
- return "actions/CheckWorkbenchFileReadOnlyActionJSP.jsp";
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java
deleted file mode 100644
index c53fdc694..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060906 156398 jeffliu@ca.ibm.com - Jeffrey Liu
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class ClearNodeAction extends NodeAction
-{
- public ClearNodeAction(Controller controller,NodeManager nodeManager)
- {
- super(controller,nodeManager);
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- Node node = nodeManager_.getNode(nodeId);
- TreeElement element = node.getTreeElement();
- //element.disconnectAll();
- List elements2remove = new ArrayList();
- collectElements2Remove(element, elements2remove);
- for (Iterator it = elements2remove.iterator(); it.hasNext();)
- {
- TreeElement e = (TreeElement)it.next();
- e.getModel().removeElement(e);
- }
- if (element.getModel().getRootElement() != element)
- nodeManager_.removeFromNodeTable(nodeId);
- // Do not add this to the history.
- MessageQueue messageQueue = controller_.getCurrentPerspective().getMessageQueue();
- messageQueue.addMessage(controller_.getMessage("MSG_INFO_NODE_CLEARED",node.getNodeName()));
- return true;
- }
- return false;
- }
-
- private void collectElements2Remove(TreeElement element, List elements2remove)
- {
- if (!elements2remove.contains(element))
- {
- if (element.getModel().getRootElement() != element)
- elements2remove.add(element);
- Enumeration rels = element.getRels();
- while (rels.hasMoreElements())
- {
- Rel rel = (Rel)rels.nextElement();
- String relName = rel.getName();
- if (!ModelConstants.REL_OWNER.equals(relName))
- {
- Enumeration children = element.getElements(rel.getName());
- while (children.hasMoreElements())
- {
- collectElements2Remove((TreeElement)children.nextElement(), elements2remove);
- }
- }
- }
- }
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- // Deleting a node from the tree results in changes to the treeview and status contents.
- public abstract String getTreeContentVar();
- public abstract String getTreeContentPage();
- public abstract String getPropertiesContainerVar();
- public abstract String getPropertiesContainerPage();
- public abstract String getStatusContentVar();
- public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java
deleted file mode 100644
index b7598d60f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-// Abstract action class used for both Link and Form actions.
-public abstract class ClearViewElementAction extends LinkAction
-{
- private String listManagerRel_;
- private NodeManager nodeManager_;
- public ClearViewElementAction(Controller controller,NodeManager nodeManager,String listManagerRel)
- {
- super(controller);
- nodeManager_ = nodeManager;
- listManagerRel_ = listManagerRel;
- }
-
- // ...jsp?viewId=...
- protected final boolean processLinkParameters(HttpServletRequest request)
- {
- String viewIdString = request.getParameter(ActionInputs.VIEWID);
- // Perform data validation.
- try
- {
- Integer.parseInt(viewIdString);
- }
- catch (NumberFormatException e)
- {
- // Validation failed!
- return false;
- }
- propertyTable_.put(ActionInputs.VIEWID,viewIdString);
- return true;
- }
-
- public final boolean run()
- {
- int viewId = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getSelectedNode();
- ViewTool viewTool = (ViewTool)selectedNode.getToolManager().getSelectedTool();
- if (viewTool.getToolManager(viewId) == null)
- {
- // Stale view.
- return false;
- }
- TreeElement element = selectedNode.getTreeElement();
- ListManager listManager = (ListManager)element.getPropertyAsObject(listManagerRel_);
- listManager.removeElementWithViewId(viewId);
- viewTool.clearViewToolManager(viewId);
- selectedNode.setViewId(ActionInputs.VIEWID_DEFAULT);
- // Do not add this to the history.
- return true;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public abstract String getPropertiesContainerVar();
- public abstract String getPropertiesContainerPage();
- public abstract String getStatusContentVar();
- public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java
deleted file mode 100644
index a94d30d97..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class FormAction extends Action
-{
- public FormAction(Controller controller)
- {
- super(controller);
- }
-
- protected abstract boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException;
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- try
- {
- MultipartFormDataParser parser = new MultipartFormDataParser();
- parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
- getSelectedFormTool().clearErrors();
- boolean result = processParsedResults(parser);
- removedProperties_.removeAllElements();
- return result;
- }
- catch (MultipartFormDataException e)
- {
- }
- return false;
- }
-
- public void setPropertyTable(Hashtable propertyTable)
- {
- try
- {
- processParsedResults(new MultipartFormDataParser(propertyTable));
- }
- catch (MultipartFormDataException mfde)
- {
- }
- for (Iterator it = propertyTable.keySet().iterator(); it.hasNext();)
- {
- Object key = it.next();
- Hashtable thisPropertyTable = getPropertyTable();
- if (!thisPropertyTable.containsKey(key))
- addProperty(key, propertyTable.get(key));
- }
- }
-
- protected final void addToHistory(int perspectiveId,String url)
- {
- controller_.addToHistory(perspectiveId,url);
- }
-
- public abstract FormTool getSelectedFormTool();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java
deleted file mode 100644
index 3f2cca4f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-// A class for reporting form input exceptions.
-public class FormInputException extends Exception
-{
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3257846601685938742L;
-
-public FormInputException(String msg)
- {
- super(msg);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java
deleted file mode 100644
index dd7245b73..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import javax.servlet.http.HttpServletRequest;
-import javax.wsdl.Definition;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-
-public abstract class ImportToFileSystemAction extends LinkAction
-{
- public ImportToFileSystemAction(Controller controller)
- {
- super(controller);
- }
-
- // os is the OutputStream of the file in the file system
- public abstract boolean write(OutputStream os);
-
- // the default name for the file
- public abstract String getDefaultFileName();
-
- public boolean writeWSDLDefinition(OutputStream os, Definition definition)
- {
- try
- {
- WSDLFactory wsdlFactory = new WSDLFactoryImpl();
- WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- wsdlWriter.writeWSDL(definition, os);
- return true;
- }
- catch (Throwable t)
- {
- return false;
- }
- }
-
- public boolean writeWSILDocument(OutputStream os, WSILDocument wsilDoc)
- {
- OutputStreamWriter osw = null;
- try
- {
- osw = new OutputStreamWriter(os);
- wsilDoc.write(osw);
- return true;
- }
- catch (Exception e)
- {
- return false;
- }
- finally
- {
- try
- {
- if (osw != null)
- osw.close();
- }
- catch (Exception e)
- {
- }
- }
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, String jspPage)
- {
- StringBuffer actionLink = new StringBuffer(jspPage);
- actionLink.append('?');
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- String nodeID = request.getParameter(ActionInputs.NODEID);
- String toolID = request.getParameter(ActionInputs.TOOLID);
- String viewID = request.getParameter(ActionInputs.VIEWID);
- String viewToolID = request.getParameter(ActionInputs.VIEWTOOLID);
- try
- {
- Integer.parseInt(nodeID);
- Integer.parseInt(toolID);
- Integer.parseInt(viewID);
- Integer.parseInt(viewToolID);
- propertyTable_.put(ActionInputs.NODEID, nodeID);
- propertyTable_.put(ActionInputs.TOOLID, toolID);
- propertyTable_.put(ActionInputs.VIEWID, viewID);
- propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolID);
- }
- catch (Exception e)
- {
- return false;
- }
- return true;
- }
-
- public abstract String getStatusContentVar();
-
- public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java
deleted file mode 100644
index 8a0c3f998..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060721 149070 gilberta@ca.ibm.com - Gilbert Andrews, update to respect preferences
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-
-public abstract class ImportToWorkbenchAction extends FormAction {
- private IWorkspaceRoot iWorkspaceRoot_;
- private IProject iProject_;
- private IResource targetFileResource_;
-
- public ImportToWorkbenchAction(Controller controller) {
- super(controller);
- iWorkspaceRoot_ = ResourcesPlugin.getWorkspace().getRoot();
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException {
- getSelectedFormTool();
- MessageQueue msgQueue = controller_.getCurrentPerspective().getMessageQueue();
- boolean inputsValid = true;
- String workbenchProjectName = parser.getParameter(ActionInputs.WORKBENCH_PROJECT_NAME);
- if (workbenchProjectName == null || workbenchProjectName.length() <= 0) {
- msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_WORKBENCH_PROJECT"));
- inputsValid = false;
- }
- else
- {
- iProject_ = iWorkspaceRoot_.getProject(workbenchProjectName);
- propertyTable_.put(ActionInputs.WORKBENCH_PROJECT_NAME, workbenchProjectName);
- }
- String importFile = parser.getParameter(ActionInputs.IMPORT_FILE);
- if (importFile != null)
- {
- propertyTable_.put(ActionInputs.IMPORT_FILE, ActionInputs.IMPORT_FILE);
- String importedFileName = parser.getParameter(ActionInputs.IMPORTED_FILE_NAME);
- if (importedFileName == null || importedFileName.length() <= 0)
- {
- msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_FILE_NAME"));
- inputsValid = false;
- }
- else
- propertyTable_.put(ActionInputs.IMPORTED_FILE_NAME, importedFileName);
- }
- String importToWSIL = parser.getParameter(ActionInputs.IMPORT_TO_WSIL);
- if (importToWSIL != null)
- {
- propertyTable_.put(ActionInputs.IMPORT_TO_WSIL, ActionInputs.IMPORT_TO_WSIL);
- propertyTable_.put(ActionInputs.IMPORTED_WSDL_URL, parser.getParameter(ActionInputs.IMPORTED_WSDL_URL));
- String wsilFileName = parser.getParameter(ActionInputs.WSIL_FILE_NAME);
- if (wsilFileName == null || wsilFileName.length() <= 0)
- {
- msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_WSIL_FILE_NAME"));
- inputsValid = false;
- }
- else
- propertyTable_.put(ActionInputs.WSIL_FILE_NAME, wsilFileName);
- }
- if (importFile == null && importToWSIL == null)
- {
- msgQueue.addMessage(controller_.getMessage("MSG_ERROR_NO_IMPORT_OPTION_SELECTED"));
- inputsValid = false;
- }
- return inputsValid;
- }
-
- private OutputStream getOutputStream(String defaultFileName) throws FileNotFoundException {
- File file = new File(controller_.getServletEngineStateLocation() + defaultFileName);
- FileOutputStream fos = new FileOutputStream(file);
- return fos;
- }
-
- private boolean importTempFileToWebProject(String defaultFileName) throws FileNotFoundException, CoreException
- {
- if (targetFileResource_ != null && targetFileResource_.getType() == IResource.FILE)
- targetFileResource_.delete(true,new NullProgressMonitor());
-
- String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
- File file = new File(controller_.getServletEngineStateLocation()+defaultFileName);
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
-
- IFile iFile = iProject_.getFile("/"+importedFileName);
- iFile.create(bis,true,new NullProgressMonitor());
-
- // Remove the temporary file
- file.delete();
- return true;
- }
-
- public boolean fileExists()
- {
- String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
- if (importedFileName != null)
- {
- targetFileResource_ = iProject_.findMember(importedFileName);
- return (targetFileResource_ != null && targetFileResource_.getType() == IResource.FILE);
- }
- else
- return false;
- }
-
- public boolean isTargetFileResourceReadOnly()
- {
- return targetFileResource_.getResourceAttributes().isReadOnly();
- }
-
-
- public boolean isCheckoutFilesEnabled()
- {
- return PersistentResourceContext.getInstance().isCheckoutFilesEnabled();
- }
-
- public String getWebServicePluginFileMessage(String messageId)
- {
- String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
- return controller_.getMessage(messageId,new String[]{iProject_.getFullPath().toString(),importedFileName});
- }
-
-
- public boolean isOverwriteFilesEnabled()
- {
- return PersistentResourceContext.getInstance().isOverwriteFilesEnabled();
- }
-
- public boolean validateEdit()
- {
- IFile[] files = new IFile[1];
- files[0] = (IFile)targetFileResource_;
- IStatus status = ResourcesPlugin.getWorkspace().validateEdit(files,null);
- MessageQueue messageQueue = controller_.getCurrentPerspective().getMessageQueue();
- messageQueue.addMessage(status.getMessage());
- return status.isOK();
- }
-
- public boolean run() {
- MessageQueue msgQueue = controller_.getCurrentPerspective().getMessageQueue();
- if (propertyTable_.get(ActionInputs.IMPORT_FILE) != null)
- {
- try {
- ImportToFileSystemAction action = newImportToFileSystemAction();
- action.run();
- String defaultFileName = action.getDefaultFileName();
- if (!action.write(getOutputStream(defaultFileName))) {
- msgQueue.addMessage(controller_.getMessage("MSG_ERROR_WRITING_TEMP_FILE_TO_FS"));
- return false;
- }
- importTempFileToWebProject(defaultFileName);
- String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
- msgQueue.addMessage(controller_.getMessage("MSG_INFO_IMPORT_TO_WORKBENCH_SUCCESSFUL", importedFileName));
- }
- catch (FileNotFoundException fnfe) {
- msgQueue.addMessage(fnfe.getMessage());
- return false;
- }
- catch (CoreException ce) {
- msgQueue.addMessage(ce.getMessage());
- return false;
- }
- }
- if (propertyTable_.get(ActionInputs.IMPORT_TO_WSIL) != null)
- {
- String projectName = (String)propertyTable_.get(ActionInputs.WORKBENCH_PROJECT_NAME);
- String importedWSILFileName = (String)propertyTable_.get(ActionInputs.WSIL_FILE_NAME);
- String wsdlURL = (String)propertyTable_.get(ActionInputs.IMPORTED_WSDL_URL);
- StringBuffer wsilPlatformURL = new StringBuffer("platform:/resource/");
- wsilPlatformURL.append(projectName);
- wsilPlatformURL.append('/');
- wsilPlatformURL.append(importedWSILFileName);
- AddWSDLToWSILCommand command = new AddWSDLToWSILCommand();
- String[] args = new String[5];
- args[0] = AddWSDLToWSILCommand.ARG_WSIL;
- args[1] = wsilPlatformURL.toString();
- args[2] = AddWSDLToWSILCommand.ARG_WSDL;
- args[3] = wsdlURL;
- args[4] = AddWSDLToWSILCommand.ARG_RESOLVE_WSDL;
- command.setArguments(args);
- IEnvironment env = new EclipseEnvironment(null, null, null);
- command.setEnvironment( env );
- command.execute( null, null );
- msgQueue.addMessage(controller_.getMessage("MSG_INFO_IMPORT_SERVICE_REF_TO_WSIL_SUCCESSFUL", importedWSILFileName));
- }
- return true;
- }
-
- public abstract String getStatusContentVar();
- public abstract String getStatusContentPage();
- public abstract ImportToFileSystemAction newImportToFileSystemAction();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java
deleted file mode 100644
index 853a36b2b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.LaunchWizardRunnable;
-import org.eclipse.wst.ws.internal.explorer.LaunchWizardTask;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class LaunchWebServiceWizardAction extends FormAction
-{
- public LaunchWebServiceWizardAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String wizardID = parser.getParameter(ActionInputs.WEB_SERVICE_WIZARD);
- propertyTable_.put(ActionInputs.WEB_SERVICE_WIZARD, wizardID);
- return true;
- }
-
- public boolean launchWizard(String wsdlURL)
- {
- LaunchWizardTask task = LaunchWizardTask.getInstance();
- if (task.getIsExecuting())
- {
- controller_.getCurrentPerspective().getMessageQueue().addMessage(controller_.getMessage("MSG_ERROR_WIZARD_ALREADY_RUNNING"));
- return false;
- }
- int wizardID = Integer.parseInt((String)propertyTable_.get(ActionInputs.WEB_SERVICE_WIZARD));
- LaunchWizardRunnable runnable;
- if (wizardID == ActionInputs.WEB_SERVICE_CLIENT_WIZARD)
- runnable = new LaunchWizardRunnable("org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard", wsdlURL);
- else if (wizardID == ActionInputs.WEB_SERVICE_SKELETON_WIZARD)
- runnable = new LaunchWizardRunnable("org.eclipse.jst.ws.creation.ui.wizard.serverwizard", wsdlURL);
- else
- return false;
- task.checkAndAsyncExec(runnable);
- return true;
- }
-
- public abstract String getStatusContentVar();
-
- public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java
deleted file mode 100644
index c7f644d91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-// Abstract class representing the action of clicking a link. These actions
-// may change the history list.
-public abstract class LinkAction extends Action
-{
- private boolean isAddedToHistory_;
- private boolean isStaleBreadCrumb_;
-
- public LinkAction(Controller controller)
- {
- super(controller);
- isAddedToHistory_ = false;
- isStaleBreadCrumb_ = false;
- }
-
- // Determine if the action was successfully added to this history list.
- // This should be called after the run() method.
- public final boolean isAddedToHistory()
- {
- return isAddedToHistory_;
- }
-
- protected abstract boolean processLinkParameters(HttpServletRequest request);
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- String isHistoryString = request.getParameter(ActionInputs.ISHISTORY);
- if (isHistoryString != null)
- propertyTable_.put(ActionInputs.ISHISTORY,isHistoryString);
- return processLinkParameters(request);
- }
-
- // Add the action's URL to the controller's history list.
- protected final void addToHistory(int perspectiveId,String url)
- {
- if (!isHistoryAction())
- isAddedToHistory_ = controller_.addToHistory(perspectiveId,url);
- }
-
- public final boolean isHistoryAction()
- {
- return (propertyTable_.get(ActionInputs.ISHISTORY) != null);
- }
-
- public final void setStaleBreadCrumb()
- {
- if (isHistoryAction())
- {
- isStaleBreadCrumb_ = true;
- controller_.processStaleBreadCrumb();
- }
- }
-
- public final boolean isStaleBreadCrumb()
- {
- return isStaleBreadCrumb_;
- }
-
- // Call this when a stale breadcrumb is encountered while traversing history chain.
- public final String getNextHistoryActionLink()
- {
- return RetrieveHistoryAction.getActionLink(controller_.getHistoryDirection());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java
deleted file mode 100644
index cb44a618f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class NodeAction extends LinkAction
-{
- protected NodeManager nodeManager_;
- private boolean requiresTreeViewRefresh_;
- private boolean requiresNodeSelection_;
- private boolean requiresViewSelection_;
- private boolean requiresStatusUpdate_;
-
- public NodeAction(Controller controller,NodeManager nodeManager)
- {
- super(controller);
- nodeManager_ = nodeManager;
- requiresTreeViewRefresh_ = false;
- requiresNodeSelection_ = false;
- requiresViewSelection_ = false;
- requiresStatusUpdate_ = false;
- }
-
- // ...jsp?nodeId=...<&isHistory=1>
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- String nodeIdString = request.getParameter(ActionInputs.NODEID);
- // Perform data validation.
- try
- {
- Integer.parseInt(nodeIdString);
- }
- catch (NumberFormatException e)
- {
- // Validation failed!
- return false;
- }
- propertyTable_.put(ActionInputs.NODEID,nodeIdString);
- return true;
- }
-
- protected final boolean isStaleNode(int nodeId)
- {
- return (nodeManager_.getNode(nodeId) == null);
- }
-
- /**
- * Make a node visible. A node is visible when all of its ancestors are expanded.
- * @param Node The node to be made visible.
- * @return boolean Indicator for whether or not the tree structure was changed (i.e. expanded to show the node in question).
- */
- protected final boolean makeNodeVisible(Node node)
- {
- requiresTreeViewRefresh_ = node.getNodeManager().makeNodeVisible(node);
- return requiresTreeViewRefresh_;
- }
-
- /**
- * Make a node visible. A node is visible when all of its ancestors are expanded.
- * @param Node The node to be made visible.
- * @return boolean Indicator for whether or not the tree structure was changed (i.e. expanded to show the node in question).
- */
- public final void setTreeRefreshNeeded()
- {
- requiresTreeViewRefresh_ = true;
-
- }
-
- /**
- * Select a node with id nodeId.
- * @param int The id of the node to be selected.
- */
- protected final void setSelectedNodeId(int nodeId)
- {
- if (nodeManager_.getSelectedNodeId() != nodeId)
- {
- requiresNodeSelection_ = true;
- nodeManager_.setSelectedNodeId(nodeId);
- }
- }
-
- protected final void setSelectedViewId(int viewId)
- {
- Node selectedNode = nodeManager_.getSelectedNode();
- if (selectedNode.getViewId() != viewId)
- {
- requiresViewSelection_ = true;
- selectedNode.setViewId(viewId);
- }
- }
-
- // Determine whether or not the treeview requires reloading as a result of this action.
- // Reloading is required when branches are added/removed.
- public boolean requiresTreeViewRefresh()
- {
- return requiresTreeViewRefresh_;
- }
-
- // Determine whether or not a new node has been selected as a result of the action.
- public boolean requiresNodeSelection()
- {
- return requiresNodeSelection_;
- }
-
- // Determine if a new view element is selected.
- public boolean requiresViewSelection()
- {
- return requiresViewSelection_;
- }
-
- // Determine if any status messages arose from this action.
- public boolean requiresStatusUpdate()
- {
- return requiresStatusUpdate_;
- }
-
- protected abstract String getActionLinkForHistory();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java
deleted file mode 100644
index dd2211902..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class OpenCalendarBrowserAction extends Action
-{
- public OpenCalendarBrowserAction()
- {
- }
-
- // calendar_browser.jsp?sessionId=...&calendarType=...
- public static final String getActionLink(String sessionId,int calendarType)
- {
- StringBuffer actionLink = new StringBuffer("calendar_browser.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- actionLink.append('&').append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType);
- return actionLink.toString();
- }
-
- public static final String getActionLinkForDate(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_DATE);
- }
-
- public static final String getActionLinkForDateTime(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_DATETIME);
- }
-
- public static final String getActionLinkForGYearMonth(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GYEARMONTH);
- }
-
- public static final String getActionLinkForGDay(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GDAY);
- }
-
- public static final String getActionLinkForGMonthDay(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GMONTHDAY);
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public final boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java
deleted file mode 100644
index 204cd80de..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class OpenWSDLBrowserAction extends Action
-{
- public OpenWSDLBrowserAction()
- {
- }
-
- public static final String getActionLink(String sessionId,int wsdlType)
- {
- StringBuffer actionLink = new StringBuffer("wsdl_browser.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- actionLink.append('&').append(ActionInputs.WSDL_TYPE).append('=').append(wsdlType);
- return actionLink.toString();
- }
-
- public static final String getActionLinkForService(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.WSDL_TYPE_SERVICE);
- }
-
- public static final String getActionLinkForServiceInterface(String sessionId)
- {
- return getActionLink(sessionId,ActionInputs.WSDL_TYPE_SERVICE_INTERFACE);
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public final boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java
deleted file mode 100644
index 5ee9309e6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class ProxyLoadPageAction extends Action
-{
- // Get the action given a relative targetPage URL. e.g. "forms/LongLoadingForm.jsp"
- public static final String getActionLink(String targetPage)
- {
- return getActionLink(null,targetPage);
- }
-
- // Get the action given a sessionId and a relative targetPage URL.
- public static final String getActionLink(String sessionId,String targetPage)
- {
- StringBuffer actionLink = new StringBuffer("forms/ProxyLoadPage.jsp?");
- if (sessionId != null)
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&');
- actionLink.append(ActionInputs.TARGET_PAGE).append('=').append(targetPage);
- return actionLink.toString();
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java
deleted file mode 100644
index 677050e82..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class ResizeFramesAction extends Action
-{
- protected Controller controller_;
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String frameName = parser.getParameter(ActionInputs.FRAME_NAME);
- if (frameName != null)
- propertyTable_.put(ActionInputs.FRAME_NAME,frameName);
- else
- return false;
- return processOthers(parser);
- }
-
- protected abstract boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException;
-
- public ResizeFramesAction(Controller controller)
- {
- controller_ = controller;
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- try
- {
- MultipartFormDataParser parser = new MultipartFormDataParser();
- parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
- boolean result = processParsedResults(parser);
- return result;
- }
- catch (MultipartFormDataException e)
- {
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java
deleted file mode 100644
index 9d9d22c0e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.BreadCrumb;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class RetrieveHistoryAction extends LinkAction
-{
- private BreadCrumb breadCrumb_;
-
- public RetrieveHistoryAction(Controller controller)
- {
- super(controller);
- breadCrumb_ = null;
- }
-
- // actions/RetrieveHistoryAction.jsp?jump=1 - forward (ActionInputs.JUMP_FORWARD)
- // actions/RetrieveHistoryAction.jsp?jump=-1 - backward (ActionInputs.JUMP_BACK)
- public final static String getActionLink(int jump)
- {
- StringBuffer actionLink = new StringBuffer("actions/RetrieveHistoryActionJSP.jsp?");
- actionLink.append(ActionInputs.JUMP).append('=').append(jump);
- return actionLink.toString();
- }
-
- protected final boolean processLinkParameters(HttpServletRequest request)
- {
- String jumpString = request.getParameter(ActionInputs.JUMP);
- // Perform data validation.
- try
- {
- Integer.parseInt(jumpString);
- }
- catch (NumberFormatException e)
- {
- // Validation failed!
- return false;
- }
- propertyTable_.put(ActionInputs.JUMP,jumpString);
- return true;
- }
-
- public final boolean run()
- {
- int jump = Integer.parseInt((String)propertyTable_.get(ActionInputs.JUMP));
- switch (jump)
- {
- case ActionInputs.JUMP_FORWARD:
- breadCrumb_ = controller_.forward();
- return true;
- case ActionInputs.JUMP_BACK:
- breadCrumb_ = controller_.back();
- return true;
- }
- return false;
- }
-
- public final BreadCrumb getBreadCrumb()
- {
- return breadCrumb_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java
deleted file mode 100644
index 3238e88e8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.NodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class SelectNodeAction extends NodeAction
-{
- protected Node selectedNode_;
-
- public SelectNodeAction(Controller controller,NodeManager nodeManager)
- {
- super(controller,nodeManager);
- selectedNode_ = null;
- }
-
- public final void performBaseAction(int nodeId)
- {
- setSelectedNodeId(nodeId);
- selectedNode_ = nodeManager_.getSelectedNode();
- }
-
- public void performExtendedAction()
- {
- //the extended classes can interject here
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- // Ensure that the node is visible.
- makeNodeVisible(nodeManager_.getNode(nodeId));
- performBaseAction(nodeId);
- performExtendedAction();
- addToHistory(getPerspectiveId(),getActionLinkForHistory());
- return true;
- }
- setStaleBreadCrumb();
- return false;
- }
-
- public final Node getSelectedNode()
- {
- return selectedNode_;
- }
-
- public ITransformer[] getTransformers()
- {
- return new ITransformer[] {new NodeSelectionTransformer(controller_)};
- }
-
- // Selecting a node changes the treeview content and the properties container.
- public abstract String getTreeContentVar();
- public abstract String getTreeContentPage();
- public abstract String getPropertiesContainerVar();
- public abstract String getPropertiesContainerPage();
- public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java
deleted file mode 100644
index cf6ffe89f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.CurrentNodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-public abstract class SelectNodeToolAction extends SelectNodeAction
-{
- protected NodeManager nodeManager_;
- protected Tool selectedTool_;
-
- public SelectNodeToolAction(Controller controller,NodeManager nodeManager)
- {
- super(controller,nodeManager);
- nodeManager_ = nodeManager;
- selectedTool_ = null;
- }
-
- public final NodeManager getNodeManager()
- {
- return nodeManager_;
- }
-
- // ...jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...><&isHistory=1>
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- boolean result = super.processLinkParameters(request);
- String toolIdString = request.getParameter(ActionInputs.TOOLID);
- String viewIdString = request.getParameter(ActionInputs.VIEWID);
- String viewToolIdString = request.getParameter(ActionInputs.VIEWTOOLID);
-
- // Perform data validation.
- try
- {
- Integer.parseInt(toolIdString);
- }
- catch (NumberFormatException e)
- {
- // Validation failed.
- return false;
- }
- propertyTable_.put(ActionInputs.TOOLID,toolIdString);
-
- // Optional properties
- try
- {
- int viewId = Integer.parseInt(viewIdString);
- propertyTable_.put(ActionInputs.VIEWID,viewIdString);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- {
- Integer.parseInt(viewToolIdString);
- propertyTable_.put(ActionInputs.VIEWTOOLID,viewToolIdString);
- }
- }
- catch (NumberFormatException e)
- {
- }
- return result;
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- // Ensure that the node is visible.
- makeNodeVisible(nodeManager_.getNode(nodeId));
- setSelectedNodeId(nodeId);
- selectedNode_ = nodeManager_.getSelectedNode();
- int toolId = Integer.parseInt((String)propertyTable_.get(ActionInputs.TOOLID));
- ToolManager toolManager = selectedNode_.getToolManager();
- toolManager.setSelectedToolId(toolId);
- selectedTool_ = toolManager.getSelectedTool();
- String viewIdString = ((String)propertyTable_.get(ActionInputs.VIEWID));
- if (viewIdString != null)
- {
- int viewId = Integer.parseInt(viewIdString);
- setSelectedViewId(viewId);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- {
- String viewToolIdString = ((String)propertyTable_.get(ActionInputs.VIEWTOOLID));
- ViewTool viewTool = (ViewTool)selectedTool_;
- if (viewToolIdString != null)
- {
- int viewToolId = Integer.parseInt(viewToolIdString);
- ToolManager viewToolManager = selectedNode_.getViewToolManager();
- if (viewToolManager == null)
- {
- if (!isHistoryAction())
- {
- viewToolManager = viewTool.createToolManager(viewId);
- viewToolId = viewToolManager.getSelectedToolId();
- }
- else
- {
- setStaleBreadCrumb();
- return false;
- }
- }
- viewToolManager.setSelectedToolId(viewToolId);
- }
- }
- }
- else
- setSelectedViewId(ActionInputs.VIEWID_DEFAULT);
- addToHistory(getPerspectiveId(),getActionLinkForHistory());
- return true;
- }
- setStaleBreadCrumb();
- return false;
- }
-
- public ITransformer[] getTransformers()
- {
- return new ITransformer[] {new CurrentNodeSelectionTransformer(controller_)};
- }
-
- public final Tool getSelectedViewTool()
- {
- if (propertyTable_.get(ActionInputs.VIEWID) != null)
- return selectedNode_.getViewToolManager().getSelectedTool();
- return null;
- }
-
- public final Tool getSelectedTool()
- {
- return selectedTool_;
- }
-
- // Selecting a node tool updates the properties content. Also, in the event
- // of a history switch, nodes may need to be selected resulting in changes to
- // both the treeview content and the properties container. These requirements are
- // covered through the base class.
- public abstract String getPropertiesContentVar();
- public abstract String getPropertiesContentPage();
- public String getStatusContentVar()
- {
- return null;
- }
-
- public String getStatusContentPage()
- {
- return null;
- }
-
- public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java
deleted file mode 100644
index da74fa08f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ShowPerspectiveAction extends LinkAction
-{
- public ShowPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- // actions/show_perspective.jsp?perspective=0<&isHistory=1> - UDDI (ActionInputs.PERSPECTIVE_UDDI)
- // actions/show_perspective.jsp?perspective=1<&isHistory=1> - WSIL (ActionInputs.PERSPECTIVE_WSIL)
- // actions/show_perspective.jsp?perspective=2<&isHistory=1> - WSDL (ActionInputs.PERSPECTIVE_WSDL)
- // actions/show_perspective.jsp?perspective=3<&isHistory=1> - Favorites (ActionInputs.PERSPECTIVE_FAVORITES)
- public final static String getActionLink(int newPerspective,boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("actions/ShowPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.PERSPECTIVE).append('=').append(newPerspective);
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- return true;
- }
-
- protected final boolean processLinkParameters(HttpServletRequest request)
- {
- boolean result = false;
- String perspectiveString = request.getParameter(ActionInputs.PERSPECTIVE);
- // Perform data validation.
- try
- {
- Integer.parseInt(perspectiveString);
- propertyTable_.put(ActionInputs.PERSPECTIVE,perspectiveString);
- MultipartFormDataParser parser = new MultipartFormDataParser();
- parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
- result = processParsedResults(parser);
- removedProperties_.removeAllElements();
- }
- catch (NumberFormatException e)
- {
- // Validation failed! - This should not happen.
- }
- catch (MultipartFormDataException e)
- {
- }
- return result;
- }
-
- public boolean run()
- {
- int perspective = Integer.parseInt((String)propertyTable_.get(ActionInputs.PERSPECTIVE));
- controller_.setCurrentPerspective(perspective);
- addToHistory(perspective,getActionLink(perspective,true));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java
deleted file mode 100644
index 2c05b4040..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.NodeIdTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class ToggleNodeAction extends NodeAction
-{
- protected Node toggledNode_;
- public ToggleNodeAction(Controller controller,NodeManager nodeManager)
- {
- super(controller,nodeManager);
- toggledNode_ = null;
- }
-
- // Toggle the current node and update the selection iff the currently selected
- // is a related descendant of a collapsed node.
- /**
- * Toggle the current node and update the selection iff the currently selected
- * node is a related descendant of the current node and the current node is
- * now collapsed as a result of this action.
- *
- * @param int The node ID of the node for which this action applies to.
- * @return boolean Indicator of whether or not a selection change was necessary.
- */
- public final boolean performBaseAction(int nodeId)
- {
- toggledNode_ = nodeManager_.getNode(nodeId);
- nodeManager_.setFocusedNodeId(nodeId);
- toggledNode_.setVisibilityOfChildren(!toggledNode_.isOpen());
- Node selectedNode = nodeManager_.getSelectedNode();
- if (selectedNode != null)
- {
- if (!selectedNode.isVisible())
- {
- setSelectedNodeId(nodeId);
- return true;
- }
- }
- return false;
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- if (performBaseAction(nodeId))
- {
- // Save the selection of the toggle link in the history.
- addToHistory(getPerspectiveId(),getActionLinkForHistory());
- }
- // Do not save the toggle in history.
- return true;
- }
- setStaleBreadCrumb();
- return false;
- }
-
- public final Node getToggledNode()
- {
- return toggledNode_;
- }
-
- public ITransformer[] getTransformers()
- {
- return new ITransformer[] {new NodeIdTransformer(controller_)};
- }
-
- public abstract String getTreeContentVar();
- public abstract String getTreeContentPage();
- public abstract String getPropertiesContainerVar();
- public abstract String getPropertiesContainerPage();
- public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java
deleted file mode 100644
index 0094f549c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class ValidateEditAction extends Action
-{
- public static final String getActionLink()
- {
- return "actions/ValidateEditActionJSP.jsp";
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java
deleted file mode 100644
index 3624f2548..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-public class WSDLFileNameHelper
-{
- private static final String default_ = "temp.wsdl";
-
- /**
- * Given a wsdl path (file, URL etc.), guess at the file name by looking for the .wsdl extension at the end of the
- * path and the file that it belongs to. If this is not possible, return the default defined in this class.
- * @param String The path (file, URL etc.) of this WSDL file.
- * @return String The WSDL file name determined by this routine.
- */
- public static final String getWSDLFileName(String wsdlPathname)
- {
- if (wsdlPathname != null)
- {
- if (wsdlPathname.endsWith(".wsdl"))
- {
- int lastSeparatorPos = Math.max(wsdlPathname.lastIndexOf("/"),wsdlPathname.lastIndexOf("\\"));
- if (lastSeparatorPos > 0)
- return wsdlPathname.substring(lastSeparatorPos+1,wsdlPathname.length());
- }
- }
- return default_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java
deleted file mode 100644
index 91369b203..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class WriteWSDLToWorkbenchAction extends Action
-{
- public static final String getActionLink()
- {
- return "actions/WriteWSDLToWorkbenchActionJSP.jsp";
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java
deleted file mode 100644
index d560cf0da..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.constants;
-
-public class ActionInputs
-{
- // URL parm for all actions which are in the history list.
- public static final String ISHISTORY = "isHistory";
-
- // Utility constant for tree node identification.
- public static final String NODEID = "nodeId";
-
- // Utility constant for tool identification.
- public static final String TOOLID = "toolId";
-
- // Utility constant for view identification.
- public static final String VIEWID = "viewId";
- public static final int VIEWID_DEFAULT = -1;
-
- // Utility constant for view tool identification.
- public static final String VIEWTOOLID = "viewToolId";
- public static final int VIEWTOOLID_DEFAULT = -1;
-
- // Utility constants for transport classes
- public static final String TRANSPORT_CLASS_NAME = "org.uddi4j.TransportClassName";
- public static final String TRASPORT_CLASS = "org.uddi4j.transport.ApacheAxisTransport";
- //public static final String AXIS_TRANSPORT_CLASS = "org.uddi4j.transport.ApacheAxisTransport";
- //public static final String SOAP_TRANSPORT_CLASS = "org.uddi4j.transport.ApacheSOAPTransport";
-
- // ToggleNodeAction and its derivatives.
- public static final String OPEN = "open";
- public static final int OPEN_NODE = 1;
- public static final int CLOSE_NODE = 0;
-
- // ShowPerspectiveAction
- public static final String PERSPECTIVE = "perspective";
- public static final int PERSPECTIVE_UDDI = 0;
- public static final int PERSPECTIVE_WSIL = 1;
- public static final int PERSPECTIVE_WSDL = 2;
- public static final int PERSPECTIVE_FAVORITES = 3;
-
- // RetrieveHistoryAction
- public static final String JUMP = "jump";
- public static final int JUMP_FORWARD = 1;
- public static final int JUMP_BACK = -1;
-
- // LaunchWebServiceWizardAction
- public final static String WEB_SERVICE_WIZARD = "webServiceWizard";
- public final static int WEB_SERVICE_CLIENT_WIZARD = 0;
- public final static int WEB_SERVICE_SKELETON_WIZARD = 1;
-
- // ImportToWorkbenchAction
- public final static String WORKBENCH_PROJECT_NAME = "workbenchProjectName";
- public final static String IMPORT_FILE = "importWSDL";
- public final static String IMPORTED_FILE_NAME = "importedFileName";
- public final static String IMPORT_TO_WSIL = "importToWSIL";
- public final static String WSIL_FILE_NAME = "WSILFileName";
- public final static String IMPORTED_WSDL_URL = "importedWsdlUrl";
- public final static String IMPORT_ACTION = "importAction";
-
- // ProxyLoadAction
- public final static String TARGET_PAGE = "targetPage";
-
- // Session ID for pop ups whose browsers choose to ignore the session.
- public final static String SESSIONID = "sId";
-
- // WSDL Browser
- public static final String PROJECT = "project";
- public static final String CATEGORY = "category";
- public static final String WSDL_TYPE = "wsdlType";
- public static final int WSDL_TYPE_SERVICE_INTERFACE = 0;
- public static final int WSDL_TYPE_SERVICE = 1;
- public static final String QUERY_INPUT_WEBPROJECT_WSDL_URL = "webProjectWSDLURL";
- public static final String QUERY_INPUT_FAVORITE_WSDL_URL = "favoriteWSDLURL";
- public static final String QUERY_INPUT_WSDL_URL = "wsdlURL";
-
- // Calendar Browser
- public static final String CALENDAR_TYPE = "calendarType";
- public static final int CALENDAR_TYPE_DATE = 0;
- public static final int CALENDAR_TYPE_DATETIME = 1;
- public static final int CALENDAR_TYPE_GYEARMONTH = 2;
- public static final int CALENDAR_TYPE_GDAY = 3;
- public static final int CALENDAR_TYPE_GMONTHDAY = 4;
-
- // ResizeFrameAction
- public static final String FRAME_NAME = "frameName";
-
- // Other Actions
- public static final String CURRENT_TOOL_MANAGER = "currentToolManager";
-
- // Action Engine
- public static final String ACTION_ENGINE_SCENARIO = "actionEngineScenario";
- public static final String ACTION_ENGINE_MODE = "actionEngineMode";
-
- // MultipartFormDataParser
- public static final String MULTIPART_FORM_DATA_PARSER = "multipartFormDataParser";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java
deleted file mode 100644
index 1e853870e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.constants;
-
-public class FrameNames
-{
- // wsexplorer.jsp
- public final static String WINDOW_NAME_WSEXPLORER_JSP = "wsexplorer.jsp";
- public final static String PERSPECTIVE_WORKAREA = "perspective_workarea";
- public final static String PERSPECTIVE_TOOLBAR = "perspective_toolbar";
- public final static String PERSPECTIVE_CONTENT = "perspective_content";
-
- // WSDL Browser
- public final static String WSDL_TOOLBAR = "wsdl_toolbar";
- public final static String WSDL_CONTENT = "wsdl_content";
-
- // Calendar Browser
- public final static String CALENDAR_TOOLBAR = "calendar_toolbar";
- public final static String CALENDAR_CONTENT = "calendar_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java
deleted file mode 100644
index 1a87dd262..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.constants;
-
-public class ModelConstants
-{
- public static final String REL_ID = "relationshipId";
- public static final String REL_LOCALNAME_SEPARATOR = "#";
- public static final String REL_OWNER = "owner";
- public static final String REL_CHILDREN = "children";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java
deleted file mode 100644
index 7b92cb493..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.constants;
-
-public class ToolTypes
-{
- public static final byte FORM = 0;
- public static final byte ACTION = 1;
- public static final byte VIEW = 2;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java
deleted file mode 100644
index 6de8c266e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.datamodel;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-
-public class ListElement
-{
- private int viewId_;
- private Object object_;
- // For search parameters: info on the Node and ViewTool holding this element.
- private int targetNodeId_;
- private int targetToolId_;
- private int targetViewId_;
-
- public ListElement(Object object)
- {
- object_ = object;
- viewId_ = ActionInputs.VIEWID_DEFAULT;
- targetNodeId_ = -1;
- targetToolId_ = -1;
- targetViewId_ = ActionInputs.VIEWID_DEFAULT;
- }
-
- public final Object getObject()
- {
- return object_;
- }
-
- public final void setViewId(int viewId)
- {
- viewId_ = viewId;
- }
-
- public final int getViewId()
- {
- return viewId_;
- }
-
- public final void setTargetViewToolInfo(int nodeId,int toolId,int viewId)
- {
- targetNodeId_ = nodeId;
- targetToolId_ = toolId;
- targetViewId_ = viewId;
- }
-
- public final int getTargetNodeId()
- {
- return targetNodeId_;
- }
-
- public final int getTargetToolId()
- {
- return targetToolId_;
- }
-
- public final int getTargetViewId()
- {
- return targetViewId_;
- }
-
- public final String toString() {
- return getObject().toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java
deleted file mode 100644
index f8a78ab2e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public class ListManager
-{
- private int nextViewId_;
- private Vector itemsList_;
- private Hashtable itemsTable_;
-
- public ListManager()
- {
- nextViewId_ = 0;
- itemsList_ = new Vector();
- itemsTable_ = new Hashtable();
- }
-
- private final void updateManager(ListElement element)
- {
- itemsTable_.put(String.valueOf(nextViewId_),element);
- element.setViewId(nextViewId_);
- nextViewId_++;
- }
-
- public final void add(ListElement element)
- {
- itemsList_.addElement(element);
- updateManager(element);
- }
-
- public final void addWithCurrentViewId(ListElement element)
- {
- itemsList_.addElement(element);
- itemsTable_.put(String.valueOf(element.getViewId()),element);
- }
-
- public final ListElement elementAt(int index)
- {
- return (ListElement)itemsList_.elementAt(index);
- }
-
- public final ListElement getElementWithViewId(int viewId)
- {
- return (ListElement)itemsTable_.get(String.valueOf(viewId));
- }
-
- public final void removeElementWithViewId(int viewId)
- {
- itemsTable_.remove(String.valueOf(viewId));
- for (int i=0;i<itemsList_.size();i++)
- {
- ListElement listElement = elementAt(i);
- if (listElement.getViewId() == viewId)
- {
- itemsList_.removeElementAt(i);
- break;
- }
- }
- }
-
- public final void removeElementAt(int index)
- {
- ListElement listElement = (ListElement)elementAt(index);
- itemsList_.removeElementAt(index);
- itemsTable_.remove(String.valueOf(listElement.getViewId()));
- }
-
- public final void insertElementAt(ListElement element,int index)
- {
- itemsList_.insertElementAt(element,index);
- updateManager(element);
- }
-
- public final Enumeration getListElements()
- {
- return itemsList_.elements();
- }
-
- public final void clear()
- {
- itemsList_.removeAllElements();
- itemsTable_.clear();
- }
-
- public final ListManager copy(ListManager newListManager)
- {
- newListManager.clear();
- for (int i=0;i<itemsList_.size();i++)
- {
- ListElement listElement = (ListElement)elementAt(i);
- ListElement newListElement = new ListElement(listElement.getObject());
- newListElement.setViewId(listElement.getViewId());
- newListElement.setTargetViewToolInfo(listElement.getTargetNodeId(),listElement.getTargetToolId(),listElement.getTargetViewId());
- newListManager.addWithCurrentViewId(newListElement);
- }
- newListManager.setNextViewId(nextViewId_);
- return newListManager;
- }
-
- public final void setNextViewId(int nextViewId)
- {
- nextViewId_ = nextViewId;
- }
-
- public final int getNextViewId()
- {
- return nextViewId_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java
deleted file mode 100644
index 25d098105..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class TreeElement extends BasicElement
-{
- private String key_;
-
- public TreeElement(String name,Model model)
- {
- super(name,model);
- key_ = name;
- }
-
- public void setKey(String key)
- {
- key_ = key;
- }
-
- public String getKey()
- {
- return key_;
- }
-
- public boolean equals(TreeElement element)
- {
- if (key_ == null)
- return false;
- return key_.equals(element.getKey());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java
deleted file mode 100644
index 93af2b41f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.constants.ActionDataConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class ActionDataParser
-{
- private Document doc;
-
- public ScenarioDescriptor parseScenario(Element e)
- {
- ScenarioDescriptor scenarioDescriptor = new ScenarioDescriptor();
- NodeList transactions = e.getElementsByTagName(ActionDataConstants.ELEMENT_TRANSACTION);
- TransactionDescriptor[] transactionDescriptors = new TransactionDescriptor[transactions.getLength()];
- for (int i = 0; i < transactionDescriptors.length; i++)
- transactionDescriptors[i] = parseTransaction((Element) transactions.item(i));
- scenarioDescriptor.setTransactionDescriptors(transactionDescriptors);
- return scenarioDescriptor;
- }
-
- public TransactionDescriptor parseTransaction(Element e)
- {
- TransactionDescriptor transactionDescriptor = new TransactionDescriptor();
- NodeList actions = e.getElementsByTagName(ActionDataConstants.ELEMENT_ACTION);
- ActionDescriptor[] actionDescriptors = new ActionDescriptor[actions.getLength()];
- for (int i = 0; i < actionDescriptors.length; i++)
- actionDescriptors[i] = parseAction((Element) actions.item(i));
- transactionDescriptor.setActionDescriptors(actionDescriptors);
- return transactionDescriptor;
- }
-
- public ActionDescriptor parseAction(Element e)
- {
- ActionDescriptor actionDescriptor = new ActionDescriptor();
- actionDescriptor.setId(e.getAttribute(ActionDataConstants.ATTR_ID));
- try
- {
- actionDescriptor.setAttempts(Integer.parseInt(e.getAttribute(ActionDataConstants.ATTR_ATTEMPTS)));
- }
- catch (Throwable t)
- {
- actionDescriptor.setAttempts(1);
- }
- actionDescriptor.setStatusId(e.getAttribute(ActionDataConstants.ATTR_STATUS_ID));
- Hashtable propertiesTable = new Hashtable();
- NodeList properties = e.getElementsByTagName(ActionDataConstants.ELEMENT_PROPERTY);
- for (int i = 0; i < properties.getLength(); i++)
- {
- Element property = (Element) properties.item(i);
- String name = property.getAttribute(ActionDataConstants.ATTR_NAME);
- NodeList valueList = property.getElementsByTagName(ActionDataConstants.ELEMENT_VALUE);
- if (valueList.getLength() > 1)
- {
- String[] values = new String[valueList.getLength()];
- for (int j = 0; j < values.length; j++)
- {
- Element value = (Element) valueList.item(j);
- Node textNode = value.getFirstChild();
- values[j] = (textNode != null) ? textNode.getNodeValue().trim() : "";
- }
- propertiesTable.put(name, values);
- }
- else
- {
- Node textNode = ((Element) valueList.item(0)).getFirstChild();
- propertiesTable.put(name, (textNode != null) ? textNode.getNodeValue().trim() : "");
- }
- }
- actionDescriptor.setProperties(propertiesTable);
- NodeList statusList = e.getElementsByTagName(ActionDataConstants.ELEMENT_STATUS);
- for (int i = 0; i < statusList.getLength(); i++)
- {
- Element status = (Element)statusList.item(i);
- CDATASection cData = (CDATASection)status.getFirstChild();
- actionDescriptor.addStatus(cData.getData());
- }
- return actionDescriptor;
- }
-
- public Element toElement(ScenarioDescriptor scenarioDescriptor)
- {
- try
- {
- Document document = getDocument();
- Element scenarioElement = document.createElement(ActionDataConstants.ELEMENT_SCENARIO);
- TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
- for (int i = 0; i < transactionDescriptors.length; i++)
- {
- Element transactionElement = toElement(transactionDescriptors[i]);
- if (transactionElement != null)
- scenarioElement.appendChild(transactionElement);
- }
- return scenarioElement;
- }
- catch (DOMException dome)
- {
- return null;
- }
- }
-
- public Element toElement(TransactionDescriptor transactionDescriptor)
- {
- try
- {
- Document document = getDocument();
- Element transactionElement = document.createElement(ActionDataConstants.ELEMENT_TRANSACTION);
- ActionDescriptor[] actionDescriptors = transactionDescriptor.getActionDescriptors();
- for (int i = 0; i < actionDescriptors.length; i++)
- {
- Element actionElement = toElement(actionDescriptors[i]);
- if (actionElement != null)
- transactionElement.appendChild(actionElement);
- }
- return transactionElement;
- }
- catch (DOMException dome)
- {
- return null;
- }
- }
-
- public Element toElement(ActionDescriptor actionDescriptor)
- {
- try
- {
- Document document = getDocument();
- Element actionElement = document.createElement(ActionDataConstants.ELEMENT_ACTION);
- actionElement.setAttribute(ActionDataConstants.ATTR_ID, actionDescriptor.getId());
- actionElement.setAttribute(ActionDataConstants.ATTR_ATTEMPTS, String.valueOf(actionDescriptor.getAttempts()));
- String statusId = actionDescriptor.getStatusId();
- if (statusId != null)
- actionElement.setAttribute(ActionDataConstants.ATTR_STATUS_ID, statusId);
- Hashtable properties = actionDescriptor.getProperties();
- if (properties != null)
- {
- for (Iterator it = properties.keySet().iterator(); it.hasNext();)
- {
- Object key = it.next();
- Object value = properties.get(key);
- Object[] values;
- if (value.getClass().isArray())
- values = (Object[])value;
- else if (value instanceof List)
- values = ((List)value).toArray();
- else
- values = new Object[] {value};
- boolean isAdded = false;
- Element propertyElement = document.createElement(ActionDataConstants.ELEMENT_PROPERTY);
- propertyElement.setAttribute(ActionDataConstants.ATTR_NAME, key.toString());
- for (int i = 0; i < values.length; i++)
- {
- if (values[i] instanceof String)
- {
- Element valueElement = document.createElement(ActionDataConstants.ELEMENT_VALUE);
- valueElement.appendChild(document.createTextNode(values[i].toString()));
- propertyElement.appendChild(valueElement);
- isAdded = true;
- }
- }
- if (isAdded)
- actionElement.appendChild(propertyElement);
- }
- }
- List status = actionDescriptor.getStatus();
- if (status != null)
- {
- for (Iterator it = status.iterator(); it.hasNext();)
- {
- Element statusElement = document.createElement(ActionDataConstants.ELEMENT_STATUS);
- CDATASection cData = document.createCDATASection(it.next().toString());
- statusElement.appendChild(cData);
- actionElement.appendChild(statusElement);
- }
- }
- return actionElement;
- }
- catch (DOMException dome)
- {
- return null;
- }
- }
-
- private Document getDocument()
- {
- try
- {
- if (doc == null)
- {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- doc = builder.newDocument();
- }
- return doc;
- }
- catch (FactoryConfigurationError fce)
- {
- return null;
- }
- catch (ParserConfigurationException pce)
- {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java
deleted file mode 100644
index b02e2db86..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.constants.ActionDataConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class ActionEngine
-{
- public static final byte MODE_DISABLED = 0x0;
- public static final byte MODE_STOP = 0x1;
- public static final byte MODE_RECORD = 0x2;
- public static final byte MODE_PLAY = 0x3;
-
- private Controller controller;
- private byte mode;
- private Vector actionDescriptors;
-
- public ActionEngine(Controller controller)
- {
- this.controller = controller;
- mode = MODE_DISABLED;
- actionDescriptors = new Vector();
- }
-
- public void executeScenario(ScenarioDescriptor scenarioDescriptor)
- {
- TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
- for (int i = 0; i < transactionDescriptors.length; i++)
- executeTransaction(transactionDescriptors[i]);
- }
-
- public boolean executeTransaction(TransactionDescriptor transactionDescriptor)
- {
- boolean result = true;
- ActionDescriptor[] actionDescriptors = transactionDescriptor.getActionDescriptors();
- for (int i = 0; i < actionDescriptors.length; i++)
- {
- if (result)
- {
- if (!executeAction(actionDescriptors[i]))
- result = false;
- }
- else
- actionDescriptors[i].setStatusId(ActionDataConstants.VALUE_STATUS_ID_UNATTEMPTED);
- }
- return result;
- }
-
- public boolean executeAction(ActionDescriptor actionDescriptor)
- {
- int attempts = actionDescriptor.getAttempts();
- for (int i = 0; i < attempts; i++)
- {
- try
- {
- Class classAction = Class.forName(actionDescriptor.getId());
- if (Action.class.isAssignableFrom(classAction))
- {
- Action action = (Action) newInstance(classAction);
- if (action != null)
- {
- Hashtable properties = actionDescriptor.getProperties();
- ITransformer[] transformers = action.getTransformers();
- for (int j = 0; j < transformers.length; j++)
- properties = transformers[j].deNormalize(properties);
- action.setPropertyTable(properties);
- boolean actionResult = action.run();
- // TODO actionDescriptor.addStatus(action.getStatus());
- if (actionResult)
- {
- actionDescriptor.setStatusId(ActionDataConstants.VALUE_STATUS_ID_PASSED);
- return true;
- }
- }
- else
- throw new ClassNotFoundException(actionDescriptor.getId());
- }
- }
- catch (ClassNotFoundException cnfe)
- {
- cnfe.printStackTrace();
- StringWriter sw = new StringWriter();
- cnfe.printStackTrace(new PrintWriter(sw));
- actionDescriptor.addStatus(sw.getBuffer().toString());
- }
- catch (Throwable t)
- {
- t.printStackTrace();
- StringWriter sw = new StringWriter();
- t.printStackTrace(new PrintWriter(sw));
- actionDescriptor.addStatus(sw.getBuffer().toString());
- }
- }
- actionDescriptor.setStatusId(ActionDataConstants.VALUE_STATUS_ID_FAILED);
- return false;
- }
-
- private ScenarioDescriptor newScenarioDescriptor()
- {
- return new ScenarioDescriptor();
- }
-
- private TransactionDescriptor newTransactionDescriptor()
- {
- return new TransactionDescriptor();
- }
-
- private ActionDescriptor newActionDescriptor(Action action)
- {
- ActionDescriptor actionDescriptor = new ActionDescriptor();
- actionDescriptor.setId(action.getClass().getName());
- Hashtable properties = new Hashtable(action.getPropertyTable());
- ITransformer[] transformers = action.getTransformers();
- for (int i = 0; i < transformers.length; i++)
- properties = transformers[i].normalize(properties);
- actionDescriptor.setProperties(properties);
- return actionDescriptor;
- }
-
- private Object newInstance(Class c)
- {
- try
- {
- // instantiates the action using the constructor that takes in a
- // controller object
- Constructor constructor = c.getConstructor(new Class[]{Controller.class});
- return constructor.newInstance(new Object[]{controller});
- }
- catch (NoSuchMethodException nsme)
- {
- }
- catch (InstantiationException ie)
- {
- }
- catch (IllegalAccessException iae)
- {
- }
- catch (InvocationTargetException ite)
- {
- }
- catch (Throwable t)
- {
- }
- Object instance = null;
- try
- {
- // instantiates the action using the default constructor
- Constructor constructor = c.getConstructor(new Class[0]);
- instance = constructor.newInstance(new Object[0]);
- Method method = c.getMethod("setController", new Class[]{Controller.class});
- method.invoke(instance, new Object[]{controller});
- }
- catch (NoSuchMethodException nsme)
- {
- }
- catch (InstantiationException ie)
- {
- }
- catch (IllegalAccessException iae)
- {
- }
- catch (IllegalArgumentException iae)
- {
- }
- catch (InvocationTargetException ite)
- {
- }
- catch (Throwable t)
- {
- }
- return instance;
- }
-
- public byte getMode()
- {
- return mode;
- }
-
- public void setMode(byte mode)
- {
- this.mode = mode;
- if (mode == MODE_RECORD)
- {
- actionDescriptors = new Vector();
- ShowPerspectiveAction showPerspectiveAction = new ShowPerspectiveAction(controller);
- showPerspectiveAction.addProperty(ActionInputs.PERSPECTIVE, String.valueOf(controller.getCurrentPerspective().getPerspectiveId()));
- actionDescriptors.add(newActionDescriptor(showPerspectiveAction));
- }
- }
-
- public boolean executeAction(Action action)
- {
- if (mode == MODE_RECORD)
- {
- ActionDescriptor actionDescriptor = newActionDescriptor(action);
- actionDescriptors.add(actionDescriptor);
- }
- return action.run();
- }
-
- public ScenarioDescriptor getScenario()
- {
- ScenarioDescriptor scenarioDescriptor = newScenarioDescriptor();
- TransactionDescriptor transactionDescriptor = newTransactionDescriptor();
- ActionDescriptor[] actionDescriptorArray = (ActionDescriptor[])actionDescriptors.toArray(new ActionDescriptor[0]);
- transactionDescriptor.setActionDescriptors(actionDescriptorArray);
- scenarioDescriptor.setTransactionDescriptors(new TransactionDescriptor[] {transactionDescriptor});
- return scenarioDescriptor;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java
deleted file mode 100644
index cf716de8a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.constants;
-
-public class ActionDataConstants
-{
- public static final String ATTR_ID = "id";
- public static final String ATTR_NAME = "name";
- public static final String ATTR_ATTEMPTS = "attempts";
- public static final String ATTR_STATUS_ID = "statusId";
-
- public static final String ELEMENT_SCENARIO = "scenario";
- public static final String ELEMENT_TRANSACTION = "transaction";
- public static final String ELEMENT_ACTION = "action";
- public static final String ELEMENT_PROPERTY = "property";
- public static final String ELEMENT_VALUE = "value";
- public static final String ELEMENT_STATUS = "status";
-
- public static final String VALUE_STATUS_ID_UNATTEMPTED = "unattempted";
- public static final String VALUE_STATUS_ID_PASSED = "passed";
- public static final String VALUE_STATUS_ID_FAILED = "failed";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java
deleted file mode 100644
index 17a600ea1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.data;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-public class ActionDescriptor
-{
- private String id;
- private Hashtable properties;
- private int attempts;
- private String statusId;
- private List statusList;
-
- public ActionDescriptor()
- {
- attempts = 1;
- }
-
- public String getId()
- {
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public Hashtable getProperties()
- {
- return properties;
- }
-
- public void setProperties(Hashtable properties)
- {
- this.properties = properties;
- }
-
- public int getAttempts()
- {
- return attempts;
- }
-
- public void setAttempts(int attempts)
- {
- this.attempts = attempts;
- }
-
- public String getStatusId()
- {
- return statusId;
- }
-
- public void setStatusId(String statusId)
- {
- this.statusId = statusId;
- }
-
- public void addStatus(Object status)
- {
- if (status != null)
- {
- if (statusList == null)
- statusList = new Vector();
- statusList.add(status);
- }
- }
-
- public boolean removeStatus(Object status)
- {
- if (status != null && statusList != null)
- return statusList.remove(status);
- else
- return false;
- }
-
- public List getStatus()
- {
- return statusList;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java
deleted file mode 100644
index 86e92ad31..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.data;
-
-public class ScenarioDescriptor
-{
- private TransactionDescriptor[] transactionDescriptors;
-
- public TransactionDescriptor[] getTransactionDescriptors()
- {
- return transactionDescriptors;
- }
-
- public void setTransactionDescriptors(TransactionDescriptor[] transactionDescriptors)
- {
- this.transactionDescriptors = transactionDescriptors;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java
deleted file mode 100644
index d917a10df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.data;
-
-public class TransactionDescriptor
-{
- private ActionDescriptor[] actionDescriptors;
-
- public ActionDescriptor[] getActionDescriptors()
- {
- return actionDescriptors;
- }
-
- public void setActionDescriptors(ActionDescriptor[] actionDescriptors)
- {
- this.actionDescriptors = actionDescriptors;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java
deleted file mode 100644
index 3966e6dd8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-
-public class CurrentNodeSelectionTransformer implements ITransformer
-{
- protected Controller controller;
- protected String key;
-
- public CurrentNodeSelectionTransformer(Controller controller)
- {
- this(controller, ActionInputs.NODEID);
- }
-
- public CurrentNodeSelectionTransformer(Controller controller, String key)
- {
- this.controller = controller;
- this.key = key;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- return properties;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
- if (currNode != null)
- properties.put(key, String.valueOf(currNode.getNodeId()));
- return properties;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java
deleted file mode 100644
index d416d30cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-
-public interface ITransformer
-{
- public Hashtable normalize(Hashtable properties);
- public Hashtable deNormalize(Hashtable properties);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java
deleted file mode 100644
index 5b74e836c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class MassNodeIdTransformer extends NodeIdTransformer
-{
- protected String massNodeIdKey;
-
- public MassNodeIdTransformer(Controller controller, String massNodeIdKey)
- {
- super(controller);
- this.massNodeIdKey = massNodeIdKey;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- if (!properties.containsKey(massNodeIdKey))
- return super.normalize(properties);
- Object origNodeId = properties.get(ActionInputs.NODEID);
- String[] massNodeIds = getValueAsStringArray(properties, massNodeIdKey);
- for (int i = 0; i < massNodeIds.length; i++)
- {
- properties.put(ActionInputs.NODEID, massNodeIds[i]);
- properties = super.normalize(properties);
- String[] rels = getValueAsStringArray(properties, ModelConstants.REL_ID);
- if (rels.length > 0)
- {
- StringBuffer sb = new StringBuffer(ModelConstants.REL_ID);
- sb.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
- sb.append(massNodeIds[i]);
- properties.put(sb.toString(), rels);
- }
- properties.remove(ActionInputs.NODEID);
- properties.remove(ModelConstants.REL_ID);
- }
- if (origNodeId != null)
- properties.put(ActionInputs.NODEID, origNodeId);
- return properties;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- if (!properties.containsKey(massNodeIdKey))
- return super.deNormalize(properties);
- Vector massNodeIdVector = new Vector();
- Object origNodeId = properties.get(ActionInputs.NODEID);
- properties.remove(ActionInputs.NODEID);
- String[] massNodeIds = getValueAsStringArray(properties, massNodeIdKey);
- for (int i = 0; i < massNodeIds.length; i++)
- {
- StringBuffer sb = new StringBuffer(ModelConstants.REL_ID);
- sb.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
- sb.append(massNodeIds[i]);
- Object rels = properties.get(sb.toString());
- if (rels != null)
- {
- properties.put(ModelConstants.REL_ID, rels);
- properties = super.deNormalize(properties);
- Object nodeId = properties.get(ActionInputs.NODEID);
- if (nodeId != null)
- {
- massNodeIdVector.add(nodeId);
- properties.remove(ActionInputs.NODEID);
- }
- properties.remove(ModelConstants.REL_ID);
- }
- }
- if (origNodeId != null)
- properties.put(ActionInputs.NODEID, origNodeId);
- int size = massNodeIdVector.size();
- if (size == 1)
- properties.put(massNodeIdKey, massNodeIdVector.get(0));
- else if (size > 1)
- properties.put(massNodeIdKey, massNodeIdVector.toArray(new String[0]));
- else
- properties.remove(massNodeIdKey);
- return properties;
- }
-
- private String[] getValueAsStringArray(Hashtable properties, String key)
- {
- Object values = properties.get(key);
- if (values == null)
- return new String[0];
- else if (values instanceof String[])
- return (String[])values;
- else
- return new String[] {values.toString()};
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java
deleted file mode 100644
index 732c165fe..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class MultipartFormDataParserTransformer implements ITransformer
-{
- protected Controller controller;
-
- public MultipartFormDataParserTransformer(Controller controller)
- {
- this.controller = controller;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- MultipartFormDataParser parser = (MultipartFormDataParser)properties.get(ActionInputs.MULTIPART_FORM_DATA_PARSER);
- String[] keys;
- try
- {
- keys = parser.getParameterNames();
- }
- catch (Throwable t)
- {
- keys = new String[0];
- }
- for (int i = 0; i < keys.length; i++)
- {
- StringBuffer newKey = new StringBuffer(ActionInputs.MULTIPART_FORM_DATA_PARSER);
- newKey.append(keys[i]);
- try
- {
- properties.put(newKey.toString(), parser.getParameterValues(keys[i]));
- }
- catch (Throwable t)
- {
- }
- }
- return properties;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- Enumeration e = properties.keys();
- while (e.hasMoreElements())
- {
- Object key = e.nextElement();
- if (key instanceof String)
- {
- if (((String)key).startsWith(ActionInputs.MULTIPART_FORM_DATA_PARSER))
- {
- String realKey = ((String)key).substring(ActionInputs.MULTIPART_FORM_DATA_PARSER.length());
- if (!properties.containsKey(realKey))
- {
- Object value = properties.remove(key);
- properties.put(realKey, value);
- }
- }
- }
- }
- return properties;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java
deleted file mode 100644
index 2a5413a0b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class NodeIdTransformer implements ITransformer
-{
- protected Controller controller;
-
- public NodeIdTransformer(Controller controller)
- {
- this.controller = controller;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- Vector rels = new Vector();
- try
- {
- int nodeId = Integer.parseInt((String)properties.get(ActionInputs.NODEID));
- NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- Node node = nodeManager.getNode(nodeId);
- int depth = 0;
- if (node != null)
- depth = node.getNodeDepth();
- while (rels.size() < depth && node != null && node != rootNode)
- {
- Node parentNode = node.getParent();
- Element element = node.getTreeElement();
- Rel rel = getRel(parentNode.getTreeElement(), element);
- StringBuffer relValue = new StringBuffer(rel.getName());
- relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
- relValue.append(element.getName());
- rels.insertElementAt(relValue.toString(), 0);
- node = parentNode;
- }
- }
- catch (NumberFormatException nfe)
- {
- }
- int numRelationships = rels.size();
- if (numRelationships == 1)
- properties.put(ModelConstants.REL_ID, rels.get(0).toString());
- else if (numRelationships > 1)
- properties.put(ModelConstants.REL_ID, (String[])rels.toArray(new String[0]));
- return properties;
- }
-
- private Rel getRel(Element sourceElement, Element targetElement)
- {
- Enumeration rels = sourceElement.getRels();
- while (rels.hasMoreElements())
- {
- Rel rel = (Rel)rels.nextElement();
- Enumeration targetElements = rel.getTargetElements();
- while (targetElements.hasMoreElements())
- {
- if (targetElements.nextElement() == targetElement)
- return rel;
- }
- }
- return null;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
- Node node = nodeManager.getRootNode();
- Object value = properties.get(ModelConstants.REL_ID);
- String[] relationships = null;
- if (value instanceof String[])
- relationships = (String[])value;
- else if (value != null)
- relationships = new String[] {value.toString()};
- if (relationships != null)
- {
- for (int i = 0; i < relationships.length; i++)
- {
- int index = relationships[i].indexOf(ModelConstants.REL_LOCALNAME_SEPARATOR);
- if (index == -1)
- return deNormalizeAsSelectedNode(properties);
- String rel = (index != -1) ? relationships[i].substring(0, index) : relationships[i];
- String localname = (index != -1) ? relationships[i].substring(index + 1, relationships[i].length()) : null;
- if (localname == null)
- return deNormalizeAsSelectedNode(properties);
- node = getNode(node, rel, localname);
- if (node == null)
- return deNormalizeAsSelectedNode(properties);
- }
- properties.put(ActionInputs.NODEID, String.valueOf(node.getNodeId()));
- return properties;
- }
- else
- return deNormalizeAsSelectedNode(properties);
- }
-
- private Hashtable deNormalizeAsSelectedNode(Hashtable properties)
- {
- return (new CurrentNodeSelectionTransformer(controller)).deNormalize(properties);
- }
-
- private Node getNode(Node parent, String rel, String localname)
- {
- Element parentElement = parent.getTreeElement();
- Enumeration e = parentElement.getElements(rel);
- while (e.hasMoreElements())
- {
- Element element = (Element)e.nextElement();
- if (localname.equals(element.getName()))
- return parent.getChildNode((TreeElement)element);
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java
deleted file mode 100644
index 93f57efd9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class NodeSelectionTransformer implements ITransformer
-{
- protected Controller controller;
-
- public NodeSelectionTransformer(Controller controller)
- {
- this.controller = controller;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- try
- {
- NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
- Node nextNode = nodeManager.getNode(Integer.parseInt((String) properties.get(ActionInputs.NODEID)));
- Node currNode = nodeManager.getSelectedNode();
- if (currNode == null)
- currNode = nodeManager.getRootNode();
- Vector nextRels = new Vector();
- Vector currRels = new Vector();
- while (nextNode != null && currNode != null && (!isRootElement(nextNode.getTreeElement()) || !isRootElement(currNode.getTreeElement())) && nextNode != currNode)
- {
- if (nextNode.getNodeDepth() >= currNode.getNodeDepth())
- {
- Node parentNode = nextNode.getParent();
- Element nextElement = nextNode.getTreeElement();
- Rel rel = getRel(parentNode.getTreeElement(), nextElement);
- StringBuffer relValue = new StringBuffer(rel.getName());
- relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
- relValue.append(nextElement.getName());
- nextRels.insertElementAt(relValue.toString(), 0);
- nextNode = parentNode;
- }
- else
- {
- Node parentNode = currNode.getParent();
- Element parentElement = parentNode.getTreeElement();
- Rel rel = getRel(currNode.getTreeElement(), parentElement);
- StringBuffer relValue = new StringBuffer(rel.getName());
- relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
- relValue.append(parentElement.getName());
- currRels.add(relValue.toString());
- currNode = parentNode;
- }
- }
- currRels.addAll(nextRels);
- int numRelationships = currRels.size();
- if (numRelationships == 1)
- properties.put(ModelConstants.REL_ID, currRels.get(0).toString());
- else if (numRelationships > 1)
- properties.put(ModelConstants.REL_ID, (String[]) currRels.toArray(new String[0]));
- }
- catch (NumberFormatException nfe)
- {
- }
- return properties;
- }
-
- private boolean isRootElement(Element e)
- {
- return e.getModel().getRootElement() == e;
- }
-
- private Rel getRel(Element sourceElement, Element targetElement)
- {
- Enumeration rels = sourceElement.getRels();
- while (rels.hasMoreElements())
- {
- Rel rel = (Rel) rels.nextElement();
- Enumeration targetElements = rel.getTargetElements();
- while (targetElements.hasMoreElements())
- {
- if (targetElements.nextElement() == targetElement)
- return rel;
- }
- }
- return null;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- Node currNode = nodeManager.getSelectedNode();
- if (currNode == null)
- currNode = rootNode;
- Object value = properties.get(ModelConstants.REL_ID);
- String[] relationships = null;
- if (value instanceof String[])
- relationships = (String[]) value;
- else if (value != null)
- relationships = new String[]{value.toString()};
- if (relationships != null)
- {
- Element currElement = currNode.getTreeElement();
- for (int i = 0; i < relationships.length; i++)
- {
- int index = relationships[i].indexOf(ModelConstants.REL_LOCALNAME_SEPARATOR);
- String rel = (index != -1) ? relationships[i].substring(0, index) : relationships[i];
- String localname = (index != -1) ? relationships[i].substring(index + 1, relationships[i].length()) : null;
- Enumeration e = currElement.getElements(rel);
- Element targetElement = null;
- if (localname != null)
- {
- Element firstElement = null;
- while (e.hasMoreElements())
- {
- Element nextElement = (Element) e.nextElement();
- if (firstElement == null)
- firstElement = nextElement;
- if (localname.equals(nextElement.getName()))
- {
- targetElement = nextElement;
- break;
- }
- }
- if (targetElement == null)
- targetElement = firstElement;
- }
- else
- {
- if (e.hasMoreElements())
- targetElement = (Element) e.nextElement();
- }
- if (targetElement != null)
- {
- currElement = (Element) targetElement;
- Node parentNode = currNode.getParent();
- if (parentNode != null && parentNode.getTreeElement() == currElement)
- currNode = parentNode;
- else
- currNode = currNode.getChildNode((TreeElement) currElement);
- }
- }
- }
- properties.put(ActionInputs.NODEID, String.valueOf(currNode.getNodeId()));
- return properties;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java
deleted file mode 100644
index 0261f2a22..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class ViewSelectionTransformer implements ITransformer
-{
- protected Controller controller;
- protected String listManagerKey;
- protected String viewKey;
-
- public ViewSelectionTransformer(Controller controller, String listManagerKey, String viewKey)
- {
- this.controller = controller;
- this.listManagerKey = listManagerKey;
- this.viewKey = viewKey;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- Vector normalizedViewIds = new Vector();
- NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
- Node currNode = nodeManager.getSelectedNode();
- TreeElement currElement = currNode.getTreeElement();
- Object listManagerObj = currElement.getPropertyAsObject(listManagerKey);
- if (listManagerObj instanceof ListManager)
- {
- ListManager listManager = (ListManager) listManagerObj;
- String[] viewIds = getViewValues(properties);
- for (int i = 0; i < viewIds.length; i++)
- {
- ListElement listElement = null;
- try
- {
- listElement = listManager.getElementWithViewId(Integer.parseInt(viewIds[i]));
- }
- catch (NumberFormatException nfe)
- {
- }
- if (listElement != null)
- {
- Object object = listElement.getObject();
- if (object != null && object instanceof Element)
- {
- Element element = (Element) object;
- normalizedViewIds.add(element.getName());
- }
- }
- }
- }
- properties.put(viewKey, normalizedViewIds.toArray(new String[0]));
- return properties;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- Vector viewIds = new Vector();
- Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
- if (currNode != null)
- {
- TreeElement currElement = currNode.getTreeElement();
- Object listManagerObj = currElement.getPropertyAsObject(listManagerKey);
- if (listManagerObj instanceof ListManager)
- {
- ListManager listManager = (ListManager) listManagerObj;
- String[] normalizedViewIds = getViewValues(properties);
- for (int i = 0; i < normalizedViewIds.length; i++)
- {
- Enumeration e = listManager.getListElements();
- while (e.hasMoreElements())
- {
- ListElement listElement = (ListElement) e.nextElement();
- Element element = (Element) listElement.getObject();
- if (element != null && normalizedViewIds[i].equals(element.getName()))
- {
- viewIds.add(String.valueOf(listElement.getViewId()));
- break;
- }
- }
- }
- }
- }
- int size = viewIds.size();
- if (size == 1)
- properties.put(viewKey, viewIds.get(0));
- else if (size > 1)
- properties.put(viewKey, viewIds.toArray(new String[0]));
- return properties;
- }
-
- private String[] getViewValues(Hashtable properties)
- {
- Object viewValueObj = properties.get(viewKey);
- String[] viewValues;
- if (viewValueObj == null)
- viewValues = new String[0];
- else if (viewValueObj.getClass().isArray())
- viewValues = (String[]) viewValueObj;
- else
- viewValues = new String[]{(String) viewValueObj};
- return viewValues;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java
deleted file mode 100644
index 63a27e93f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindBusinessUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddBusinessToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddBusinessToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement) selectedElement;
- String businessName = busElement.getName();
- String inquiryAPI = busElement.getInquiryURL();
- String businessKey = busElement.getBusinessKey();
- // create the registry in the UDDI perspective
- if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
- return false;
- RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY, businessKey);
- propertyTable.put(UDDIActionInputs.QUERY_NAME, businessName);
- if (!action.run())
- {
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", businessName));
- return false;
- }
- uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", businessName));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java
deleted file mode 100644
index d4a614fe9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class AddRegistryToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddRegistryToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement) selectedElement;
- String registryName = regElement.getName();
- String inquiryAPI = regElement.getInquiryURL();
- String publishAPI = regElement.getPublishURL();
- String registrationURL = regElement.getRegistrationURL();
- if (!createRegistryInUDDIPerspective(inquiryAPI, publishAPI, registryName, registrationURL, false))
- return false;
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", registryName));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java
deleted file mode 100644
index efff821c4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceInterfaceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddServiceInterfaceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddServiceInterfaceToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement) selectedElement;
- String serIntName = serIntElement.getName();
- String inquiryAPI = serIntElement.getInquiryURL();
- String serIntKey = serIntElement.getServiceInterfaceKey();
- // create the registry in the UDDI perspective
- if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
- return false;
- RegFindServiceInterfaceUUIDAction action = new RegFindServiceInterfaceUUIDAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY, serIntKey);
- propertyTable.put(UDDIActionInputs.QUERY_NAME, serIntName);
- if (!action.run())
- {
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serIntName));
- return false;
- }
- uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serIntName));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java
deleted file mode 100644
index c9239c1c5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddServiceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddServiceToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement) selectedElement;
- String serviceName = serElement.getName();
- String inquiryAPI = serElement.getInquiryURL();
- String serviceKey = serElement.getServiceKey();
- // create the registry in the UDDI perspective
- if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
- return false;
- RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY, serviceKey);
- propertyTable.put(UDDIActionInputs.QUERY_NAME, serviceName);
- if (!action.run())
- {
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serviceName));
- return false;
- }
- uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serviceName));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java
deleted file mode 100644
index 4d86b6fac..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-public abstract class AddToUDDIPerspectiveAction extends MultipleLinkAction {
- public AddToUDDIPerspectiveAction(Controller controller) {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID) {
- StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink() {
- return "favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp";
- }
-
- protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName, String registrationURL, boolean useExisting)
- {
- return createRegistryInUDDIPerspective(inquiryAPI, publishAPI, registryName, registrationURL, null, null, null, useExisting);
- }
-
- protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName, String registrationURL, String defaultLogin, String defaultPassword, Taxonomy[] taxonomies, boolean useExisting) {
- Vector registryNodes = getRegistryNodesByInquiryURL(inquiryAPI);
- if (registryNodes != null)
- {
- if (useExisting)
- {
- Node registryNode = (Node)registryNodes.elementAt(0);
- NodeManager nodeManager = registryNode.getNodeManager();
- nodeManager.setSelectedNodeId(registryNode.getNodeId());
- return true;
- }
- }
-
- // open the registry if it is not already opened in the UDDI perspective
- OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
-
- // populate the property table
- Hashtable propertyTable = openRegAction.getPropertyTable();
- if (Validator.validateString(registryName))
- propertyTable.put(UDDIActionInputs.REGISTRY_NAME,registryName);
- else
- return false;
-
- if (Validator.validateURL(inquiryAPI))
- propertyTable.put(UDDIActionInputs.INQUIRY_URL,inquiryAPI);
- else
- return false;
-
- if (Validator.validateURL(publishAPI))
- propertyTable.put(UDDIActionInputs.PUBLISH_URL,publishAPI);
-
- if (Validator.validateURL(registrationURL))
- propertyTable.put(UDDIActionInputs.REGISTRATION_URL,registrationURL);
-
- if (defaultLogin != null)
- propertyTable.put(UDDIActionInputs.UDDI_USERNAME, defaultLogin);
-
- if (defaultPassword != null)
- propertyTable.put(UDDIActionInputs.UDDI_PASSWORD, defaultPassword);
-
- // If user-defined category metadata exists, search and make the associations.
- StringBuffer directoryBuffer = new StringBuffer();
- FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),registryName);
- File categoriesDirectory = new File(directoryBuffer.toString());
- File[] categoryFiles = null;
- if (categoriesDirectory.exists())
- {
- categoryFiles = categoriesDirectory.listFiles();
- if (categoryFiles.length > 0)
- propertyTable.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,Boolean.TRUE);
- }
-
- // run the action
- if (!openRegAction.run())
- return false;
-
- if (taxonomies != null)
- {
- Hashtable taxonomyTable = new Hashtable();
- for (int i=0; i<taxonomies.length; i++)
- {
- Taxonomy taxonomy = taxonomies[i];
- String name = taxonomy.getName();
- String tmodelKey = taxonomy.getTmodelKey();
- CategoryModel catModel = new CategoryModel();
- catModel.setDisplayName(name);
- catModel.setCategoryKey(name);
- catModel.setTModelKey(tmodelKey);
- catModel.loadFromTaxonomy(taxonomy);
- taxonomyTable.put(tmodelKey, catModel);
- }
- RegistryElement regElement = (RegistryElement)(controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode().getTreeElement());
- regElement.setUserDefinedCategories(taxonomyTable);
- }
-
- if (categoryFiles != null && categoryFiles.length > 0)
- {
- RegistryElement regElement = (RegistryElement)(controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode().getTreeElement());
- regElement.setCheckForUserDefinedCategories(true);
- regElement.getUserDefinedCategories();
- linkCategoryModelsWithSavedData(registryName,regElement.getUserDefinedCategories());
- }
- return true;
- }
-
- public final void linkCategoryModelsWithSavedData(String registryName,Enumeration userDefinedCategories)
- {
- StringBuffer directoryBuffer = new StringBuffer();
- FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),registryName);
- linkCategoryModelsWithSavedData(userDefinedCategories,directoryBuffer.toString());
- }
-
- public final void linkCategoryModelsWithSavedData(Enumeration userDefinedCategories,String categoriesDirectory)
- {
- File categoriesDirectoryFile = new File(categoriesDirectory);
- File[] categoryFiles = null;
- if (categoriesDirectoryFile.exists())
- {
- categoryFiles = categoriesDirectoryFile.listFiles();
- if (userDefinedCategories != null)
- {
- while (userDefinedCategories.hasMoreElements())
- {
- CategoryModel categoryModel = (CategoryModel)userDefinedCategories.nextElement();
- String categoryKey = categoryModel.getCategoryKey();
- for (int i=0;i<categoryFiles.length;i++)
- {
- String categoryPropertiesFileName = categoryFiles[i].getName();
- int lastDotPos = categoryPropertiesFileName.lastIndexOf(".");
- String decodedCategoryPropertiesFileNameBase = URLUtils.decode(categoryPropertiesFileName.substring(0,lastDotPos));
- if (lastDotPos > 0 && categoryPropertiesFileName.endsWith(".properties") && categoryKey.equals(decodedCategoryPropertiesFileNameBase))
- {
- categoryModel.setDefaultDataFile(categoryFiles[i].getAbsolutePath());
- categoryModel.loadFromDelimiterFile();
- break;
- }
- }
- }
- }
- }
- }
-
- protected Vector getRegistryNodesByInquiryURL(String inquiryURL)
- {
- Vector registryNodes = null;
- NodeManager navigatorManager = controller_.getUDDIPerspective().getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode)(navigatorManager.getRootNode());
- Vector childNodes = uddiMainNode.getChildNodes();
- for (int i=0;i<childNodes.size();i++)
- {
- Node childNode = (Node)childNodes.elementAt(i);
- if (childNode instanceof RegistryNode)
- {
- RegistryElement regElement = (RegistryElement)childNode.getTreeElement();
- String currInquiryURL = regElement.getInquiryURL();
- if (currInquiryURL != null && currInquiryURL.equals(inquiryURL))
- {
- if (registryNodes == null)
- registryNodes = new Vector();
- registryNodes.addElement(childNode);
- }
- }
- }
- return registryNodes;
- }
-
- public static AddToUDDIPerspectiveAction newAction(Controller controller) {
- TreeElement selectedElement = controller.getFavoritesPerspective().getNodeManager().getSelectedNode().getTreeElement();
- FavoritesFolderElement favoritesFolderElement = null;
-
- if (selectedElement instanceof FavoritesFolderElement) {
- favoritesFolderElement = (FavoritesFolderElement)selectedElement;
- }
- else if (selectedElement instanceof FavoritesElement) {
- favoritesFolderElement = ((FavoritesElement)selectedElement).getParentFolderElement();
- }
- else {
- return null;
- }
-
- // return an instance of AddToUDDIPerspectiveAction depending on the type of
- // favorites folder element being selected.
- if (favoritesFolderElement instanceof FavoritesUDDIRegistryFolderElement)
- return new AddRegistryToUDDIPerspectiveAction(controller);
- else if (favoritesFolderElement instanceof FavoritesUserDefUDDIRegistryFolderElement)
- return new AddUserDefRegistryToUDDIPerspectiveAction(controller);
- else if (favoritesFolderElement instanceof FavoritesUDDIBusinessFolderElement)
- return new AddBusinessToUDDIPerspectiveAction(controller);
- else if (favoritesFolderElement instanceof FavoritesUDDIServiceFolderElement)
- return new AddServiceToUDDIPerspectiveAction(controller);
- else if (favoritesFolderElement instanceof FavoritesUDDIServiceInterfaceFolderElement)
- return new AddServiceInterfaceToUDDIPerspectiveAction(controller);
- else
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddUserDefRegistryToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddUserDefRegistryToUDDIPerspectiveAction.java
deleted file mode 100644
index 7809538e4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddUserDefRegistryToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-
-public class AddUserDefRegistryToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddUserDefRegistryToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesUserDefUDDIRegistryElement regElement = (FavoritesUserDefUDDIRegistryElement)selectedElement;
- String registryName = regElement.getName();
- String inquiryAPI = regElement.getInquiryURL();
- String publishAPI = regElement.getPublishURL();
- String defaultLogin = regElement.getDefaultLogin();
- String defaultPassword = regElement.getDefaultPassword();
- Taxonomy[] taxonomies = regElement.getTaxonomies();
- if (!createRegistryInUDDIPerspective(inquiryAPI, publishAPI, registryName, null, defaultLogin, defaultPassword, taxonomies, false))
- return false;
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", registryName));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java
deleted file mode 100644
index e1b58c9ab..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSILElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-
-public class AddWSILToWSILPerspectiveAction extends MultipleLinkAction
-{
- public AddWSILToWSILPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp";
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesWSILElement wsilElement = (FavoritesWSILElement) selectedElement;
- String wsilURL = wsilElement.getWsilUrl();
- OpenWSILAction openWSILAction = new OpenWSILAction(controller_);
- Hashtable propertyTable = openWSILAction.getPropertyTable();
- propertyTable.put(WsilActionInputs.WSIL_URL, wsilURL);
- propertyTable.put(WsilActionInputs.WSIL_INSPECTION_TYPE, String.valueOf(WsilActionInputs.WSIL_DETAILS));
- boolean actionResult = openWSILAction.run();
- if (actionResult)
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_WSIL_TO_WSIL_PERSPECTIVE_SUCCESSFUL", wsilURL));
- else
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_WSIL_TO_WSIL_PERSPECTIVE", wsilURL));
- return actionResult;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java
deleted file mode 100644
index da528d858..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-
-public class FavoritesAddToWSDLPerspectiveAction extends MultipleLinkAction
-{
- public FavoritesAddToWSDLPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp";
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement) selectedNode.getTreeElement();
- String wsdlUrl = wsdlElement.getWsdlUrl();
- OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
- Hashtable propertyTable = openWSDLAction.getPropertyTable();
- propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
- boolean actionResult = openWSDLAction.run();
- if (actionResult)
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL", wsdlUrl));
- else
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE", wsdlUrl));
- return actionResult;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java
deleted file mode 100644
index 06c1e3dc0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-
-public class FavoritesImportToFileSystemAction extends ImportToFileSystemAction {
-
- private Definition def_;
- private String wsdlFileName_;
-
- public FavoritesImportToFileSystemAction(Controller controller) {
- super(controller);
- }
-
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
- {
- return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"favorites/actions/FavortiesImportToFileSystemActionJSP.jsp");
- }
-
- public boolean write(OutputStream os) {
- if (def_ != null) {
- return writeWSDLDefinition(os, def_);
- }
- else {
- return false;
- }
- }
-
- public String getDefaultFileName() {
- return wsdlFileName_;
- }
-
- public boolean run() {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-
- // return false if nodeID == 0, that is the main node
- if (nodeID == 0)
- return false;
-
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- String wsdlURL = ((FavoritesWSDLServiceElement)selectedElement).getWsdlUrl();
- wsdlFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlURL);
- try {
- def_ = (new Uddi4jHelper()).getWSDLDefinition(wsdlURL);
- }
- catch (Throwable t) {
- favPerspective.getMessageQueue().addMessage(t.getMessage());
- return false;
- }
- return true;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getFavoritesPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getFavoritesPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java
deleted file mode 100644
index 93f51e51d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesImportToWorkbenchAction extends ImportToWorkbenchAction {
- public FavoritesImportToWorkbenchAction(Controller controller) {
- super(controller);
- }
-
- public FormTool getSelectedFormTool() {
- FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
- return (FormTool)favoritesPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public ImportToFileSystemAction newImportToFileSystemAction() {
- FavoritesImportToFileSystemAction action = new FavoritesImportToFileSystemAction(controller_);
- Hashtable table = action.getPropertyTable();
-
- FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
-
- table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
- table.put(ActionInputs.VIEWID, String.valueOf(selectedNode.getViewId()));
-
- return action;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getFavoritesPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getFavoritesPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java
deleted file mode 100644
index 616fa7c41..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
-
- public FavoritesLaunchWebServiceWizardAction(Controller controller) {
- super(controller);
- }
-
- public static LaunchWebServiceWizardAction newAction(Controller controller) {
- return new FavoritesLaunchWebServiceWizardAction(controller);
- }
-
- public FormTool getSelectedFormTool() {
- FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
- return (FormTool)favoritesPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public boolean run() {
- FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
- if (selectedElement instanceof FavoritesWSDLServiceElement)
- return launchWizard(((FavoritesWSDLServiceElement)selectedElement).getWsdlUrl());
- else
- return false;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getFavoritesPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getFavoritesPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java
deleted file mode 100644
index 1d05321e1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesRestoreDefaultFavoritesAction extends LinkAction
-{
- public FavoritesRestoreDefaultFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp");
- return actionLink.toString();
- }
-
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node mainNode = nodeManager.getRootNode();
- FavoritesMainElement mainElement = (FavoritesMainElement)mainNode.getTreeElement();
- boolean actionResult = mainElement.restoreFavoritesDefault();
- if (actionResult)
- {
- Vector folderNodes = mainNode.getChildNodes();
- for (int i = 0; i < folderNodes.size(); i++)
- {
- Node folderNode = (Node)folderNodes.elementAt(i);
- TreeElement treeElement = folderNode.getTreeElement();
- if (treeElement instanceof FavoritesFolderElement)
- {
- FavoritesFolderElement folderElement = (FavoritesFolderElement)treeElement;
- folderElement.removeAllFavorites(controller_.getServletEngineStateLocation());
- folderElement.init(mainElement);
- }
- }
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_FAVORITES_RESTORED_TO_DEFAULT"));
- return true;
- }
- else
- {
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_OPEN_FAVORITES_BACKUP"));
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java
deleted file mode 100644
index d8e9923cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesToggleNodeAction extends ToggleNodeAction {
- public FavoritesToggleNodeAction(Controller controller) {
- super(controller, controller.getFavoritesPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeId, boolean open) {
- StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesToggleNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeId);
- actionLink.append('&');
- actionLink.append(ActionInputs.OPEN);
- actionLink.append('=');
- if (open)
- actionLink.append(ActionInputs.OPEN_NODE);
- else
- actionLink.append(ActionInputs.CLOSE_NODE);
- return actionLink.toString();
- }
-
- public final String getActionLinkForHistory() {
- ToolManager toolManager = toggledNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = toggledNode_.getNodeId();
- int toolId = selectedTool.getToolId();
- int viewId = toggledNode_.getViewId();
- int viewToolId = toggledNode_.getViewToolId();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectFavoritesToolAction.getActionLink(nodeId, toolId, viewId, viewToolId, true);
- else
- return SelectFavoritesNodeAction.getActionLink(nodeId, true);
- }
-
- public final String getTreeContentVar()
- {
- return controller_.getFavoritesPerspective().getTreeContentVar();
- }
-
- public final String getTreeContentPage()
- {
- return controller_.getFavoritesPerspective().getTreeContentPage();
- }
-
- public final String getPropertiesContainerVar()
- {
- return controller_.getFavoritesPerspective().getPropertiesContainerVar();
- }
-
- public final String getPropertiesContainerPage()
- {
- return controller_.getFavoritesPerspective().getPropertiesContainerPage();
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_FAVORITES;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java
deleted file mode 100644
index b80defe87..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MassNodeIdTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public abstract class MultipleLinkAction extends LinkAction
-{
- public MultipleLinkAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- String isMultipleLinkAction = request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
- if (isMultipleLinkAction != null)
- {
- propertyTable_.put(FavoritesActionInputs.MULTIPLE_LINK_ACTION, isMultipleLinkAction);
- return processMultipleLinkActionParameters(request);
- }
- else
- {
- propertyTable_.remove(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
- String nodeIDString = request.getParameter(ActionInputs.NODEID);
- String toolIDString = request.getParameter(ActionInputs.TOOLID);
- String viewIDString = request.getParameter(ActionInputs.VIEWID);
- String viewToolIDString = request.getParameter(ActionInputs.VIEWTOOLID);
- if (nodeIDString != null)
- propertyTable_.put(ActionInputs.NODEID, nodeIDString);
- if (toolIDString != null)
- propertyTable_.put(ActionInputs.TOOLID, toolIDString);
- if (viewIDString != null)
- propertyTable_.put(ActionInputs.VIEWID, viewIDString);
- if (viewToolIDString != null)
- propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolIDString);
- return true;
- }
- }
-
- protected boolean processMultipleLinkActionParameters(HttpServletRequest request)
- {
- String[] massActionNodeIDs = request.getParameterValues(FavoritesActionInputs.MASS_ACTION_NODE_ID);
- propertyTable_.put(FavoritesActionInputs.MASS_ACTION_NODE_ID, massActionNodeIDs);
- if (massActionNodeIDs.length == 0)
- return false;
- else
- return true;
- }
-
- public ITransformer[] getTransformers()
- {
- return new ITransformer[] {new MassNodeIdTransformer(controller_, FavoritesActionInputs.MASS_ACTION_NODE_ID)};
- }
-
- protected boolean isMultipleLinkAction()
- {
- return propertyTable_.containsKey(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
- }
-
- protected String[] getMassActionNodeIds()
- {
- Object object = propertyTable_.get(FavoritesActionInputs.MASS_ACTION_NODE_ID);
- if (object == null)
- return new String[0];
- else if (object.getClass().isArray())
- return (String[])object;
- else
- return new String[] {(String)object};
- }
-
- public boolean run()
- {
- return (isMultipleLinkAction()) ? executeMultipleLinkAction() : executeSingleLinkAction();
- }
-
- protected boolean executeMultipleLinkAction()
- {
- boolean result = false;
- String[] massActionNodeIDs = getMassActionNodeIds();
- if (massActionNodeIDs != null)
- {
- for (int i = 0; i < massActionNodeIDs.length; i++)
- {
- propertyTable_.put(ActionInputs.NODEID, massActionNodeIDs[i]);
- if (executeSingleLinkAction())
- result = true;
- }
- propertyTable_.remove(ActionInputs.NODEID);
- }
- return result;
- }
-
- protected abstract boolean executeSingleLinkAction();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java
deleted file mode 100644
index 38a318148..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class RemoveFavoritesAction extends MultipleLinkAction
-{
- public RemoveFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/RemoveFavoritesActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "favorites/actions/RemoveFavoritesActionJSP.jsp";
- }
-
- protected boolean executeSingleLinkAction()
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- String nodeIDString = (String) propertyTable_.get(ActionInputs.NODEID);
- int nodeID;
- try
- {
- nodeID = Integer.parseInt(nodeIDString);
- }
- catch (NumberFormatException nfe)
- {
- nodeID = nodeManager.getSelectedNodeId();
- }
- Node selectedNode = nodeManager.getNode(nodeID);
- if (selectedNode == null)
- return false;
- TreeElement selectedElement = selectedNode.getTreeElement();
- String pluginMetadataDirectory = controller_.getServletEngineStateLocation();
- boolean actionResult;
- if (selectedElement instanceof FavoritesElement)
- actionResult = ((FavoritesElement) selectedElement).getParentFolderElement().removeFavoriteByNodeID(nodeID, pluginMetadataDirectory);
- else if (selectedElement instanceof FavoritesFolderElement)
- actionResult = ((FavoritesFolderElement) selectedElement).removeAllFavorites(pluginMetadataDirectory);
- else if (selectedElement instanceof FavoritesMainElement)
- {
- Enumeration e;
- FavoritesMainElement mainElement = (FavoritesMainElement) selectedElement;
- e = mainElement.getElements(FavoritesModelConstants.REL_WSIL_FOLDER_NODE);
- actionResult = ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- e = mainElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
- actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
- actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
- actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
- actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
- actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
- }
- else
- actionResult = false;
- if (actionResult)
- favPerspective.getMessageQueue().addMessage(controller_.getMessage("MSG_INFO_NODE_CLEARED", selectedNode.getNodeName()));
- return actionResult;
- }
-
- public String getTreeContentVar()
- {
- return "favNavigatorContent";
- }
-
- public String getTreeContentPage()
- {
- return "favorites/fav_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar()
- {
- return "favPropertiesContainer";
- }
-
- public String getPropertiesContainerPage()
- {
- return "favorites/fav_properties_container.jsp";
- }
-
- public String getStatusContentVar()
- {
- return "favStatusContent";
- }
-
- public String getStatusContentPage()
- {
- return "favorites/fav_status_content.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java
deleted file mode 100644
index bc4be3368..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ResizeFavoritesFramesAction extends ResizeFramesAction
-{
- public ResizeFavoritesFramesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- // Save the current frameset sizes.
- String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
- String perspectiveContentFramesetCols = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-
- // Set the new frameset sizes.
- if (frameName.equals(FavoritesFrameNames.NAVIGATOR_CONTAINER))
- {
- favPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
- favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- if (perspectiveContentFramesetCols.startsWith("100%"))
- {
- // Restore.
- favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
- }
- else
- {
- // Maximize.
- favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- favPerspective.setPerspectiveContentFramesetCols("100%,0%");
- }
- }
- else if (frameName.equals(FavoritesFrameNames.PROPERTIES_CONTAINER))
- {
- if (actionsContainerFramesetRows.startsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
- favPerspective.setActionsContainerFramesetRows(favPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- favPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- favPerspective.setActionsContainerFramesetRows("100%,0%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- favPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- else if (frameName.equals(FavoritesFrameNames.STATUS_CONTAINER))
- {
- if (actionsContainerFramesetRows.endsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
- favPerspective.setActionsContainerFramesetRows(favPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- favPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- favPerspective.setActionsContainerFramesetRows("0%,100%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- favPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java
deleted file mode 100644
index 629747547..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-
-public class SelectFavoritesNodeAction extends SelectNodeAction
-{
- public SelectFavoritesNodeAction(Controller controller)
- {
- super(controller, controller.getFavoritesPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/SelectFavoritesNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- if (keepHistory) {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- Node selectedNode = getSelectedNode();
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
- if (selectedTool == null)
- return null;
- else if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
- else
- return getActionLink(selectedNode.getNodeId(), true);
- }
-
- public final String getTreeContentVar() {
- return controller_.getFavoritesPerspective().getTreeContentVar();
- }
-
- public final String getTreeContentPage() {
- return controller_.getFavoritesPerspective().getTreeContentPage();
- }
-
- public final String getPropertiesContainerVar() {
- return controller_.getFavoritesPerspective().getPropertiesContainerVar();
- }
-
- public final String getPropertiesContainerPage() {
- return controller_.getFavoritesPerspective().getPropertiesContainerPage();
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_FAVORITES;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java
deleted file mode 100644
index f16727c91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-
-public class SelectFavoritesToolAction extends SelectNodeToolAction
-{
- public SelectFavoritesToolAction(Controller controller)
- {
- super(controller, controller.getFavoritesPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/SelectFavoritesToolActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- if (viewID != ActionInputs.VIEWID_DEFAULT) {
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- }
- if (keepHistory) {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- if (getSelectedTool().getToolType() != ToolTypes.ACTION) {
- Node selectedNode = getSelectedNode();
- return getActionLink(selectedNode.getNodeId(), getSelectedTool().getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
- }
- else
- return null;
- }
-
- public final String getTreeContentVar() {
- return controller_.getFavoritesPerspective().getTreeContentVar();
- }
-
- public final String getTreeContentPage() {
- return controller_.getFavoritesPerspective().getTreeContentPage();
- }
-
- public final String getPropertiesContainerVar() {
- return controller_.getFavoritesPerspective().getPropertiesContainerVar();
- }
-
- public final String getPropertiesContainerPage() {
- return controller_.getFavoritesPerspective().getPropertiesContainerPage();
- }
-
- public final String getPropertiesContentVar() {
- return controller_.getFavoritesPerspective().getPropertiesContentVar();
- }
-
- public final String getPropertiesContentPage() {
- return controller_.getFavoritesPerspective().getPropertiesContentPage();
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_FAVORITES;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeAction.java
deleted file mode 100644
index 24645925a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectFavoritesUserDefUDDIRegistryNodeAction extends SelectFavoritesNodeAction
-{
- public SelectFavoritesUserDefUDDIRegistryNodeAction(Controller controller)
- {
- super(controller);
- }
-
- public void performExtendedAction()
- {
- TreeElement selectedElement = selectedNode_.getTreeElement();
- ((FavoritesUserDefUDDIRegistryFolderElement)selectedElement).refresh();
- }
-
-
- public static String getActionLink(int nodeID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- if (keepHistory) {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java
deleted file mode 100644
index 5cd908b82..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public final class SwitchPerspectiveFromFavoritesAction extends ShowPerspectiveAction
-{
- public SwitchPerspectiveFromFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- String perspectiveContentFramesetCols = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-
- // Save the frameset sizes iff no frame is maximized.
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
- favPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-
- if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
- favPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-
- return super.run();
- }
-
- public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- StringBuffer formLink = new StringBuffer("wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp?");
- formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
- if (forHistory)
- formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return formLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java
deleted file mode 100644
index 634d37b99..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesActionInputs
-{
- // mass actions
- public final static String MULTIPLE_LINK_ACTION = "multipleLinkAction";
- public final static String MASS_ACTION_NODE_ID = "massActionNodeID";
-
- // resize favorites frames action
- public final static String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
- public final static String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java
deleted file mode 100644
index 8b6c2690c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesFrameNames
-{
- public final static String NAVIGATOR_CONTAINER = "fav_navigator_container";
- public final static String NAVIGATOR_TOOLBAR = "fav_navigator_toolbar";
- public final static String NAVIGATOR_CONTENT = "fav_navigator_content";
- public final static String ACTIONS_CONTAINER = "fav_actions_container";
- public final static String PROPERTIES_CONTAINER = "fav_properties_container";
- public final static String PROPERTIES_TOOLBAR = "fav_properties_toolbar";
- public final static String PROPERTIES_CONTENT = "fav_properties_content";
- public final static String STATUS_CONTAINER = "fav_status_container";
- public final static String STATUS_TOOLBAR = "fav_status_toolbar";
- public final static String STATUS_CONTENT = "fav_status_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java
deleted file mode 100644
index bcf0c20c3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesModelConstants {
- // Relations
- public final static String REL_WSIL_FOLDER_NODE = "relWSILFolderNode";
- public final static String REL_WSDL_SERVICE_FOLDER_NODE = "relWSDLServiceFolderNode";
- public final static String REL_UDDI_SERVICE_FOLDER_NODE = "relUDDIServiceFolderNode";
- public final static String REL_UDDI_BUSINESS_FOLDER_NODE = "relUDDIBusinessFolderNode";
- public final static String REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE = "relUDDIServiceInterfaceFolderNode";
- public final static String REL_UDDI_REGISTRY_FOLDER_NODE = "relUDDIRegistryFolerNode";
- public final static String REL_USER_DEF_UDDI_REGISTRY_FOLDER_NODE = "relUserDefUDDIRegistryFolderNode";
- public final static String REL_WSIL_NODE = "relWSILNode";
- public final static String REL_WSDL_SERVICE_NODE = "relWSDLServiceNode";
- public final static String REL_UDDI_SERVICE_NODE = "relUDDIServiceNode";
- public final static String REL_UDDI_BUSINESS_NODE = "relUDDIBusinessNode";
- public final static String REL_UDDI_SERVICE_INTERFACE_NODE = "relUDDIServiceInterfaceNode";
- public final static String REL_UDDI_REGISTRY_NODE = "relUDDIRegistryNode";
- public final static String REL_USER_DEF_UDDI_REGISTRY_NODE = "relUserDefUDDIRegistryNode";
-
- // Properties
- public final static String PROP_PLUGIN_METADATA_DIRECTORY = "pluginMetadataDirectory";
- public final static String PROP_WSIL_URL = "wsilURL";
- public final static String PROP_WSDL_URL = "wsdlURL";
- public final static String PROP_UDDI_SERVICE_NAME = "UDDIServiceName";
- public final static String PROP_UDDI_SERVICE_INQUIRY_API = "UDDIServiceInquiryAPI";
- public final static String PROP_UDDI_SERVICE_KEY = "UDDIServiceKey";
- public final static String PROP_UDDI_BUSINESS_NAME = "UDDIBusinessName";
- public final static String PROP_UDDI_BUSINESS_INQUIRY_API = "UDDIBusinessInquiryAPI";
- public final static String PROP_UDDI_BUSINESS_KEY = "UDDIBusinessKey";
- public final static String PROP_UDDI_SERVICE_INTERFACE_NAME = "UDDIServiceInterfaceName";
- public final static String PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API = "UDDIServiceInterfaceInquiryAPI";
- public final static String PROP_UDDI_SERVICE_INTERFACE_KEY = "UDDIServiceInterfaceKey";
- public final static String PROP_UDDI_REGISTRY_NAME = "UDDIRegistryName";
- public final static String PROP_UDDI_REGISTRY_INQUIRY_API = "UDDIRegistryInquiryAPI";
- public final static String PROP_UDDI_REGISTRY_PUBLISH_API = "UDDIRegistryPublishAPI";
- public final static String PROP_UDDI_REGISTRY_REGISTRATION_URL = "UDDIRegistryRegistrationURL";
- public final static String PROP_UDDI_REGISTRY_CATEGORIES_ENUM = "UDDIRegistryCategoriesEnum";
-
- // List Managers for Favorites
- public final static String LIST_MANAGER_WSDL_SERVICES = "wsdlServices";
- public final static String LIST_MANAGER_UDDI_SERVICES = "uddiServices";
- public final static String LIST_MANAGER_UDDI_BUSINESS = "uddiBusiness";
- public final static String LIST_MANAGER_WSIL_LINKS = "wsilLinks";
- public final static String LIST_MANAGER_UDDI_REGISTRY = "uddiRegistry";
- public final static String LIST_MANAGER_UDDI_SERVICE_INTERFACE = "uddiServiceInterface";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java
deleted file mode 100644
index 7b677d24e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesElement extends TreeElement {
-
- public FavoritesElement(String name, Model model) {
- super(name, model);
- }
-
- public FavoritesFolderElement getParentFolderElement() {
- Enumeration e = getElements(ModelConstants.REL_OWNER);
- if (!e.hasMoreElements())
- return null;
- else
- return (FavoritesFolderElement)e.nextElement();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java
deleted file mode 100644
index e9b9c0c7f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public abstract class FavoritesFolderElement extends TreeElement
-{
- protected NodeManager nodeManager_;
-
- public FavoritesFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model);
- nodeManager_ = nodeManager;
- }
-
- protected FavoritesMainElement getFavoritesMainElement() {
- return (FavoritesMainElement)nodeManager_.getRootNode().getTreeElement();
- }
-
- public abstract void init(FavoritesMainElement favMainElement);
-
- public abstract boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory);
-
- public abstract boolean removeAllFavorites(String pluginMetadataDirectory);
-
- public abstract boolean addFavorite(Hashtable table);
-
- public abstract boolean favoriteExists(Hashtable table);
-
- public abstract Enumeration getAllFavorites();
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java
deleted file mode 100644
index 299eecdac..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeWSE;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesMainElement extends TreeElement
-{
- private Controller controller_;
- private FavoritesRegistryTypeWSE favRegistry_;
-
- public FavoritesMainElement(String name, Model model, Controller controller)
- {
- super(name, model);
- controller_ = controller;
- favRegistry_ = new FavoritesRegistryTypeWSE(
- controller.getDefaultFavoritesLocation(),
- controller.getServletEngineStateLocation()
- );
- }
-
- public boolean restoreFavoritesDefault()
- {
- favRegistry_.restoreFavoritesDefault();
- return saveFavorites();
- }
-
- public boolean saveFavorites()
- {
- try
- {
- favRegistry_.save();
- return true;
- }
- catch (Throwable t)
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_SAVE_FAVORITES_WSIL", favRegistry_.getWriteLocation()));
- return false;
- }
- }
-
- public Link addUDDIRegistry(String registryName, String inquiryAPI, String publishAPI, String registrationURL)
- {
- return favRegistry_.addUDDIRegistry(registryName, inquiryAPI, publishAPI, registrationURL);
- }
-
- public Link addUDDIBusiness(String businessName, String inquiryAPI, String businessKey)
- {
- return favRegistry_.addUDDIBusiness(businessName, inquiryAPI, businessKey);
- }
-
- public Service addUDDIService(String serviceName, String inquiryAPI, String serviceKey)
- {
- return favRegistry_.addUDDIService(serviceName, inquiryAPI, serviceKey);
- }
-
- public Service addUDDIServiceInterface(String serIntName, String inquiryAPI, String serIntKey)
- {
- return favRegistry_.addUDDIServiceInterface(serIntName, inquiryAPI, serIntKey);
- }
-
- public Service addWSDLService(String url)
- {
- return favRegistry_.addWSDLService(url);
- }
-
- public Link addWSILLink(String url)
- {
- return favRegistry_.addWSILLink(url);
- }
-
- public boolean removeService(Service service) {
- favRegistry_.removeService(service);
- return true;
- }
-
- public boolean removeLink(Link link) {
- favRegistry_.removeLink(link);
- return true;
- }
-
- public Link[] loadUDDIRegistries()
- {
- return favRegistry_.loadUDDIRegistries();
- }
-
- public Link[] loadUDDIBusinesses()
- {
- return favRegistry_.loadUDDIBusinesses();
- }
-
- public Service[] loadUDDIServices()
- {
- return favRegistry_.loadUDDIServices();
- }
-
- public Service[] loadUDDIServiceInterfaces()
- {
- return favRegistry_.loadUDDIServiceInterfaces();
- }
-
- public Service[] loadWSDLServices()
- {
- return favRegistry_.loadWSDLServices();
- }
-
- public Link[] loadWSILs()
- {
- return favRegistry_.loadWSILs();
- }
-
- public final FavoritesUDDIRegistryFolderElement getFavoritesUDDIRegistryFolderElement()
- {
- return (FavoritesUDDIRegistryFolderElement)(getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE).nextElement());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java
deleted file mode 100644
index 62d17fc74..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIBusiness;
-
-public class FavoritesUDDIBusinessElement extends FavoritesElement {
-
- private FavoritesUDDIBusiness uddiBusiness_;
-
- public FavoritesUDDIBusinessElement(String name, Model model, Link link) {
- super(name, model);
- uddiBusiness_ = new FavoritesUDDIBusiness();
- uddiBusiness_.setLink(link);
- }
-
- public Link getLink() {
- return uddiBusiness_.getLink();
- }
-
- public String getName() {
- return uddiBusiness_.getName();
- }
-
- public String getInquiryURL() {
- return uddiBusiness_.getInquiryURL();
- }
-
- public String getBusinessKey() {
- return uddiBusiness_.getBusinessKey();
- }
-
- public String toString() {
- return getName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java
deleted file mode 100644
index 014ab4ea9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesUDDIBusinessFolderElement extends FavoritesFolderElement
-{
- public FavoritesUDDIBusinessFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Link[] links = favMainElement.loadUDDIBusinesses();
- for (int i = 0; i < links.length; i++) {
- Link link = links[i];
- FavoritesUDDIBusinessElement favUDDIBusinessElement = new FavoritesUDDIBusinessElement((link.getAbstracts())[0].getText(), getModel(), link);
- connect(favUDDIBusinessElement, FavoritesModelConstants.REL_UDDI_BUSINESS_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String businessName = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME);
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API);
- String businessKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY);
- if (businessName == null || inquiryAPI == null || businessKey == null)
- return false;
- FavoritesUDDIBusinessElement e = getFavorite(inquiryAPI, businessKey);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Link link = favMainElement.addUDDIBusiness(businessName, inquiryAPI, businessKey);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesUDDIBusinessElement favUDDIBusinessElement = new FavoritesUDDIBusinessElement(businessName, getModel(), link);
- connect(favUDDIBusinessElement, FavoritesModelConstants.REL_UDDI_BUSINESS_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public boolean favoriteExists(Hashtable table) {
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API);
- String businessKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY);
- if (inquiryAPI == null || businessKey == null)
- return false;
- return (getFavorite(inquiryAPI, businessKey) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesUDDIBusinessElement)
- return (removeFavorite((FavoritesUDDIBusinessElement)selectedElement) && favMainElement.saveFavorites());
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesUDDIBusinessElement element) {
- Link link = element.getLink();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeLink(link)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesUDDIBusinessElement favUDDIBusinessElement = (FavoritesUDDIBusinessElement)e.nextElement();
- Link link = favUDDIBusinessElement.getLink();
- favMainElement.removeLink(link);
- }
- disconnectRel(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE);
- }
-
- private FavoritesUDDIBusinessElement getFavorite(String inquiryAPI, String businessKey) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement)e.nextElement();
- if (inquiryAPI.equals(busElement.getInquiryURL()) &&
- businessKey.equals(busElement.getBusinessKey()))
- return busElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java
deleted file mode 100644
index 683f66f3e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIRegistry;
-import org.eclipse.wst.ws.internal.parser.favorites.IFavoritesUDDIRegistry;
-
-public class FavoritesUDDIRegistryElement extends FavoritesElement {
-
- private FavoritesUDDIRegistry uddiReg_;
-
- public FavoritesUDDIRegistryElement(String name, Model model, Link link) {
- super(name, model);
- uddiReg_ = new FavoritesUDDIRegistry();
- uddiReg_.setLink(link);
- }
-
- public Link getLink() {
- return uddiReg_.getLink();
- }
-
- public String getName() {
- return uddiReg_.getName();
- }
-
- public String getInquiryURL() {
- return uddiReg_.getInquiryURL();
- }
-
- public String getPublishURL() {
- return uddiReg_.getPublishURL();
- }
-
- public String getRegistrationURL() {
- return uddiReg_.getRegistrationURL();
- }
-
- public String toString() {
- return getName();
- }
-
- public IFavoritesUDDIRegistry getIFavoritesUDDIRegistryInterface()
- {
- return uddiReg_;
- }
-}
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java
deleted file mode 100644
index 0a8fcc982..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesUDDIRegistryFolderElement extends FavoritesFolderElement
-{
- public FavoritesUDDIRegistryFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Link[] links = favMainElement.loadUDDIRegistries();
- for (int i = 0; i < links.length; i++) {
- Link link = links[i];
- FavoritesUDDIRegistryElement favUDDIRegsitryElement = new FavoritesUDDIRegistryElement((link.getAbstracts())[0].getText(), getModel(), link);
- connect(favUDDIRegsitryElement, FavoritesModelConstants.REL_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String registryName = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME);
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_INQUIRY_API);
- String publishAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_PUBLISH_API);
- String registrationURL = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_REGISTRATION_URL);
- Enumeration userDefinedCategories = (Enumeration)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_CATEGORIES_ENUM);
- // Save the category data first and undo if necessary.
- if (userDefinedCategories != null)
- {
- String pluginMetadataDirectory = (String)table.get(FavoritesModelConstants.PROP_PLUGIN_METADATA_DIRECTORY);
- StringBuffer directoryBuffer = new StringBuffer();
- formCategoriesDirectory(directoryBuffer,pluginMetadataDirectory,registryName);
- File categoriesDirectoryFile = new File(directoryBuffer.toString());
- categoriesDirectoryFile.mkdirs();
- StringBuffer categoryFileName = new StringBuffer();
- while (userDefinedCategories.hasMoreElements())
- {
- CategoryModel categoryModel = (CategoryModel)userDefinedCategories.nextElement();
- categoryFileName.setLength(0);
- String encodedCategoryKey = URLUtils.encode(categoryModel.getCategoryKey());
- categoryFileName.append(categoriesDirectoryFile.getAbsolutePath()).append(File.separatorChar).append(encodedCategoryKey).append(".txt");
- byte rc = categoryModel.saveData(categoryFileName.toString());
- if (rc != CategoryModel.OPERATION_SUCCESSFUL)
- {
- // Delete the category file if it exists.
- File categoryFile = new File(categoryFileName.toString());
- if (categoryFile.exists())
- categoryFile.delete();
- }
- }
- cleanupCategoryDirectories(categoriesDirectoryFile);
- }
- if (registryName == null || inquiryAPI == null || publishAPI == null)
- return false;
- FavoritesUDDIRegistryElement e = getFavorite(registryName);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Link link = favMainElement.addUDDIRegistry(registryName, inquiryAPI, publishAPI, registrationURL);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesUDDIRegistryElement favUDDIRegsitryElement = new FavoritesUDDIRegistryElement(registryName, getModel(), link);
- connect(favUDDIRegsitryElement, FavoritesModelConstants.REL_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public static final void formCategoriesDirectory(StringBuffer categoriesDirectory,String pluginMetadataDirectory,String registryName)
- {
- // <metadata>/uddi/<registryId>/categories
- String encodedRegistryName = URLUtils.encode(registryName);
- categoriesDirectory.append(pluginMetadataDirectory).append("uddi").append(File.separatorChar).append(encodedRegistryName).append(File.separatorChar).append("categories");
- }
-
- private final void clearRegistryMetadata(String pluginMetadataDirectory,String registryName)
- {
- StringBuffer categoriesDirectory = new StringBuffer();
- formCategoriesDirectory(categoriesDirectory,pluginMetadataDirectory,registryName);
- File categoriesDirectoryFile = new File(categoriesDirectory.toString());
- File[] categoryFiles = categoriesDirectoryFile.listFiles();
- if (categoryFiles != null)
- {
- for (int i=0;i<categoryFiles.length;i++)
- categoryFiles[i].delete();
- }
- cleanupCategoryDirectories(categoriesDirectoryFile);
- }
-
- private final void cleanupCategoryDirectories(File categoriesDirectoryFile)
- {
- // Delete the categories subdirectory if it is empty.
- String[] fileList;
- fileList = categoriesDirectoryFile.list();
- if (fileList == null || fileList.length == 0)
- categoriesDirectoryFile.delete();
- // Delete the <registryId> subdirectory if it is empty.
- File registryIdDirectoryFile = categoriesDirectoryFile.getParentFile();
- fileList = registryIdDirectoryFile.list();
- if (fileList == null || fileList.length == 0)
- registryIdDirectoryFile.delete();
- // Delete the uddi subdirectory if it is empty.
- File uddiDirectoryFile = registryIdDirectoryFile.getParentFile();
- fileList = uddiDirectoryFile.list();
- if (fileList == null || fileList.length == 0)
- uddiDirectoryFile.delete();
- }
-
- public boolean favoriteExists(Hashtable table) {
- String registryName = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME);
- if (registryName == null)
- return false;
- return (getFavorite(registryName) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesUDDIRegistryElement)
- {
- clearRegistryMetadata(pluginMetadataDirectory,selectedElement.getName());
- boolean rc = removeFavorite((FavoritesUDDIRegistryElement)selectedElement);
- rc = rc && favMainElement.saveFavorites();
- return rc;
- }
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesUDDIRegistryElement element) {
- Link link = ((FavoritesUDDIRegistryElement)element).getLink();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeLink(link)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesUDDIRegistryElement favUDDIRegistryElement = (FavoritesUDDIRegistryElement)e.nextElement();
- clearRegistryMetadata(pluginMetadataDirectory,favUDDIRegistryElement.getName());
- Link link = favUDDIRegistryElement.getLink();
- favMainElement.removeLink(link);
- }
- disconnectRel(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
- }
-
- private FavoritesUDDIRegistryElement getFavorite(String registryName) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement)e.nextElement();
- if (registryName.equals(regElement.getName()))
- return regElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java
deleted file mode 100644
index 700b34e0d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIService;
-
-public class FavoritesUDDIServiceElement extends FavoritesElement {
-
- private FavoritesUDDIService uddiService_;
-
- public FavoritesUDDIServiceElement(String name, Model model, Service service) {
- super(name, model);
- uddiService_ = new FavoritesUDDIService();
- uddiService_.setService(service);
- }
-
- public Service getService() {
- return uddiService_.getService();
- }
-
- public String getName() {
- return uddiService_.getName();
- }
-
- public String getInquiryURL() {
- return uddiService_.getInquiryURL();
- }
-
- public String getServiceKey() {
- return uddiService_.getServiceKey();
- }
-
- public String toString() {
- return getName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java
deleted file mode 100644
index 3ab4f91ff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesUDDIServiceFolderElement extends FavoritesFolderElement
-{
-
- public FavoritesUDDIServiceFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Service[] services = favMainElement.loadUDDIServices();
- for (int i = 0; i < services.length; i++) {
- Service service = services[i];
- FavoritesUDDIServiceElement favUDDIServiceElement = new FavoritesUDDIServiceElement((service.getServiceNames())[0].getText(), getModel(), service);
- connect(favUDDIServiceElement, FavoritesModelConstants.REL_UDDI_SERVICE_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String serviceName = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME);
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API);
- String serviceKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY);
- if (serviceName == null || inquiryAPI == null || serviceKey == null)
- return false;
- FavoritesUDDIServiceElement e = getFavorite(inquiryAPI, serviceKey);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Service service = favMainElement.addUDDIService(serviceName, inquiryAPI, serviceKey);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesUDDIServiceElement favUDDIServiceElement = new FavoritesUDDIServiceElement(serviceName, getModel(), service);
- connect(favUDDIServiceElement, FavoritesModelConstants.REL_UDDI_SERVICE_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public boolean favoriteExists(Hashtable table) {
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API);
- String serviceKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY);
- if (inquiryAPI == null || serviceKey == null)
- return false;
- return (getFavorite(inquiryAPI, serviceKey) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesUDDIServiceElement)
- return (removeFavorite((FavoritesUDDIServiceElement)selectedElement) && favMainElement.saveFavorites());
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesUDDIServiceElement element) {
- Service service = ((FavoritesUDDIServiceElement)element).getService();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeService(service)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesUDDIServiceElement favUDDIServiceElement = (FavoritesUDDIServiceElement)e.nextElement();
- Service service = favUDDIServiceElement.getService();
- favMainElement.removeService(service);
- }
- disconnectRel(FavoritesModelConstants.REL_UDDI_SERVICE_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_UDDI_SERVICE_NODE);
- }
-
- private FavoritesUDDIServiceElement getFavorite(String inquiryAPI, String serviceKey) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement)e.nextElement();
- if (inquiryAPI.equals(serElement.getInquiryURL()) &&
- serviceKey.equals(serElement.getServiceKey()))
- return serElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java
deleted file mode 100644
index 509b2c0ab..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIServiceInterface;
-
-public class FavoritesUDDIServiceInterfaceElement extends FavoritesElement {
-
- private FavoritesUDDIServiceInterface uddiSerInt_;
-
- public FavoritesUDDIServiceInterfaceElement(String name, Model model, Service service) {
- super(name, model);
- uddiSerInt_ = new FavoritesUDDIServiceInterface();
- uddiSerInt_.setService(service);
- }
-
- public Service getService() {
- return uddiSerInt_.getService();
- }
-
- public String getName() {
- return uddiSerInt_.getName();
- }
-
- public String getInquiryURL() {
- return uddiSerInt_.getInquiryURL();
- }
-
- public String getServiceInterfaceKey() {
- return uddiSerInt_.getServiceInterfaceKey();
- }
-
- public String toString() {
- return getName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java
deleted file mode 100644
index 9eb49dcdf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-/**
-* The data model element that represents
-* a WSIL document
-*/
-public class FavoritesUDDIServiceInterfaceFolderElement extends FavoritesFolderElement
-{
-
- public FavoritesUDDIServiceInterfaceFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Service[] services = favMainElement.loadUDDIServiceInterfaces();
- for (int i = 0; i < services.length; i++) {
- Service service = services[i];
- FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = new FavoritesUDDIServiceInterfaceElement((service.getServiceNames())[0].getText(), getModel(), service);
- connect(favUDDISerIntElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String serIntName = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME);
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API);
- String serIntKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY);
- if (serIntName == null || inquiryAPI == null || serIntKey == null)
- return false;
- FavoritesUDDIServiceInterfaceElement e = getFavorite(inquiryAPI, serIntKey);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Service service = favMainElement.addUDDIServiceInterface(serIntName, inquiryAPI, serIntKey);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = new FavoritesUDDIServiceInterfaceElement(serIntName, getModel(), service);
- connect(favUDDISerIntElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public boolean favoriteExists(Hashtable table) {
- String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API);
- String serIntKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY);
- if (inquiryAPI == null || serIntKey == null)
- return false;
- return (getFavorite(inquiryAPI, serIntKey) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesUDDIServiceInterfaceElement)
- return (removeFavorite((FavoritesUDDIServiceInterfaceElement)selectedElement) && favMainElement.saveFavorites());
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesUDDIServiceInterfaceElement element) {
- Service service = ((FavoritesUDDIServiceInterfaceElement)element).getService();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeService(service)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
- Service service = favUDDISerIntElement.getService();
- favMainElement.removeService(service);
- }
- disconnectRel(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE);
- }
-
- private FavoritesUDDIServiceInterfaceElement getFavorite(String inquiryAPI, String serIntKey) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
- if (inquiryAPI.equals(serIntElement.getInquiryURL()) &&
- serIntKey.equals(serIntElement.getServiceInterfaceKey()))
- return serIntElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryElement.java
deleted file mode 100644
index 37a4de15c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryElement.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060912 141796 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.registry.IRegistryManager;
-import org.eclipse.wst.ws.internal.registry.RegistryService;
-import org.eclipse.wst.ws.internal.registry.UDDIRegistryService;
-
-public class FavoritesUserDefUDDIRegistryElement extends FavoritesElement
-{
- private List names;
- private List descs;
- private String version;
- private String defaultLogin;
- private String defaultPassword;
- private String inquiryURL;
- private String publishURL;
- private String secureInquiryURL;
- private String securePublishURL;
- private Taxonomy[] taxonomies;
-
- public String getDefaultLogin()
- {
- return defaultLogin;
- }
-
- public void setDefaultLogin(String defaultLogin)
- {
- this.defaultLogin = defaultLogin;
- }
-
- public String getDefaultPassword()
- {
- return defaultPassword;
- }
-
- public void setDefaultPassword(String defaultPassword)
- {
- this.defaultPassword = defaultPassword;
- }
-
- public Taxonomy[] getTaxonomies()
- {
- return taxonomies;
- }
-
- public void setTaxonomies(Taxonomy[] taxonomies)
- {
- this.taxonomies = taxonomies;
- }
-
- public FavoritesUserDefUDDIRegistryElement(String name, Model model)
- {
- super(name, model);
- }
-
- public List getDescs()
- {
- return descs;
- }
-
- public void setDescs(List descs)
- {
- this.descs = descs;
- }
-
- public String getInquiryURL()
- {
- return inquiryURL;
- }
-
- public void setInquiryURL(String inquiryURL)
- {
- this.inquiryURL = inquiryURL;
- }
-
- public List getNames()
- {
- return names;
- }
-
- public void setNames(List names)
- {
- this.names = names;
- }
-
- public String getPublishURL()
- {
- return publishURL;
- }
-
- public void setPublishURL(String publishURL)
- {
- this.publishURL = publishURL;
- }
-
- public String getSecureInquiryURL()
- {
- return secureInquiryURL;
- }
-
- public void setSecureInquiryURL(String secureInquiryURL)
- {
- this.secureInquiryURL = secureInquiryURL;
- }
-
- public String getSecurePublishURL()
- {
- return securePublishURL;
- }
-
- public void setSecurePublishURL(String securePublishURL)
- {
- this.securePublishURL = securePublishURL;
- }
-
- public String getVersion()
- {
- return version;
- }
-
- public void setVersion(String version)
- {
- this.version = version;
- }
-
- public String toString()
- {
- return getName();
- }
-
- public void refreshMeta(){
-
- RegistryService regService = RegistryService.instance();
- IRegistryManager regManager = regService.getDefaultRegistryManager();
- try
- {
-
-
- regManager.refreshManager();
- String[] regURIs = regManager.getRegistryURIs();
- for (int i = 0; i < regURIs.length; i++)
- {
- Registry reg = regManager.loadRegistry(regURIs[i]);
- if (reg instanceof UDDIRegistry)
- {
- UDDIRegistry uddiReg = (UDDIRegistry)reg;
- List names = uddiReg.getName();
-
- if(uddiReg.getDiscoveryURL().equals(getInquiryURL())){
-
- setNames(names);
- setDescs(uddiReg.getDescription());
- setVersion(uddiReg.getVersion());
- setDefaultLogin(uddiReg.getDefaultLogin());
- setDefaultPassword(uddiReg.getDefaultPassword());
- setInquiryURL(uddiReg.getDiscoveryURL());
- setPublishURL(uddiReg.getPublicationURL());
- setSecureInquiryURL(uddiReg.getSecuredDiscoveryURL());
- setSecurePublishURL(uddiReg.getSecuredPublicationURL());
- Taxonomy[] taxonomies = regManager.loadTaxonomies(UDDIRegistryService.instance().getTaxonomyURIs(uddiReg));
- setTaxonomies(taxonomies);
- }
- }
- }
- }
- catch (CoreException ce)
- {
- // TODO: Better error reporting
- ce.printStackTrace();
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryFolderElement.java
deleted file mode 100644
index a91ad1172..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUserDefUDDIRegistryFolderElement.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060906 141796 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.model.v10.registry.Name;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.registry.IRegistryManager;
-import org.eclipse.wst.ws.internal.registry.RegistryService;
-import org.eclipse.wst.ws.internal.registry.UDDIRegistryService;
-
-/**
- * The data model element that represents a WSIL document
- */
-public class FavoritesUserDefUDDIRegistryFolderElement extends FavoritesFolderElement
-{
- public FavoritesUserDefUDDIRegistryFolderElement(String name, Model model, NodeManager nodeManager)
- {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement)
- {
- refresh();
- }
-
- public void refresh(){
- disconnectRel(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE);
- RegistryService regService = RegistryService.instance();
- IRegistryManager regManager = regService.getDefaultRegistryManager();
- try
- {
- regManager.refreshManager();
- String[] regURIs = regManager.getRegistryURIs();
- for (int i = 0; i < regURIs.length; i++)
- {
- Registry reg = regManager.loadRegistry(regURIs[i]);
- if (reg instanceof UDDIRegistry)
- {
- UDDIRegistry uddiReg = (UDDIRegistry)reg;
- List names = uddiReg.getName();
- String displayName = names != null && !names.isEmpty() ? ((Name)names.get(0)).getValue() : "";
- FavoritesUserDefUDDIRegistryElement favUserDefUDDIRegElement = new FavoritesUserDefUDDIRegistryElement(displayName, getModel());
- favUserDefUDDIRegElement.setNames(names);
- favUserDefUDDIRegElement.setDescs(uddiReg.getDescription());
- favUserDefUDDIRegElement.setVersion(uddiReg.getVersion());
- favUserDefUDDIRegElement.setDefaultLogin(uddiReg.getDefaultLogin());
- favUserDefUDDIRegElement.setDefaultPassword(uddiReg.getDefaultPassword());
- favUserDefUDDIRegElement.setInquiryURL(uddiReg.getDiscoveryURL());
- favUserDefUDDIRegElement.setPublishURL(uddiReg.getPublicationURL());
- favUserDefUDDIRegElement.setSecureInquiryURL(uddiReg.getSecuredDiscoveryURL());
- favUserDefUDDIRegElement.setSecurePublishURL(uddiReg.getSecuredPublicationURL());
- Taxonomy[] taxonomies = regManager.loadTaxonomies(UDDIRegistryService.instance().getTaxonomyURIs(uddiReg));
- favUserDefUDDIRegElement.setTaxonomies(taxonomies);
- connect(favUserDefUDDIRegElement, FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
- }
- }
- }
- catch (CoreException ce)
- {
- // TODO: Better error reporting
- ce.printStackTrace();
- }
- }
-
-
- public boolean addFavorite(Hashtable table)
- {
- // do nothing
- return true;
- }
-
- public boolean favoriteExists(Hashtable table)
- {
- // do nothing
- return true;
- }
-
- public boolean removeFavoriteByNodeID(int nodeID, String pluginMetadataDirectory)
- {
- // do nothing
- return true;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory)
- {
- // do nothing
- return true;
- }
-
- public Enumeration getAllFavorites()
- {
- return getElements(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java
deleted file mode 100644
index 162bb6bd9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesWSDL;
-
-public class FavoritesWSDLServiceElement extends FavoritesElement {
-
- private FavoritesWSDL wsdl_;
-
- public FavoritesWSDLServiceElement(String name, Model model, Service service) {
- super(name, model);
- wsdl_ = new FavoritesWSDL();
- wsdl_.setService(service);
- }
-
- public Service getService() {
- return wsdl_.getService();
- }
-
- public String getWsdlUrl() {
- return wsdl_.getWsdlUrl();
- }
-
- public String toString() {
- return getWsdlUrl();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java
deleted file mode 100644
index 1f83f45b7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Service;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSDLServiceFolderElement extends FavoritesFolderElement
-{
-
- public FavoritesWSDLServiceFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Service[] services = favMainElement.loadWSDLServices();
- for (int i = 0; i < services.length; i++) {
- Service service = services[i];
- FavoritesWSDLServiceElement favWSDLServiceElement = new FavoritesWSDLServiceElement((service.getDescriptions())[0].getLocation(), getModel(), service);
- connect(favWSDLServiceElement, FavoritesModelConstants.REL_WSDL_SERVICE_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String wsdlURL = (String)table.get(FavoritesModelConstants.PROP_WSDL_URL);
- if (wsdlURL == null)
- return false;
- FavoritesWSDLServiceElement e = getFavorite(wsdlURL);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Service service = favMainElement.addWSDLService(wsdlURL);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesWSDLServiceElement favWSDLServiceElement = new FavoritesWSDLServiceElement(wsdlURL, getModel(), service);
- connect(favWSDLServiceElement, FavoritesModelConstants.REL_WSDL_SERVICE_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public boolean favoriteExists(Hashtable table) {
- String wsdlURL = (String)table.get(FavoritesModelConstants.PROP_WSDL_URL);
- if (wsdlURL == null)
- return false;
- return (getFavorite(wsdlURL) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesWSDLServiceElement)
- return (removeFavorite((FavoritesWSDLServiceElement)selectedElement) && favMainElement.saveFavorites());
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesWSDLServiceElement element) {
- Service service = ((FavoritesWSDLServiceElement)element).getService();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeService(service)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesWSDLServiceElement favWSDLServiceElement = (FavoritesWSDLServiceElement)e.nextElement();
- Service service = favWSDLServiceElement.getService();
- favMainElement.removeService(service);
- }
- disconnectRel(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
- }
-
- private FavoritesWSDLServiceElement getFavorite(String wsdlUrl) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement)e.nextElement();
- if (wsdlUrl.equals(wsdlElement.getWsdlUrl()))
- return wsdlElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java
deleted file mode 100644
index 280b6079e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesWSIL;
-
-public class FavoritesWSILElement extends FavoritesElement {
-
- private FavoritesWSIL wsil_;
-
- public FavoritesWSILElement(String name, Model model, Link link) {
- super(name, model);
- wsil_ = new FavoritesWSIL();
- wsil_.setLink(link);
- }
-
- public Link getLink() {
- return wsil_.getLink();
- }
-
- public String getWsilUrl() {
- return wsil_.getWsilUrl();
- }
-
- public String toString() {
- return getWsilUrl();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java
deleted file mode 100644
index 2ea4930ba..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSILFolderElement extends FavoritesFolderElement {
-
- public FavoritesWSILFolderElement(String name, Model model, NodeManager nodeManager) {
- super(name, model, nodeManager);
- }
-
- public void init(FavoritesMainElement favMainElement) {
- Link[] links = favMainElement.loadWSILs();
- for (int i = 0; i < links.length; i++) {
- Link link = links[i];
- FavoritesWSILElement favWSILElement = new FavoritesWSILElement(link.getLocation(), getModel(), link);
- connect(favWSILElement, FavoritesModelConstants.REL_WSIL_NODE, ModelConstants.REL_OWNER);
- }
- }
-
- public boolean addFavorite(Hashtable table) {
- String wsilURL = (String)table.get(FavoritesModelConstants.PROP_WSIL_URL);
- if (wsilURL == null)
- return false;
- FavoritesWSILElement e = getFavorite(wsilURL);
- if (e != null)
- removeFavorite(e);
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Link link = favMainElement.addWSILLink(wsilURL);
- boolean saved = favMainElement.saveFavorites();
- if (saved) {
- FavoritesWSILElement favWSILElement = new FavoritesWSILElement(wsilURL, getModel(), link);
- connect(favWSILElement, FavoritesModelConstants.REL_WSIL_NODE, ModelConstants.REL_OWNER);
- }
- return saved;
- }
-
- public boolean favoriteExists(Hashtable table) {
- String wsilURL = (String)table.get(FavoritesModelConstants.PROP_WSIL_URL);
- if (wsilURL == null)
- return false;
- return (getFavorite(wsilURL) != null);
- }
-
- public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (selectedElement instanceof FavoritesWSILElement)
- return (removeFavorite((FavoritesWSILElement)selectedElement) && favMainElement.saveFavorites());
- else
- return false;
- }
-
- private boolean removeFavorite(FavoritesWSILElement element) {
- Link link = element.getLink();
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- if (favMainElement.removeLink(link)) {
- element.disconnectAll();
- return true;
- }
- else
- return false;
- }
-
- public boolean removeAllFavorites(String pluginMetadataDirectory) {
- FavoritesMainElement favMainElement = getFavoritesMainElement();
- Enumeration e = getAllFavorites();
- while(e.hasMoreElements()) {
- FavoritesWSILElement favWSILElement = (FavoritesWSILElement)e.nextElement();
- Link link = favWSILElement.getLink();
- favMainElement.removeLink(link);
- }
- disconnectRel(FavoritesModelConstants.REL_WSIL_NODE);
- return favMainElement.saveFavorites();
- }
-
- public Enumeration getAllFavorites() {
- return getElements(FavoritesModelConstants.REL_WSIL_NODE);
- }
-
- private FavoritesWSILElement getFavorite(String wsilUrl) {
- Enumeration e = getAllFavorites();
- while (e.hasMoreElements()) {
- FavoritesWSILElement wsilElement = (FavoritesWSILElement)e.nextElement();
- if (wsilUrl.equals(wsilElement.getWsilUrl()))
- return wsilElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java
deleted file mode 100644
index 98a1797fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class AddToUDDIPerspectiveTool extends ActionTool {
-
- public AddToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/add_to_uddi_perspective_enabled.gif", "favorites/images/add_to_uddi_perspective_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java
deleted file mode 100644
index 424812d69..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddWSILToWSILPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class AddWSILToWSILPerspectiveTool extends ActionTool {
-
- public AddWSILToWSILPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/add_to_wsil_perspective_enabled.gif", "favorites/images/add_to_wsil_perspective_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddWSILToWSILPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java
deleted file mode 100644
index e100faa04..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesAddToWSDLPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
-
- public FavoritesAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return FavoritesAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java
deleted file mode 100644
index a7110c533..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesImportToFileSystemTool extends ImportToFileSystemTool {
-
- public FavoritesImportToFileSystemTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return ImportToFileSystemAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(),"favorites/actions/FavoritesImportToFileSystemActionJSP.jsp");
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java
deleted file mode 100644
index 8cac8f0ed..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesImportToWorkbenchTool extends ImportToWorkbenchTool {
-
- public FavoritesImportToWorkbenchTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesImportToWorkbenchForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java
deleted file mode 100644
index e19b359ff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
-
- public FavoritesLaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java
deleted file mode 100644
index b560106a3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUserDefUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSILFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesMainNode extends FavoritesNavigatorNode {
- public FavoritesMainNode(TreeElement treeElement, NodeManager nodeManager) {
- super(treeElement, nodeManager, 1, "images/root_main.gif");
-
- // Create UDDI Registry Folder Node
- FavoritesUDDIRegistryFolderElement favUDDIRegistryFolderElement = new FavoritesUDDIRegistryFolderElement(getMessage("FAVORITES_UDDI_REGISTRIES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favUDDIRegistryFolderElement, FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesUDDIRegistryFolderNode favUDDIRegistryFolderNode = new FavoritesUDDIRegistryFolderNode(favUDDIRegistryFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favUDDIRegistryFolderNode);
- favUDDIRegistryFolderNode.setVisibilityOfChildren(false);
- favUDDIRegistryFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create User defined UDDI Registry Folder Node
- FavoritesUserDefUDDIRegistryFolderElement favUserDefUDDIFolderElement = new FavoritesUserDefUDDIRegistryFolderElement(getMessage("FAVORITES_USER_DEF_UDDI_REGISTRIES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favUserDefUDDIFolderElement, FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesUserDefUDDIRegistryFolderNode favUserDefUDDIFolderNode = new FavoritesUserDefUDDIRegistryFolderNode(favUserDefUDDIFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favUserDefUDDIFolderNode);
- favUserDefUDDIFolderNode.setVisibilityOfChildren(false);
- favUserDefUDDIFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create UDDI Business Folder Node
- FavoritesUDDIBusinessFolderElement favUDDIBusinessFolderElement = new FavoritesUDDIBusinessFolderElement(getMessage("FAVORITES_UDDI_BUSINESSES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favUDDIBusinessFolderElement, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesUDDIBusinessFolderNode favUDDIBusinessFolderNode = new FavoritesUDDIBusinessFolderNode(favUDDIBusinessFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favUDDIBusinessFolderNode);
- favUDDIBusinessFolderNode.setVisibilityOfChildren(false);
- favUDDIBusinessFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create UDDI Service Folder Node
- FavoritesUDDIServiceFolderElement favUDDIServiceFolderElement = new FavoritesUDDIServiceFolderElement(getMessage("FAVORITES_UDDI_SERVICE_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favUDDIServiceFolderElement, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesUDDIServiceFolderNode favUDDIServiceFolderNode = new FavoritesUDDIServiceFolderNode(favUDDIServiceFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favUDDIServiceFolderNode);
- favUDDIServiceFolderNode.setVisibilityOfChildren(false);
- favUDDIServiceFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create UDDI Service Interface Folder Node
- FavoritesUDDIServiceInterfaceFolderElement favUDDIServiceInterfaceFolderElement = new FavoritesUDDIServiceInterfaceFolderElement(getMessage("FAVORITES_UDDI_SERVICE_INTERFACES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favUDDIServiceInterfaceFolderElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesUDDIServiceInterfaceFolderNode favUDDIServiceInterfaceFolderNode = new FavoritesUDDIServiceInterfaceFolderNode(favUDDIServiceInterfaceFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favUDDIServiceInterfaceFolderNode);
- favUDDIServiceInterfaceFolderNode.setVisibilityOfChildren(false);
- favUDDIServiceInterfaceFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create WSIL Folder Node
- FavoritesWSILFolderElement favWSILFolderElement = new FavoritesWSILFolderElement(getMessage("FAVORITES_WSIL_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favWSILFolderElement, FavoritesModelConstants.REL_WSIL_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesWSILFolderNode favWSILFolderNode = new FavoritesWSILFolderNode(favWSILFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favWSILFolderNode);
- favWSILFolderNode.setVisibilityOfChildren(false);
- favWSILFolderElement.init((FavoritesMainElement)treeElement);
-
- // Create WSDL Service Folder Node
- FavoritesWSDLServiceFolderElement favWSDLServiceFolderElement = new FavoritesWSDLServiceFolderElement(getMessage("FAVORITES_WSDL_SERVICE_FOLDER_NODE"), treeElement.getModel(), nodeManager);
- treeElement.connect(favWSDLServiceFolderElement, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE, ModelConstants.REL_OWNER);
- FavoritesWSDLServiceFolderNode favWSDLServiceFolderNode = new FavoritesWSDLServiceFolderNode(favWSDLServiceFolderElement, nodeManager, nodeDepth_ + 1);
- addChild(favWSDLServiceFolderNode);
- favWSDLServiceFolderNode.setVisibilityOfChildren(false);
- favWSDLServiceFolderElement.init((FavoritesMainElement)treeElement);
-
- }
-
- protected void initTools() {
- }
-
- private String getMessage(String msg) {
- Controller controller = nodeManager_.getController();
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- return favPerspective.getMessage(msg);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java
deleted file mode 100644
index 035d0ac1b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FolderNode;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class FavoritesNavigatorFolderNode extends FolderNode {
-
- public FavoritesNavigatorFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- }
-
- protected String getToggleNodeActionHref() {
- return FavoritesToggleNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- protected String getLinkActionHref() {
- return SelectFavoritesNodeAction.getActionLink(nodeId_, false);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java
deleted file mode 100644
index 3b87d664c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class FavoritesNavigatorNode extends Node {
-
- public FavoritesNavigatorNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath) {
- super(treeElement, nodeManager, nodeDepth, imagePath);
- }
-
- protected String getToggleNodeActionHref() {
- return FavoritesToggleNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- protected String getLinkActionHref() {
- return SelectFavoritesNodeAction.getActionLink(nodeId_, false);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java
deleted file mode 100644
index de498f999..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SwitchPerspectiveFromFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-
-public class FavoritesPerspective extends Perspective
-{
- private BasicModel model_;
- private NodeManager nodeManager_;
- private String perspectiveContentFramesetCols_;
- private String savedPerspectiveContentFramesetCols_;
- private String actionsContainerFramesetRows_;
- private String savedActionsContainerFramesetRows_;
-
- public FavoritesPerspective(Controller controller)
- {
- super("favorites",controller);
- }
-
- public final void initPerspective(ServletContext application)
- {
- model_ = new BasicModel("FavoritesModel");
- FavoritesMainElement favoritesMainElement = new FavoritesMainElement(getMessage("FAVORITES_MAIN_NODE"), model_, controller_);
- model_.setRootElement(favoritesMainElement);
- nodeManager_ = new NodeManager(controller_);
- FavoritesMainNode favMainNode = new FavoritesMainNode(favoritesMainElement, nodeManager_);
- nodeManager_.setRootNode(favMainNode);
-
- // Starting frameset sizes.
- if (!DirUtils.isRTL())
- perspectiveContentFramesetCols_ = "30%,*";
- else
- perspectiveContentFramesetCols_ = "*,30%";
- savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
- actionsContainerFramesetRows_ = "75%,*";
- savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
- }
-
- public NodeManager getNodeManager() {
- return nodeManager_;
- }
-
- public String getPerspectiveContentPage()
- {
- return "favorites/fav_perspective_content.jsp";
- }
-
- public int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_FAVORITES;
- }
-
- public String getPanesFile() {
- return "favorites/scripts/favoritesPanes.jsp";
- }
-
- public String getProcessFramesetsForm()
- {
- return "favorites/forms/ProcessFavoritesFramesetsForm.jsp";
- }
-
- public String getFramesetsFile()
- {
- return "favorites/scripts/favoritesframesets.jsp";
- }
-
- public String getTreeContentVar() {
- return "favNavigatorContent";
- }
-
- public String getTreeContentPage() {
- return "favorites/fav_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar() {
- return "favPropertiesContainer";
- }
-
- public String getPropertiesContainerPage() {
- return "favorites/fav_properties_container.jsp";
- }
-
- public String getStatusContentVar() {
- return "favStatusContent";
- }
-
- public String getStatusContentPage() {
- return "favorites/fav_status_content.jsp";
- }
-
- public String getPropertiesContentVar() {
- return "favPropertiesContent";
- }
-
- public String getPropertiesContentPage() {
- return "favorites/fav_properties_content.jsp";
- }
-
- public final String getPerspectiveContentFramesetCols()
- {
- return perspectiveContentFramesetCols_;
- }
-
- public final void setPerspectiveContentFramesetCols(String cols)
- {
- perspectiveContentFramesetCols_ = cols;
- }
-
- public final String getSavedPerspectiveContentFramesetCols()
- {
- return savedPerspectiveContentFramesetCols_;
- }
-
- public final void setSavedPerspectiveContentFramesetCols(String cols)
- {
- savedPerspectiveContentFramesetCols_ = cols;
- }
-
- public final String getActionsContainerFramesetRows()
- {
- return actionsContainerFramesetRows_;
- }
-
- public final void setActionsContainerFramesetRows(String rows)
- {
- actionsContainerFramesetRows_ = rows;
- }
-
- public final String getSavedActionsContainerFramesetRows()
- {
- return savedActionsContainerFramesetRows_;
- }
-
- public final void setSavedActionsContainerFramesetRows(String rows)
- {
- savedActionsContainerFramesetRows_ = rows;
- }
-
- public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- return SwitchPerspectiveFromFavoritesAction.getFormActionLink(targetPerspectiveId,forHistory);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java
deleted file mode 100644
index 026c6cbac..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesRestoreDefaultFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesRestoreDefaultFavoritesTool extends ActionTool {
- public FavoritesRestoreDefaultFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return FavoritesRestoreDefaultFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java
deleted file mode 100644
index 6cec4f7ff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.SetDefaultViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesSetDefaultViewTool extends SetDefaultViewTool {
- public FavoritesSetDefaultViewTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, false);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java
deleted file mode 100644
index f76153612..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIBusinessDetailsTool extends FormTool {
-
- public FavoritesUDDIBusinessDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java
deleted file mode 100644
index 2622fcee7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIBusinessFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesUDDIBusinessFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
- FavoritesUDDIBusinessNode favoritesUDDIBusinessNode = new FavoritesUDDIBusinessNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(favoritesUDDIBusinessNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteUDDIBusinessTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_BUSINESS"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java
deleted file mode 100644
index 7cc8a2b17..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIBusinessNode extends FavoritesNavigatorNode {
- public FavoritesUDDIBusinessNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_business_node.gif");
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesUDDIBusinessDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_BUSINESS_DETAILS"));
- new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java
deleted file mode 100644
index b3f6cd6a4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIRegistryDetailsTool extends FormTool {
-
- public FavoritesUDDIRegistryDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java
deleted file mode 100644
index a460a11ea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import java.io.File;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIRegistryFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesUDDIRegistryFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
- TreeElement regElement = (TreeElement)event.getParentElement();
- String imagePath;
- StringBuffer categoriesDirectory = new StringBuffer();
- FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(categoriesDirectory,nodeManager_.getController().getServletEngineStateLocation(),regElement.getName());
- File categoryDirectoryFile = new File(categoriesDirectory.toString());
- String[] categoryFiles = categoryDirectoryFile.list();
- if (categoryFiles != null && categoryFiles.length > 0)
- imagePath = "favorites/images/uddi_registry_cat_node.gif";
- else
- imagePath = "favorites/images/uddi_registry_node.gif";
- FavoritesUDDIRegistryNode favoritesUDDIRegistryNode = new FavoritesUDDIRegistryNode(regElement, nodeManager_, nodeDepth_ + 1, imagePath);
- addChild(favoritesUDDIRegistryNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteUDDIRegistryTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_REGISTRY"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java
deleted file mode 100644
index a8f281314..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIRegistryNode extends FavoritesNavigatorNode {
- public FavoritesUDDIRegistryNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth,String imagePath) {
- super(treeElement, nodeManager, nodeDepth, imagePath);
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesUDDIRegistryDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_REGISTRY_DETAILS"));
- new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java
deleted file mode 100644
index 324f4e000..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIServiceDetailsTool extends FormTool {
-
- public FavoritesUDDIServiceDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesUDDIServiceDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java
deleted file mode 100644
index 3314d2669..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesUDDIServiceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
- FavoritesUDDIServiceNode favoritesUDDIServiceNode = new FavoritesUDDIServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(favoritesUDDIServiceNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteUDDIServiceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java
deleted file mode 100644
index cb92e7b2c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIServiceInterfaceDetailsTool extends FormTool {
-
- public FavoritesUDDIServiceInterfaceDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java
deleted file mode 100644
index 83f667229..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceInterfaceFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesUDDIServiceInterfaceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
- FavoritesUDDIServiceInterfaceNode favoritesUDDIServiceInterfaceNode = new FavoritesUDDIServiceInterfaceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(favoritesUDDIServiceInterfaceNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteUDDIServiceInterfaceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java
deleted file mode 100644
index 0286ccc1b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceInterfaceNode extends FavoritesNavigatorNode {
- public FavoritesUDDIServiceInterfaceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_service_interface_node.gif");
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesUDDIServiceInterfaceDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS"));
- new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java
deleted file mode 100644
index 4eab77cf7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceNode extends FavoritesNavigatorNode {
- public FavoritesUDDIServiceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_service_node.gif");
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesUDDIServiceDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_DETAILS"));
- new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryDetailsTool.java
deleted file mode 100644
index d495724b3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryDetailsTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUserDefUDDIRegistryDetailsTool extends FormTool
-{
- public FavoritesUserDefUDDIRegistryDetailsTool(ToolManager toolManager, String alt)
- {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryFolderNode.java
deleted file mode 100644
index 72fc0ec23..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryFolderNode.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesUserDefUDDIRegistryNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUserDefUDDIRegistryFolderNode extends FavoritesNavigatorFolderNode
-{
- public FavoritesUserDefUDDIRegistryFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth)
- {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE))
- {
- TreeElement regElement = (TreeElement)event.getParentElement();
- String imagePath = "favorites/images/uddi_registry_node.gif";
- FavoritesUserDefUDDIRegistryNode favUserDefUDDIRegistryNode = new FavoritesUserDefUDDIRegistryNode(regElement, nodeManager_, nodeDepth_ + 1, imagePath);
- addChild(favUserDefUDDIRegistryNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE))
- {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_USER_DEF_UDDI_REGISTRY_NODE))
- {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools()
- {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteUserDefUDDIRegistryTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY"));
- }
-
- protected String getLinkActionHref() {
- return SelectFavoritesUserDefUDDIRegistryNodeAction.getActionLink(nodeId_, false);
- }
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryNode.java
deleted file mode 100644
index 1261756a9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUserDefUDDIRegistryNode.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUserDefUDDIRegistryNode extends FavoritesNavigatorNode
-{
- public FavoritesUserDefUDDIRegistryNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath)
- {
- super(treeElement, nodeManager, nodeDepth, imagePath);
- }
-
- protected void initTools()
- {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesUserDefUDDIRegistryDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_USER_DEF_UDDI_REGISTRY_DETAILS"));
- new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java
deleted file mode 100644
index 9d0e52edc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesWSDLDetailsTool extends FormTool {
-
- public FavoritesWSDLDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesWSDLDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java
deleted file mode 100644
index 62f48db74..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSDLServiceFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesWSDLServiceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
- FavoritesWSDLServiceNode favoritesWSDLServiceNode = new FavoritesWSDLServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(favoritesWSDLServiceNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteWSDLServiceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_WSDL_SERVICE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java
deleted file mode 100644
index 2c416a6fd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSDLServiceNode extends FavoritesNavigatorNode {
- public FavoritesWSDLServiceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "favorites/images/wsdl_service_node.gif");
- }
-
- protected void initTools() {
- Controller controller = nodeManager_.getController();
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- new FavoritesWSDLDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_WSDL_DETAILS"));
- new FavoritesImportToWorkbenchTool(toolManager_, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new FavoritesImportToFileSystemTool(toolManager_, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new FavoritesLaunchWebServiceWizardTool(toolManager_, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new FavoritesAddToWSDLPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java
deleted file mode 100644
index a702b81c5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesWSILDetailsTool extends FormTool {
-
- public FavoritesWSILDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "favorites/forms/FavoritesWSILDetailsPage.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java
deleted file mode 100644
index 1df461b0e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSILFolderNode extends FavoritesNavigatorFolderNode {
- public FavoritesWSILFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth);
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(FavoritesModelConstants.REL_WSIL_NODE)) {
- FavoritesWSILNode favoritesWSILNode = new FavoritesWSILNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(favoritesWSILNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_WSIL_NODE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_WSIL_NODE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new ListFavoriteWSILTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_WSIL"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java
deleted file mode 100644
index a9f2d19ad..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSILNode extends FavoritesNavigatorNode {
- public FavoritesWSILNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "favorites/images/wsil_node.gif");
- }
-
- protected void initTools() {
- FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
- new FavoritesWSILDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_WSIL_DETAILS"));
- new AddWSILToWSILPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_WSIL_TO_WSIL_PERSPECTIVE"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java
deleted file mode 100644
index ec1a8ffdd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIBusinessTool extends FormTool {
- public ListFavoriteUDDIBusinessTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_business_enabled.gif", "favorites/images/list_business_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteUDDIBusinessView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java
deleted file mode 100644
index 70cd15290..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIRegistryTool extends FormTool {
- public ListFavoriteUDDIRegistryTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_registry_enabled.gif", "favorites/images/list_registry_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteUDDIRegistryView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java
deleted file mode 100644
index 8aaf24f5d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIServiceInterfaceTool extends FormTool {
- public ListFavoriteUDDIServiceInterfaceTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_service_interface_enabled.gif", "favorites/images/list_service_interface_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java
deleted file mode 100644
index 4f49c0d5b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIServiceTool extends FormTool {
- public ListFavoriteUDDIServiceTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_service_enabled.gif", "favorites/images/list_service_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteUDDIServiceView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUserDefUDDIRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUserDefUDDIRegistryTool.java
deleted file mode 100644
index dab8c9563..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUserDefUDDIRegistryTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUserDefUDDIRegistryTool extends FormTool
-{
- public ListFavoriteUserDefUDDIRegistryTool(ToolManager toolManager, String alt)
- {
- super(toolManager, "favorites/images/list_registry_enabled.gif", "favorites/images/list_registry_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink()
- {
- return "favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java
deleted file mode 100644
index 3bf208154..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteWSDLServiceTool extends FormTool {
- public ListFavoriteWSDLServiceTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_wsdl_enabled.gif", "favorites/images/list_wsdl_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteWSDLServiceView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java
deleted file mode 100644
index 478325bca..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteWSILTool extends FormTool {
- public ListFavoriteWSILTool(ToolManager toolManager, String alt) {
- super(toolManager, "favorites/images/list_WSIL_enabled.gif", "favorites/images/list_WSIL_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "favorites/views/ListFavoriteWSILView.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java
deleted file mode 100644
index e7672fa6a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.RemoveFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class RemoveFavoritesTool extends ActionTool {
-
- public RemoveFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/clear_enabled.gif", "images/clear_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return RemoveFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java
deleted file mode 100644
index 533edd1c7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-
-public abstract class ActionTool extends Tool
-{
- public ActionTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
- {
- super(toolManager,enabledImageLink,highlightedImageLink,alt,ToolTypes.ACTION);
- }
-
- public String getFormLink()
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java
deleted file mode 100644
index c63d445e8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class AddToWSDLPerspectiveTool extends ActionTool
-{
- public AddToWSDLPerspectiveTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"images/add_to_wsdl_perspective_enabled.gif","images/add_to_wsdl_perspective_highlighted.gif",alt);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java
deleted file mode 100644
index 6497c23bc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-// A class used to represent a brower breadcrumb. Each breadcrumb encapsulates
-// a navigated URL.
-public class BreadCrumb
-{
- private int perspectiveId_;
- private String url_;
-
- public BreadCrumb(int perspectiveId,String url)
- {
- perspectiveId_ = perspectiveId;
- url_ = url;
- }
-
- /**
- * Get the URL associated with this breadcrumb.
- * @return String The URL.
- */
- public String getURL()
- {
- return url_;
- }
-
- /**
- * Get the ID of the perspective where this breadcrumb belongs.
- * @return int The perspectiveID as defined in ActionInputs.
- */
- public int getPerspectiveId()
- {
- return perspectiveId_;
- }
-
- /**
- * Test equality between this breadcrumb and another. Both the URLs and perspective
- * IDs must be equal for two breadcrumbs to be equal.
- * @param BreadCrumb A breadcrumb.
- * @return boolean The result of the equality test.
- */
- public boolean equals(BreadCrumb b)
- {
- return ((url_.equals(b.getURL())) && (perspectiveId_ == b.getPerspectiveId()));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java
deleted file mode 100644
index 1a9787f97..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class Controller extends MessageProvider
-{
- private String sessionId_;
- private String stateLocation_;
- private String defaultFavoritesLocation_;
- private String contextPath_;
- private int historyDirection_;
- private History history_;
- private UDDIPerspective uddiPerspective_;
- private WSILPerspective wsilPerspective_;
- private WSDLPerspective wsdlPerspective_;
- private FavoritesPerspective favoritesPerspective_;
- private Perspective currentPerspective_;
- private boolean isPerspectiveContentBlank_;
- private ActionEngine actionEngine;
-
- // WSDL Browser
- private int wsdlType_;
-
- public Controller()
- {
- super("explorer");
- contextPath_ = null;
- stateLocation_ = null;
- history_ = new History();
- uddiPerspective_ = new UDDIPerspective(this);
- wsilPerspective_ = new WSILPerspective(this);
- wsdlPerspective_ = new WSDLPerspective(this);
- favoritesPerspective_ = new FavoritesPerspective(this);
- // Set the default perspective to UDDI.
- currentPerspective_ = uddiPerspective_;
- historyDirection_ = ActionInputs.JUMP_BACK;
- wsdlType_ = ActionInputs.WSDL_TYPE_SERVICE_INTERFACE;
- isPerspectiveContentBlank_ = true;
- actionEngine = new ActionEngine(this);
- }
-
- public final void setStateLocation(String stateLocation)
- {
- stateLocation_ = stateLocation;
- }
-
- public final void setDefaultFavoritesLocation(String defaultFavoritesLocation)
- {
- defaultFavoritesLocation_ = defaultFavoritesLocation;
- }
-
- // This method should be called immediately after the Controller bean is instantiated.
- private final void setContextPath(String contextPath)
- {
- if (contextPath_ == null)
- contextPath_ = contextPath;
- }
-
- public final String getPathWithContext(String relativePath)
- {
- if (relativePath == null)
- return relativePath;
- StringBuffer path = new StringBuffer(relativePath);
- if (contextPath_ != null)
- path.insert(0,'/').insert(0,contextPath_);
- return path.toString();
- }
-
- public final String getSessionId()
- {
- return sessionId_;
- }
-
- public final String getContextPath()
- {
- return contextPath_;
- }
-
- public final String getServletEngineStateLocation() {
- return stateLocation_;
- }
-
- public final String getDefaultFavoritesLocation () {
- return defaultFavoritesLocation_;
- }
-
- public final void init(String sessionId,ServletContext application,String contextPath)
- {
- sessionId_ = sessionId;
- setContextPath(contextPath);
- uddiPerspective_.initPerspective(application);
- wsilPerspective_.initPerspective(application);
- wsdlPerspective_.initPerspective(application);
- favoritesPerspective_.initPerspective(application);
- }
-
- // Setter for the current perspective.
- public final void setCurrentPerspective(int perspective)
- {
- switch (perspective)
- {
- case ActionInputs.PERSPECTIVE_UDDI:
- currentPerspective_ = uddiPerspective_;
- break;
- case ActionInputs.PERSPECTIVE_WSIL:
- currentPerspective_ = wsilPerspective_;
- break;
- case ActionInputs.PERSPECTIVE_WSDL:
- currentPerspective_ = wsdlPerspective_;
- break;
- case ActionInputs.PERSPECTIVE_FAVORITES:
- currentPerspective_ = favoritesPerspective_;
- break;
- }
- }
-
- // Getter for the current perspective.
- public final Perspective getCurrentPerspective()
- {
- return currentPerspective_;
- }
-
- // Getter for the UDDI perspective.
- public final UDDIPerspective getUDDIPerspective()
- {
- return uddiPerspective_;
- }
-
- // Getter for the WSIL perspective.
- public final WSILPerspective getWSILPerspective()
- {
- return wsilPerspective_;
- }
-
- // Getter for the WSDL perspective.
- public final WSDLPerspective getWSDLPerspective()
- {
- return wsdlPerspective_;
- }
-
- // Getter for the Favorites perspective.
- public final FavoritesPerspective getFavoritesPerspective() {
- return favoritesPerspective_;
- }
-
- // Getter for the action engine
- public final ActionEngine getActionEngine() {
- return actionEngine;
- }
-
- public final boolean addToHistory(int perspectiveId,String url)
- {
- if (url != null)
- return history_.addBreadCrumb(new BreadCrumb(perspectiveId,url));
- return false;
- }
-
- // Wrapper for moving forward in the history list and obtaining the breadcrumb.
- public final BreadCrumb forward()
- {
- historyDirection_ = ActionInputs.JUMP_FORWARD;
- return history_.forward();
- }
-
- // Wrapper for moving back in the history list and obtaining the breadcrumb.
- public final BreadCrumb back()
- {
- historyDirection_ = ActionInputs.JUMP_BACK;
- return history_.back();
- }
-
- public final int getHistoryDirection()
- {
- return historyDirection_;
- }
-
- public final void processStaleBreadCrumb()
- {
- history_.removeCurrentBreadCrumb();
- }
-
- // WSDL Browser
- public final void setWSDLType(int wsdlType)
- {
- wsdlType_ = wsdlType;
- }
-
- public final int getWSDLType()
- {
- return wsdlType_;
- }
-
- public final boolean isPerspectiveContentBlank()
- {
- return isPerspectiveContentBlank_;
- }
-
- public final void enablePerspectiveContentBlank(boolean isPerspectiveContentBlank)
- {
- isPerspectiveContentBlank_ = isPerspectiveContentBlank;
- }
-
- public final void dumpHistory()
- {
- history_.dump();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java
deleted file mode 100644
index bba391883..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-public abstract class FolderNode extends Node
-{
- public FolderNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"images/folder_closed.gif");
- }
-
- public String getOpenImagePath()
- {
- return "images/folder_open.gif";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java
deleted file mode 100644
index 9d2f47abd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-
-public abstract class FormTool extends Tool implements FormToolPropertiesInterface
-{
- protected FormToolProperties formToolProperties_;
-
- public FormTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
- {
- super(toolManager,enabledImageLink,highlightedImageLink,alt,ToolTypes.FORM);
- formToolProperties_ = new FormToolProperties();
- initDefaultProperties();
- }
-
- protected void initDefaultProperties()
- {
- }
-
- public final Object getProperty(Object key)
- {
- return formToolProperties_.getProperty(key);
- }
-
- public final void setProperty(Object key,Object value)
- {
- formToolProperties_.setProperty(key,value);
- }
-
- public final void removeProperty(Object key)
- {
- formToolProperties_.removeProperty(key);
- }
-
- public final void clearPropertyTable()
- {
- formToolProperties_.clearPropertyTable();
- }
-
- public final void updatePropertyTable(Hashtable newPropertyTable)
- {
- formToolProperties_.updatePropertyTable(newPropertyTable);
- }
-
- public final void setPropertyTable(Hashtable newPropertyTable)
- {
- formToolProperties_.setPropertyTable(newPropertyTable);
- }
-
- public final void flagError(Object inputKey)
- {
- formToolProperties_.flagError(inputKey);
- }
-
- public final void flagRowError(Object inputKey,int rowNumber)
- {
- formToolProperties_.flagRowError(inputKey,rowNumber);
- }
-
- public final void flagRowError(Object inputKey,Object rowId)
- {
- formToolProperties_.flagRowError(inputKey,rowId);
- }
-
- public final void clearErrors()
- {
- formToolProperties_.clearErrors();
- }
-
- public final boolean isInputValid(Object inputKey)
- {
- return formToolProperties_.isInputValid(inputKey);
- }
-
- public final boolean isRowInputValid(Object inputKey,int rowNumber)
- {
- return formToolProperties_.isRowInputValid(inputKey,String.valueOf(rowNumber));
- }
-
- // The row number may also be represented by a unique object (e.g. UUID)
- public final boolean isRowInputValid(Object inputKey,Object rowId)
- {
- return formToolProperties_.isRowInputValid(inputKey,rowId);
- }
-
- public final String getActionLink()
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java
deleted file mode 100644
index c0cf79c4b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-public class FormToolProperties implements FormToolPropertiesInterface
-{
- private Hashtable propertyTable_;
- private Hashtable errantValues_;
-
- public FormToolProperties()
- {
- propertyTable_ = new Hashtable();
- errantValues_ = new Hashtable();
- }
-
- public final Object getProperty(Object key)
- {
- return propertyTable_.get(key);
- }
-
- public final void setProperty(Object key,Object value)
- {
- propertyTable_.put(key,value);
- }
-
- public final void removeProperty(Object key)
- {
- propertyTable_.remove(key);
- }
-
- public final void clearPropertyTable()
- {
- propertyTable_.clear();
- }
-
- public final void updatePropertyTable(Hashtable newPropertyTable)
- {
- Enumeration e = newPropertyTable.keys();
- while (e.hasMoreElements())
- {
- String key = (String)e.nextElement();
- propertyTable_.put(key,newPropertyTable.get(key));
- }
- }
-
- public final void setPropertyTable(Hashtable newPropertyTable)
- {
- clearPropertyTable();
- updatePropertyTable(newPropertyTable);
- }
-
- public final void flagError(Object inputKey)
- {
- if (isInputValid(inputKey))
- errantValues_.put(inputKey,Boolean.TRUE);
- }
-
- public final void flagRowError(Object inputKey,int rowNumber)
- {
- flagRowError(inputKey,String.valueOf(rowNumber));
- }
-
- public final void flagRowError(Object inputKey,Object rowId)
- {
- Object errorObject = errantValues_.get(inputKey);
- Hashtable rowHash;
- if (errorObject instanceof Hashtable)
- rowHash = (Hashtable)errorObject;
- else
- rowHash = new Hashtable();
- rowHash.put(rowId,Boolean.TRUE);
- errantValues_.put(inputKey,rowHash);
- }
-
- public final void clearErrors()
- {
- errantValues_.clear();
- }
-
- public final boolean isInputValid(Object inputKey)
- {
- return (errantValues_.get(inputKey) == null);
- }
-
- public final boolean isRowInputValid(Object inputKey,int rowNumber)
- {
- return isRowInputValid(inputKey,String.valueOf(rowNumber));
- }
-
- public final boolean isRowInputValid(Object inputKey,Object rowId)
- {
- Hashtable rowHash = (Hashtable)errantValues_.get(inputKey);
- if (rowHash == null)
- return true;
- return (rowHash.get(rowId) == null);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java
deleted file mode 100644
index b307479f5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-
-public abstract interface FormToolPropertiesInterface
-{
- // Getter and Setter for a property.
- public abstract Object getProperty(Object key);
- public abstract void setProperty(Object key,Object value);
- public abstract void removeProperty(Object key);
-
- // Property table operators.
- public abstract void clearPropertyTable();
- public abstract void updatePropertyTable(Hashtable propertyTable);
- public abstract void setPropertyTable(Hashtable propertyTable);
-
- // Error handling.
- public abstract void flagError(Object inputKey);
- public abstract void flagRowError(Object inputKey,int rowNumber);
- public abstract void flagRowError(Object inputKey,Object rowId);
- public abstract void clearErrors();
- public abstract boolean isInputValid(Object inputKey);
- public abstract boolean isRowInputValid(Object inputKey,int rowNumber);
- public abstract boolean isRowInputValid(Object inputKey,Object rowId);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java
deleted file mode 100644
index a802d45be..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Vector;
-
-// A class representing a Vector of breadcrumbs. A position index is used
-// to navigate through the data structure.
-public class History
-{
- private Vector items_;
- private int position_;
-
- public History()
- {
- items_ = new Vector();
- position_ = -1;
- }
-
- // Add a new breadcrumb to the history list. When adding a new breadcrumb
- // within the current list, all breadcrumbs after the newly added one are
- // removed.
- public boolean addBreadCrumb(BreadCrumb b)
- {
- int numberOfItems = items_.size();
- if (numberOfItems == 0)
- {
- position_++;
- items_.addElement(b);
- return true;
- }
- else
- {
- BreadCrumb currentBreadCrumb = (BreadCrumb)items_.elementAt(position_);
- if (!currentBreadCrumb.equals(b))
- {
- position_++;
- items_.insertElementAt(b,position_);
- for (int i=items_.size()-1;i>position_;i--)
- items_.removeElementAt(i);
- return true;
- }
- }
- return false;
- }
-
- // Move forward within the history list and obtain the breadcrumb.
- public BreadCrumb forward()
- {
- if (position_ < items_.size()-1)
- {
- position_++;
- BreadCrumb b = (BreadCrumb)items_.elementAt(position_);
- return b;
- }
- return null;
- }
-
- // Move back within the history list and obtain the breadcrumb.
- public BreadCrumb back()
- {
- if (position_ > 0)
- {
- position_--;
- BreadCrumb b = (BreadCrumb)items_.elementAt(position_);
- return b;
- }
- return null;
- }
-
- public void removeCurrentBreadCrumb()
- {
- items_.removeElementAt(position_);
- if (position_ > items_.size()-1)
- position_--;
- }
-
- public void dump()
- {
- for (int i=0;i<items_.size();i++)
- {
- items_.elementAt(i);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java
deleted file mode 100644
index b391bc337..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class ImportToFileSystemTool extends ActionTool {
- public ImportToFileSystemTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/import_fs_enabled.gif", "images/import_fs_highlighted.gif", alt);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java
deleted file mode 100644
index 08c3eeea8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class ImportToWorkbenchTool extends FormTool {
- public ImportToWorkbenchTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/import_to_workbench_enabled.gif", "images/import_to_workbench_highlighted.gif", alt);
- }
-
- public String getFormLink() {
- return "forms/ImportToWorkbenchForm.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java
deleted file mode 100644
index 2c25b832a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class LaunchOptionsManager
-{
- private static LaunchOptionsManager instance_;
-
- private Hashtable optionsTable_;
-
- private LaunchOptionsManager()
- {
- optionsTable_ = new Hashtable();
- }
-
- public static LaunchOptionsManager getInstance()
- {
- if (instance_ == null)
- instance_ = new LaunchOptionsManager();
- return instance_;
- }
-
- public synchronized void manage(String key, Object value, ServletContext application)
- {
- if (value instanceof String)
- manageSession(key, (String)value, application);
- else if (value instanceof Hashtable)
- manageOptions(key, (Hashtable)value, application);
- }
-
- private void manageSession(String key, String sessionId, ServletContext application)
- {
- Object obj = optionsTable_.remove(key);
- if (obj != null && (obj instanceof Hashtable))
- loadOptions(sessionId, (Hashtable)obj, application);
- else
- optionsTable_.put(key, sessionId);
- }
-
- private void manageOptions(String key, Hashtable options, ServletContext application)
- {
- Object obj = optionsTable_.remove(key);
- if (obj != null && (obj instanceof String))
- loadOptions((String)obj, options, application);
- else
- optionsTable_.put(key, options);
- }
-
- private void loadOptions(String sessionId, Hashtable options, ServletContext application)
- {
- HttpSession httpSession = (HttpSession)application.getAttribute(sessionId);
- if (httpSession != null)
- {
- Controller controller = (Controller)httpSession.getAttribute("controller");
- String[] stateLocations = (String[])options.get(LaunchOptions.STATE_LOCATION);
- String[] defaultFavoritesLocations = (String[])options.get(LaunchOptions.DEFAULT_FAVORITES_LOCATION);
- String[] inquiryURLs = (String[])options.get(LaunchOptions.INQUIRY_URL);
- String[] publishURLs = (String[])options.get(LaunchOptions.PUBLISH_URL);
- String[] serviceNames = (String[])options.get(LaunchOptions.SERVICE_NAME);
- String[] serviceKeys = (String[])options.get(LaunchOptions.SERVICE_KEY);
- String[] wsdlURLs = (String[])options.get(LaunchOptions.WSDL_URL);
- String[] endpoints = (String[])options.get(LaunchOptions.WEB_SERVICE_ENDPOINT);
- String[] serviceQNameStrings = (String[])options.get(LaunchOptions.SERVICE_QNAME_STRING);
- String[] bindingNameStrings = (String[])options.get(LaunchOptions.BINDING_NAME_STRING);
- String stateLocation = (stateLocations == null || stateLocations.length == 0) ? null : stateLocations[0];
- controller.setStateLocation(stateLocation);
- String defaultFavoritesLocation = (defaultFavoritesLocations == null || defaultFavoritesLocations.length == 0) ? null : defaultFavoritesLocations[0];
- controller.setDefaultFavoritesLocation(defaultFavoritesLocation);
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- uddiPerspective.preloadUDDIRegistries(inquiryURLs, publishURLs);
- uddiPerspective.preloadServices(inquiryURLs,serviceNames,serviceKeys);
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- wsdlPerspective.preloadWSDL(wsdlURLs);
- wsdlPerspective.preloadEndpoints(wsdlURLs, endpoints);
- wsdlPerspective.preselectServiceOrBinding(wsdlURLs,serviceQNameStrings,bindingNameStrings);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java
deleted file mode 100644
index d5b3d3da9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class LaunchWebServiceWizardTool extends FormTool {
- public LaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/launch_wswizard_enabled.gif", "images/launch_wswizard_highlighted.gif", alt);
- }
-
- public String getFormLink() {
- return "forms/LaunchWebServiceWizardForm.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java
deleted file mode 100644
index 53a5d52cf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
-* An message bundle is a collection of messages drawn from some
-* set of properties.
-*/
-public class MessageBundle
-{
- private ResourceBundle fResourceBundle;
-
- /**
- * Constructs a new MessageBundle from the given ResourceBundle.
- */
- public MessageBundle ( ResourceBundle resourceBundle )
- {
- fResourceBundle = resourceBundle;
- }
-
- /**
- * Returns the message identified by messageId.
- * @param messageId The message ID.
- * @return String The message text.
- */
- public String getMessage ( String messageId )
- {
- try
- {
- return fResourceBundle.getString(messageId);
- }
- catch (MissingResourceException e)
- {
- return messageId;
- }
- }
-
- /**
- * Returns the message identified by messageId.
- * @param messageId The message ID.
- * @param sub A substitution value for "%1" in the message.
- * @return String The message text.
- */
- public String getMessage ( String messageId, String sub )
- {
- String[] s = {sub};
- return getMessage(messageId,s);
- }
-
- /**
- * Returns the message identified by messageId.
- * @param messageId The message ID.
- * @param sub Substitution values for "%1..%n" (sub[0]..sub[n-1]) in
- * the message.
- * @return String The message text.
- */
- public String getMessage ( String messageId, String[] sub )
- {
- String m = getMessage(messageId);
- int len = m.length();
- int max = sub.length;
- StringBuffer b = new StringBuffer();
- int pos = 0;
- while (pos >= 0)
- {
- int pct = m.indexOf('%',pos);
- if (pct >= 0)
- {
- b.append(m.substring(pos,pct));
- pos = pct + 1;
- if (pos < len)
- {
- char d = m.charAt(pos);
- if (Character.isDigit(d) && d != '0')
- {
- int v = Integer.parseInt(new Character(d).toString());
- if (v <= max)
- {
- b.append(sub[v-1]);
- }
- else
- {
- b.append('?');
- }
- pos++;
- }
- else
- {
- b.append('%');
- b.append(d);
- pos++;
- }
- }
- else
- {
- b.append('%');
- pos = -1;
- }
- }
- else
- {
- b.append(m.substring(pos));
- pos = -1;
- }
- }
- return b.toString();
- }
-
- public ResourceBundle getResourceBundle()
- {
- return fResourceBundle;
- }
-}
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java
deleted file mode 100644
index a052e4d4b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-// A Class which provides String messages.
-public class MessageProvider
-{
- protected MessageBundle messageBundle_;
- private String messageProviderName_;
-
- public MessageProvider(String messageBundleFileName)
- {
- try
- {
- // Load the message bundle from the WEB-INF\classes subdirectory.
- messageProviderName_ = messageBundleFileName;
- messageBundle_ = new MessageBundle(ResourceBundle.getBundle(messageBundleFileName));
- }
- catch (MissingResourceException e)
- {
- System.err.println("Could not load "+messageBundleFileName);
- e.printStackTrace();
- }
- }
-
- public String getMessage(String messageId)
- {
- return messageBundle_.getMessage(messageId);
- }
-
- public String getMessage(String messageId,String sub)
- {
- return messageBundle_.getMessage(messageId,sub);
- }
-
- public String getMessage(String messageId,String[] sub)
- {
- return messageBundle_.getMessage(messageId,sub);
- }
-
- public String getMessageProviderName()
- {
- return messageProviderName_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java
deleted file mode 100644
index 73808efbc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-
-public class MessageQueue
-{
- protected Vector messageList_;
-
- public MessageQueue()
- {
- messageList_ = new Vector();
- }
-
- public void addMessage(String message)
- {
- messageList_.addElement(message);
- }
-
- public String getMessagesFromList()
- {
- StringBuffer messages = new StringBuffer();
-
- if (messageList_.size()==0)
- return "";
-
- Enumeration e = messageList_.elements();
- while (e.hasMoreElements())
- {
- String thisMessage = (String)e.nextElement();
- messages.append(thisMessage);
- messages.append(HTMLUtils.LINE_SEPARATOR);
- }
- messageList_.removeAllElements();
- return messages.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java
deleted file mode 100644
index dba53b40c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080324 186456 makandre@ca.ibm.com - Andrew Mak
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-
-public abstract class Node
-{
- protected TreeElement element_;
- protected NodeManager nodeManager_;
- protected int nodeId_;
- protected int nodeDepth_;
- protected String imagePath_;
- protected boolean isOpen_;
- protected Vector childNodes_;
- protected ToolManager toolManager_;
- protected Node parent_;
- private String anchorName_;
- private int viewId_;
-
- public Node(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
- {
- element_ = element;
- nodeManager_ = nodeManager;
- nodeId_ = nodeManager.addToNodeTable(this);
- nodeDepth_ = nodeDepth;
- Controller controller = nodeManager_.getController();
- if (imagePath == null)
- imagePath_ = controller.getPathWithContext(NodeManager.PATH_SPACE);
- else
- imagePath_ = imagePath;
- isOpen_ = true;
- childNodes_ = new Vector();
- toolManager_ = new ToolManager(this);
- initTools();
- anchorName_ = (new StringBuffer("action")).append(nodeId_).toString();
- parent_ = null;
- viewId_ = ActionInputs.VIEWID_DEFAULT;
- }
-
- /**
- * Returns the TreeElement associated with this node.
- * @return TreeElement The element associated with this node.
- */
- public TreeElement getTreeElement()
- {
- return element_;
- }
-
- /**
- * Returns the name of the node.
- * @return String
- */
- public String getNodeName()
- {
- return element_.getName();
- }
-
- /**
- * Returns the NodeManager managing this node.
- * @return NodeManager
- */
- public NodeManager getNodeManager()
- {
- return nodeManager_;
- }
-
- /**
- * Returns the id of this node.
- * @return int
- */
- public int getNodeId()
- {
- return nodeId_;
- }
-
- /**
- * Returns the depth in the tree of this node relative to the root node
- * @return int
- */
- public int getNodeDepth()
- {
- return nodeDepth_;
- }
-
- /**
- * Set the path of the image representing this class of Node.
- * @param String The path.
- */
- public void setImagePath(String path)
- {
- imagePath_ = path;
- }
-
- /**
- * Returns true if the children of this node are visible. Returns false
- * if they are not.
- * @return boolean
- */
- public boolean isOpen()
- {
- return isOpen_;
- }
-
- public boolean isVisible()
- {
- Node parentNode = parent_;
- while (parentNode != null)
- {
- if (!parentNode.isOpen())
- return false;
- parentNode = parentNode.getParent();
- }
- return true;
- }
-
- /**
- * Sets the visibility of this node's children to the specified value.
- * Updates the NodeManager's record of the maximum depth visible in the tree.
- * @param boolean
- */
- public final void setVisibilityOfChildren(boolean open)
- {
- isOpen_ = open;
- nodeManager_.updateMaxDepthVisible();
- }
-
- /**
- * Gets the maximum depth displayed in this node's branch of the tree
- * Used by NodeManager for html display purposes.
- * @return int
- */
- public int getMaxDepthVisible()
- {
- if (!isOpen_)
- return nodeDepth_;
- else
- {
- int currentDepth = nodeDepth_;
- Enumeration e = childNodes_.elements();
- while (e.hasMoreElements())
- {
- Node thisNode = (Node)e.nextElement();
- int depth = thisNode.getMaxDepthVisible();
- if (depth>currentDepth)
- currentDepth=depth;
- }
- return currentDepth;
- }
- }
-
- public final void setParent(Node node)
- {
- parent_ = node;
- }
-
- public final Node getParent()
- {
- return parent_;
- }
-
- public final void setViewId(int viewId)
- {
- viewId_ = viewId;
- }
-
- public final int getViewId()
- {
- return viewId_;
- }
-
- public final int getViewToolId()
- {
- ToolManager viewToolManager = getViewToolManager();
- if (viewToolManager != null)
- return viewToolManager.getSelectedToolId();
- return ActionInputs.VIEWTOOLID_DEFAULT;
- }
-
- /**
- * Adds the specified node as a child of this node.
- * @param Node The child being added.
- * @return boolean Always true.
- */
- public final boolean addChild(Node childNode)
- {
- childNode.setParent(this);
- childNodes_.addElement(childNode);
- nodeManager_.updateMaxDepthVisible();
- return true;
- }
-
- /**
- * Returns the child nodes of this node. If this node has no children, an
- * empty vector is returned.
- * @return Vector
- */
- public Vector getChildNodes()
- {
- return childNodes_;
- }
-
- public final Node getChildNode(TreeElement element)
- {
- Enumeration e = childNodes_.elements();
- while (e.hasMoreElements())
- {
- Node presentNode = (Node)e.nextElement();
- if (presentNode.getTreeElement() == element)
- return presentNode;
- }
- return null;
- }
-
- public final void removeChildNodes(boolean isEntry)
- {
- int numberOfChildNodes = childNodes_.size();
- for (int i=numberOfChildNodes-1;i>=0;i--)
- {
- Node childNode = (Node)childNodes_.elementAt(i);
- childNode.removeChildNodes(false);
- nodeManager_.removeFromNodeTable(childNode.getNodeId());
- }
- if (numberOfChildNodes > 0)
- {
- childNodes_.removeAllElements();
- if (isEntry)
- nodeManager_.updateMaxDepthVisible();
- }
- }
-
- public final boolean removeChildNode(TreeElement element)
- {
- Node childNode = getChildNode(element);
- if (childNode != null)
- {
- int childNodeId = childNode.getNodeId();
- if (nodeManager_.getSelectedNodeId() == childNodeId)
- nodeManager_.setSelectedNodeId(nodeId_);
- childNodes_.removeElement(childNode);
- nodeManager_.removeFromNodeTable(childNodeId);
- nodeManager_.updateMaxDepthVisible();
- return true;
- }
- return false;
- }
-
- /**
- * Get the name of the HTML anchor associated with this node.
- * @return String The name of the anchor.
- */
- public String getAnchorName()
- {
- return anchorName_;
- }
-
- public ToolManager getToolManager()
- {
- return toolManager_;
- }
-
- public ToolManager getViewToolManager()
- {
- if (viewId_ != ActionInputs.VIEWID_DEFAULT)
- {
- ViewTool viewTool = (ViewTool)toolManager_.getSelectedTool();
- return viewTool.getToolManager(viewId_);
- }
- return null;
- }
-
- public ToolManager getCurrentToolManager()
- {
- ToolManager toolManager = getViewToolManager();
- if (toolManager == null)
- toolManager = toolManager_;
- return toolManager;
- }
-
- protected abstract void initTools();
-
- protected abstract String getToggleNodeActionHref();
-
- protected String getToggleNodeActionTarget()
- {
- return FrameNames.PERSPECTIVE_WORKAREA;
- }
-
- protected void addToggle(HttpServletResponse response,StringBuffer treeView,boolean isLastChild)
- {
- if (nodeDepth_ != 1)
- {
- treeView.append(" <td align=\"left\" width=16 height=16 nowrap>");
- String toggleImageTag;
- if (childNodes_.size() > 0)
- {
- // <a href="..." target="...">toggleImageTag</a>
- String href = nodeManager_.getController().getPathWithContext(getToggleNodeActionHref());
- if (isOpen_)
- {
- String toggleAlt = nodeManager_.getController().getMessage("ALT_CLOSE");
- if (isLastChild)
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_MINUS_LAST),toggleAlt,"16","16",null);
- else
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_MINUS_NOTLAST),toggleAlt,"16","16",null);
- }
- else
- {
- String toggleAlt = nodeManager_.getController().getMessage("ALT_OPEN");
- if (isLastChild)
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_PLUS_LAST),toggleAlt,"16","16",null);
- else
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_PLUS_NOTLAST),toggleAlt,"16","16",null);
- }
- String linkTag = HTMLUtils.getHTMLLinkTag(response,href,getToggleNodeActionTarget(),String.valueOf(nodeId_),toggleImageTag,null);
- treeView.append(linkTag);
- }
- else
- {
- // <img...>
- if (isLastChild)
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE_LAST),"","16","16",null);
- else
- toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE_NOTLAST),"","16","16",null);
- treeView.append(toggleImageTag);
- }
- treeView.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
- }
- }
-
- protected abstract String getLinkActionHref();
-
- protected String getLinkActionTarget()
- {
- return FrameNames.PERSPECTIVE_WORKAREA;
- }
-
- public String getOpenImagePath()
- {
- return imagePath_;
- }
-
- public String getClosedImagePath()
- {
- return imagePath_;
- }
-
- protected void addHTMLLabel(HttpServletResponse response,StringBuffer treeView,boolean isLastChild)
- {
- // <a href="..." target="..." onClick="selectNode('...')"><img...></a>
- Hashtable additionalAttributes = new Hashtable();
- additionalAttributes.put("name",anchorName_);
- String imagePath = (nodeManager_.getSelectedNodeId() == nodeId_)?getOpenImagePath():getClosedImagePath();
-
- String imageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(imagePath),getNodeName(),"16","16",additionalAttributes);
- String baseHref = getLinkActionHref();
- String href = ((baseHref == null)?baseHref:nodeManager_.getController().getPathWithContext(baseHref));
- String target = getLinkActionTarget();
- additionalAttributes.clear();
-
- treeView.append(" <td align=\"left\" width=16 height=16 nowrap>");
- if (href != null)
- treeView.append(HTMLUtils.getHTMLLinkTag(response,href,target,null,imageTag,additionalAttributes));
- else
- treeView.append(imageTag);
- treeView.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
- treeView.append(" <td align=\"left\" width=3 height=10 nowrap>").append(HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_SPACE),"","3","10",null)).append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-
- // <a name="..." href="..." target="...">label</a>
- treeView.append(" <td align=\"left\" nowrap>").append(HTMLUtils.LINE_SEPARATOR);
- treeView.append(" ");
- if (href != null)
- {
- String textAnchorClass;
- if (nodeManager_.getSelectedNodeId() == nodeId_)
- textAnchorClass="selectedTextAnchor";
- else
- textAnchorClass="unselectedTextAnchor";
- additionalAttributes.put("class",textAnchorClass);
- treeView.append(HTMLUtils.getHTMLLinkTag(response,href,target,anchorName_,getNodeName(),additionalAttributes));
- }
- else
- treeView.append("<strong>").append(getNodeName()).append("</strong>");
- treeView.append(HTMLUtils.LINE_SEPARATOR).append(" </td>").append(HTMLUtils.LINE_SEPARATOR);
- }
-
- public void renderNode(HttpServletResponse response,StringBuffer treeView,String prefixColumns,boolean isLastChild)
- {
- String space_16x16 = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_SPACE),"","16","16",null);
- String line_16x16 = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE),"","16","16",null);
-
- // Use border=1 to help with debugging.
- treeView.append("<table cellspacing=0 cellpadding=0 border=0>").append(HTMLUtils.LINE_SEPARATOR);
- treeView.append(" <tr>").append(HTMLUtils.LINE_SEPARATOR);
- treeView.append(" <td align=\"left\" width=16 height=16 nowrap>").append(space_16x16).append("</td>").append(HTMLUtils.LINE_SEPARATOR);
- StringBuffer newPrefixColumns = new StringBuffer(prefixColumns);
- if (nodeDepth_ >= 2)
- {
- if (prefixColumns.length() > 0)
- treeView.append(prefixColumns).append(HTMLUtils.LINE_SEPARATOR);
- // generate a new prefix columns.
- newPrefixColumns.append(" <td align=\"left\" width=16 height=16 nowrap>");
- if (isLastChild)
- newPrefixColumns.append(space_16x16);
- else
- newPrefixColumns.append(line_16x16);
- newPrefixColumns.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
- }
- addToggle(response,treeView,isLastChild);
- addHTMLLabel(response,treeView,isLastChild);
- treeView.append(" </tr>").append(HTMLUtils.LINE_SEPARATOR);
- treeView.append("</table>").append(HTMLUtils.LINE_SEPARATOR);
- int numberOfChildNodes = childNodes_.size();
- if (numberOfChildNodes > 0)
- {
- if (isOpen_)
- {
- for (int i=0;i<numberOfChildNodes-1;i++)
- {
- Node childNode = (Node)childNodes_.elementAt(i);
- childNode.renderNode(response,treeView,newPrefixColumns.toString(),false);
- }
- Node lastChildNode = (Node)childNodes_.elementAt(numberOfChildNodes-1);
- lastChildNode.renderNode(response,treeView,newPrefixColumns.toString(),true);
- }
- }
- }
-
- // For sorting purposes.
- public final String toString()
- {
- return getNodeName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java
deleted file mode 100644
index b1d48c639..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.servlet.http.HttpServletResponse;
-
-public class NodeManager
-{
- // paths to icon images
- public static final String PATH_PLUS_NOTLAST = "images/plus_notlast.gif";
- public static final String PATH_PLUS_LAST = "images/plus_last.gif";
- public static final String PATH_MINUS_NOTLAST = "images/minus_notlast.gif";
- public static final String PATH_MINUS_LAST = "images/minus_last.gif";
- public static final String PATH_LINE = "images/line.gif";
- public static final String PATH_LINE_NOTLAST = "images/line_notlast.gif";
- public static final String PATH_LINE_LAST = "images/line_last.gif";
- public static final String PATH_SPACE = "images/space.gif";
-
- private Controller controller_;
- private Node rootNode_;
- private Hashtable nodeTable_;
- private int focusedNodeId_;
- private int selectedNodeId_;
- private int previousSelectedNodeId_;
- private int maxDepthVisible_;
- private int nextId_;
-
- public NodeManager(Controller controller)
- {
- controller_ = controller;
- rootNode_ = null;
- nodeTable_ = new Hashtable();
- focusedNodeId_ = -1;
- selectedNodeId_ = -1;
- previousSelectedNodeId_ = -1;
- maxDepthVisible_ = 1;
- nextId_ = 0;
- }
-
- /**
- * Hook for the controller.
- * @return Controller The perspective controller.
- */
- public Controller getController()
- {
- return controller_;
- }
-
- /**
- * Sets the root node of the tree.
- * @param rootNode The node being designated as the root node.
- */
- public void setRootNode(Node rootNode)
- {
- rootNode_ = rootNode;
- }
-
- /**
- * Returns the root node of the tree managed by this NodeManager.
- * @return Node The root node.
- */
- public Node getRootNode()
- {
- return rootNode_;
- }
-
- /**
- * @param Integer The id of the node being added.
- * @param Node The node being added.
- * @return The nodeId assigned to this node.
- */
- public int addToNodeTable(Node node)
- {
- int assignedNodeId = nextId_;
- nodeTable_.put(String.valueOf(assignedNodeId),node);
- nextId_++;
- return assignedNodeId;
- }
-
- public void removeFromNodeTable(int nodeId)
- {
- Vector nodesToRemove = new Vector();
- Node node = getNode(nodeId);
- gatherNodesToRemove(nodesToRemove, node);
- for (Iterator it = nodesToRemove.iterator(); it.hasNext();) {
- nodeTable_.remove(String.valueOf(((Node)it.next()).getNodeId()));
- }
- }
-
- private void gatherNodesToRemove(Vector nodesToRemove, Node node) {
- if (node != null) {
- nodesToRemove.add(node);
- Vector childNodes = node.getChildNodes();
- for (Iterator it = childNodes.iterator(); it.hasNext();) {
- gatherNodesToRemove(nodesToRemove, (Node)it.next());
- }
- }
- }
-
- /**
- * Returns the depth of the deepest visible node in the tree.
- * @return int
- */
- public int getMaxDepthVisible()
- {
- return maxDepthVisible_;
- }
-
- /**
- * Updates the depth of the deepest visible node in the tree. Nodes
- * must call this when the visibility of their children changes.
- * (e.g. expand/collapse of a parent node).
- */
- public void updateMaxDepthVisible()
- {
- if (rootNode_ != null)
- maxDepthVisible_ = rootNode_.getMaxDepthVisible();
- }
-
- /**
- * Returns the next available id for a newly created node.
- * @return int
- */
- public int getNextNodeId()
- {
- return nextId_;
- }
-
- /**
- * Returns the id of the currently focused node in the tree. A node
- * becomes focused when any of the following events occur:
- * 1) The node's icon or image are selected by a user.
- * 2) The node's expand/collapse icon is clicked.
- * 3) Programmatically set by the programmer.
- * The treeview will always scroll to the current focused node when loaded.
- * @return int The id.
- */
- public int getFocusedNodeId()
- {
- return focusedNodeId_;
- }
-
- /**
- * Allows modification of the focused node.
- * @param int The id of the node that is in focus.
- */
- public void setFocusedNodeId(int nodeId)
- {
- focusedNodeId_ = nodeId;
- }
-
- public Node getFocusedNode()
- {
- return getNode(focusedNodeId_);
- }
-
- /**
- * Returns the id of the currently selected node in the tree.
- * @return int The id.
- */
- public int getSelectedNodeId()
- {
- return selectedNodeId_;
- }
-
- public Node getSelectedNode()
- {
- return getNode(selectedNodeId_);
- }
-
- /**
- * Retrieve a reference to a Node in this manager's node table.
- * @return Node The node.
- */
- public Node getNode(int nodeId)
- {
- return (Node)nodeTable_.get(String.valueOf(nodeId));
- }
-
- /**
- * Allows modification of the selected Node. Note that setting a node to become
- * selected automatically makes it the focused node. However, this is only a one
- * way relationship.
- * @param int The id of the node that is being selected.
- */
- public void setSelectedNodeId(int nodeId)
- {
- previousSelectedNodeId_ = selectedNodeId_;
- selectedNodeId_ = nodeId;
- setFocusedNodeId(selectedNodeId_);
- }
-
- public int getPreviousSelectedNodeId()
- {
- return previousSelectedNodeId_;
- }
-
- public Node getPreviousSelectedNode()
- {
- return (Node)nodeTable_.get(String.valueOf(previousSelectedNodeId_));
- }
-
- /**
- * Render the HTML tree view for this node.
- * @param HttpServletResponse For encoding URLs.
- * @return String The HTML representing the tree view.
- */
- public String renderTreeView(HttpServletResponse response)
- {
- StringBuffer treeView = new StringBuffer();
- rootNode_.renderNode(response,treeView,"",false);
- return treeView.toString();
- }
-
- /**
- * Make the provided node is visible by ensuring that its ancestors are visible.
- * @param Node The node to be made visible.
- * @return boolean Indicator for whether or not the treeview needs refreshing (i.e. an ancestor was not visible).
- */
- public final boolean makeNodeVisible(Node node)
- {
- boolean requiresTreeViewRefresh = false;
- while ((node = node.getParent()) != null)
- {
- if (!node.isOpen())
- {
- requiresTreeViewRefresh = true;
- node.setVisibilityOfChildren(true);
- }
- }
- return requiresTreeViewRefresh;
- }
-
- /**
- * Make the currently selected node visible by ensuring that its ancestors are visible.
- */
- public final boolean makeSelectedNodeVisible()
- {
- return makeNodeVisible(getSelectedNode());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java
deleted file mode 100644
index 855f14e71..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import javax.servlet.ServletContext;
-
-public abstract class Perspective extends MessageProvider
-{
- protected Controller controller_;
- protected MessageQueue messageQueue_;
-
- public Perspective(String messageBundleFileName,Controller controller)
- {
- super(messageBundleFileName);
- controller_ = controller;
- messageQueue_ = new MessageQueue();
- }
-
- public MessageQueue getMessageQueue()
- {
- return messageQueue_;
- }
-
- public Controller getController()
- {
- return controller_;
- }
-
- public abstract String getPanesFile();
- public abstract String getFramesetsFile();
- public abstract String getProcessFramesetsForm();
-
- public abstract String getTreeContentVar();
- public abstract String getTreeContentPage();
- public abstract String getPropertiesContainerVar();
- public abstract String getPropertiesContainerPage();
- public abstract String getStatusContentVar();
- public abstract String getStatusContentPage();
-
- public abstract String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory);
- public abstract String getPerspectiveContentPage();
- public abstract int getPerspectiveId();
-
- // This should only be called after the perspective has been successfully instantiated.
- public abstract void initPerspective(ServletContext application);
-
- // Node manager for the navigator/tree content page
- public abstract NodeManager getNodeManager();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java
deleted file mode 100644
index 07e5e4a1b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public class SectionHeaderInfo
-{
- private String containerId_;
- private boolean dynamic_;
- private Object otherProperties_;
-
- public SectionHeaderInfo()
- {
- clear();
- }
-
- public final void clear()
- {
- containerId_ = "";
- dynamic_ = true;
- otherProperties_ = null;
- }
-
- public final void setContainerId(String containerId)
- {
- containerId_ = containerId;
- }
-
- public final String getContainerId()
- {
- return containerId_;
- }
-
- public final void enableDynamic(boolean isEnabled)
- {
- dynamic_ = isEnabled;
- }
-
- public final boolean isDynamic()
- {
- return dynamic_;
- }
-
- public final void setOtherProperties(Object object)
- {
- otherProperties_ = object;
- }
-
- public final Object getOtherProperties()
- {
- return otherProperties_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java
deleted file mode 100644
index 7c91b950c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class SetDefaultViewTool extends ActionTool
-{
- public SetDefaultViewTool(ToolManager viewToolManager,String alt)
- {
- super(viewToolManager,"images/top_enabled.gif","images/top_highlighted.gif",alt);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java
deleted file mode 100644
index e8bfb9954..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.FrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-
-// A class for representing toolbar tools.
-public abstract class Tool
-{
- protected ToolManager toolManager_;
- private String enabledImageLink_;
- private String highlightedImageLink_;
- private String alt_;
- protected int toolId_;
- protected byte toolType_;
-
- public Tool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt,byte toolType)
- {
- toolManager_ = toolManager;
- enabledImageLink_ = enabledImageLink;
- highlightedImageLink_ = highlightedImageLink;
- alt_ = alt;
- toolId_ = toolManager_.addTool(this);
- toolType_ = toolType;
- }
-
- public abstract String getSelectToolActionHref(boolean forHistory);
-
- public String getSelectToolActionTarget()
- {
- return FrameNames.PERSPECTIVE_WORKAREA;
- }
-
- private final void generateOnMouseValue(StringBuffer value,HttpServletResponse response,String fullImageLink)
- {
- value.append("src='").append(response.encodeURL(fullImageLink)).append('\'');
- }
-
- public String renderTool(HttpServletResponse response,Controller controller)
- {
- Hashtable jsImageProperties = new Hashtable();
- StringBuffer propertyValue = new StringBuffer();
- String fullEnabledImageLink = controller.getPathWithContext(enabledImageLink_);
- generateOnMouseValue(propertyValue,response,fullEnabledImageLink);
- int propertyValueLength = propertyValue.length();
- jsImageProperties.put("class","normal");
- jsImageProperties.put("onMouseOut",propertyValue.append(";mouseout(this)").toString());
- propertyValue.delete(propertyValueLength,propertyValue.length());
- jsImageProperties.put("onMouseUp",propertyValue.append(";mouseup(this)").toString());
- propertyValue.setLength(0);
- generateOnMouseValue(propertyValue,response,controller.getPathWithContext(highlightedImageLink_));
- propertyValueLength = propertyValue.length();
- jsImageProperties.put("onMouseOver",propertyValue.append(";mouseover(this)").toString());
- propertyValue.delete(propertyValueLength,propertyValue.length());
- jsImageProperties.put("onMouseDOwn",propertyValue.append(";mousedown(this)").toString());
-
- String imageTag = HTMLUtils.getHTMLImageTag(response,fullEnabledImageLink,alt_,"16","16",jsImageProperties);
- return HTMLUtils.getHTMLLinkTag(response,controller.getPathWithContext(getSelectToolActionHref(false)),getSelectToolActionTarget(),null,imageTag,null);
- }
-
- public final ToolManager getToolManager()
- {
- return toolManager_;
- }
-
- public final int getToolId()
- {
- return toolId_;
- }
-
- public final byte getToolType()
- {
- return toolType_;
- }
-
- public final String getEnabledImageLink()
- {
- return enabledImageLink_;
- }
-
- public final String getHighlightedImageLink()
- {
- return highlightedImageLink_;
- }
-
- public final String getAltText()
- {
- return alt_;
- }
-
- public final void setAltText(String alt)
- {
- alt_ = alt;
- }
-
- public abstract String getFormLink();
- public abstract String getActionLink();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java
deleted file mode 100644
index 5aa91a64c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.List;
-import java.util.Vector;
-
-public class ToolManager
-{
- private Vector tools_;
- private int selectedToolId_;
- private Node node_;
-
- public ToolManager(Node node)
- {
- tools_ = new Vector();
- selectedToolId_ = 0;
- node_ = node;
- }
-
- public final int getSelectedToolId()
- {
- return selectedToolId_;
- }
-
- public final int setSelectedToolId(int toolId)
- {
- if (toolId >= 0 && toolId < tools_.size())
- selectedToolId_ = toolId;
- return selectedToolId_;
- }
-
- public final int addTool(Tool tool)
- {
- tools_.addElement(tool);
- return tools_.size()-1;
- }
-
- public final Tool getTool(int toolId)
- {
- if (toolId >=0 && toolId < getNumberOfTools())
- return (Tool)tools_.elementAt(toolId);
- return null;
- }
-
- public final List getTools()
- {
- return tools_;
- }
-
- public final Tool getSelectedTool()
- {
- if (selectedToolId_ >=0 && selectedToolId_ < getNumberOfTools())
- return (Tool)tools_.elementAt(selectedToolId_);
- return null;
- }
-
- public final int getNumberOfTools()
- {
- return tools_.size();
- }
-
- public final Node getNode()
- {
- return node_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/TransportProviderRegistry.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/TransportProviderRegistry.java
deleted file mode 100644
index 73b98d8a4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/TransportProviderRegistry.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider;
-
-/**
- * This class is responsible for loading the Web Services Explorer's transport provider
- * extensions and instantiating them when needed.
- */
-public class TransportProviderRegistry {
-
- private static final String PREF_TRANSPORT_PROVIDERS = "TRANSPORT_PROVIDERS";
- private static final String EXTENSION_NAME = "wseTransportProvider";
- private static final String SOAP_TRANSPORT_PROVIDER = "soapTransportProvider";
- private static final String NAMESPACE_URI = "namespaceURI";
- private static final String TRANSPORT_URI = "transportURI";
-
- private static TransportProviderRegistry instance = null;
-
- private List preferredIDs = null;
- private Map soapProviderElements = null;
- private Map soapProviderCache = null;
-
- /**
- * Returns a singleton instance of this TransportProviderRegistry.
- *
- * @return An instance of this class.
- */
- public synchronized static TransportProviderRegistry getInstance() {
- if (instance == null)
- instance = new TransportProviderRegistry();
- return instance;
- }
-
- /*
- * Constructor.
- */
- private TransportProviderRegistry() {
-
- // get the preference value
- Preferences preferences = ExplorerPlugin.getInstance().getPluginPreferences();
- String transportProviders = preferences.getString(PREF_TRANSPORT_PROVIDERS).replaceAll("\\s", "");
-
- // split it into a list of preferred transport provider IDs
- if (transportProviders.length() == 0)
- preferredIDs = new ArrayList();
- else
- preferredIDs = Arrays.asList(transportProviders.split(","));
-
- // now find all extenders
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] configs =
- registry.getConfigurationElementsFor(ExplorerPlugin.ID, EXTENSION_NAME);
-
- // currently we only have one type of providers: SOAP transport providers
- soapProviderElements = new Hashtable();
- for (int i = 0; i < configs.length; i++) {
- if (SOAP_TRANSPORT_PROVIDER.equals(configs[i].getName())) {
- String id = configs[i].getAttribute("id");
- soapProviderElements.put(id, configs[i]);
- }
- }
-
- soapProviderCache = new Hashtable();
- }
-
- /*
- * Determine if the URIs match.
- */
- private boolean uriMatch(String required, String supported) {
-
- // not specified mean support everything
- if (supported == null)
- return true;
-
- if (!required.endsWith("/")) required += "/";
- if (!supported.endsWith("/")) supported += "/";
-
- return required.equals(supported);
- }
-
- /*
- * Create the extension for the given key, but only if it supports the binding namespace and transport
- */
- private ISOAPTransportProvider createExtension(Object key, String namespaceURI, String transportURI) {
-
- IConfigurationElement element = (IConfigurationElement) soapProviderElements.get(key);
- if (element == null)
- return null;
-
- boolean supportsNamespace = uriMatch(namespaceURI, element.getAttribute(NAMESPACE_URI));
- boolean supportsTransport = uriMatch(transportURI, element.getAttribute(TRANSPORT_URI));
-
- if (supportsNamespace && supportsTransport) {
-
- String providerClassID = element.getAttribute("class");
- Object obj = null;
-
- try {
- // check if we already have the transport provider cached,
- // if not, then create one
- synchronized (soapProviderCache) {
- obj = soapProviderCache.get(providerClassID);
- if (obj == null) {
- obj = element.createExecutableExtension("class");
- soapProviderCache.put(providerClassID, obj);
- }
- }
- return (ISOAPTransportProvider) obj;
- }
- catch (CoreException e) {}
- }
-
- return null;
- }
-
- /**
- * Get an ISOAPTransportProvider that supports the binding namespace and transport. This method will
- * first look for preferred IDs defined using the TRANSPORT_PROVIDERS preference key. If a suitable
- * provider is not found, it will then look at all other extenders in non-deterministic order.
- *
- * @param namespaceURI The binding namespace URI
- * @param transportURI The binding transport URI
- *
- * @return Returns a suitable ISOAPTranportProvider for the given binding information, or null
- * if there's no match.
- */
- public ISOAPTransportProvider getSOAPTransportProvider(String namespaceURI, String transportURI) {
-
- ISOAPTransportProvider provider = null;
-
- Iterator iter = preferredIDs.iterator();
-
- // check preferred IDs first
- while (iter.hasNext()) {
- provider = createExtension(iter.next(), namespaceURI, transportURI);
- if (provider != null)
- return provider;
- }
-
- iter = soapProviderElements.keySet().iterator();
-
- // check rest of the providers
- while (iter.hasNext()) {
- Object key = iter.next();
-
- // already checked the preferred IDs
- if (preferredIDs.contains(key))
- continue;
-
- provider = createExtension(key, namespaceURI, transportURI);
- if (provider != null)
- return provider;
- }
-
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java
deleted file mode 100644
index fb59607e1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-
-public abstract class ViewTool extends FormTool
-{
- private Hashtable viewToolManagers_;
-
- public ViewTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
- {
- super(toolManager,enabledImageLink,highlightedImageLink,alt);
- toolType_ = ToolTypes.VIEW;
- viewToolManagers_ = new Hashtable();
- }
-
- protected abstract void addSetDefaultViewTool(ToolManager viewToolManager,int index);
- protected abstract void addTools(ToolManager viewToolManager,int index);
-
- public final ToolManager createToolManager(int viewId)
- {
- ToolManager viewToolManager = new ToolManager(toolManager_.getNode());
- addTools(viewToolManager,viewId);
- addSetDefaultViewTool(viewToolManager,viewId);
- viewToolManagers_.put(String.valueOf(viewId),viewToolManager);
- return viewToolManager;
- }
-
- public final ToolManager getToolManager(int viewId)
- {
- return (ToolManager)(viewToolManagers_.get(String.valueOf(viewId)));
- }
-
- public final void clearViewToolManager(int viewId)
- {
- viewToolManagers_.remove(String.valueOf(viewId));
- }
-
- public final void clearViewToolManagers()
- {
- viewToolManagers_.clear();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java
deleted file mode 100644
index 6c87e5cc9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class AddItemsToFavoritesAction extends UDDIPropertiesFormAction
-{
- public AddItemsToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
- // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
- propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
- return true;
- }
-
- public final boolean run()
- {
- String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
- AddToFavoritesAction action = new AddToFavoritesAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- for (int i=0;i<selectedNodeIds.length;i++)
- {
- propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
- if (action.favoriteExists()) {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- Node node = uddiPerspective.getNavigatorManager().getNode(Integer.parseInt(selectedNodeIds[i]));
- String nodeName = node.getNodeName();
- uddiPerspective.getMessageQueue().addMessage(uddiPerspective.getMessage("MSG_ERROR_FAVORITE_ALREADY_EXISTS",nodeName));
- }
- else
- action.run();
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java
deleted file mode 100644
index b96b761ba..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.assertion.PublisherAssertion;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.KeyedReference;
-
-public class AddPublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
- public AddPublisherAssertionsAction(Controller controller)
- {
- super(controller);
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- if (registryNode_ == null)
- return false;
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
-
- // ids from uddiObjects_table.jsp
- String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (selectedBusIds == null || selectedBusIds.length == 0) {
- // Synchronize client view and server model (uddiObject_table.jsp)
- synchronizeUDDIObjectTable();
- inputsValid = false;
- }
- else {
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
- // Synchronize client view and server model (uddiObject_table.jsp)
- synchronizeUDDIObjectTable();
- }
-
- String[] assertionTypes = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE);
- if (assertionTypes != null && assertionTypes.length > 0)
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE, assertionTypes);
- else
- inputsValid = false;
-
- String[] directions = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION);
- if (directions != null && directions.length > 0)
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION, directions);
- else
- inputsValid = false;
-
- // if not yet logged in, validate the parameters needed to log in
- if (!isLoggedIn_) {
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userID != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- }
-
- if (!Validator.validateString(userID))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
- }
-
- return inputsValid;
- }
-
- public boolean run()
- {
- if (registryNode_ == null)
- return false;
-
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- // if not yet logged in, log in first
- if (!isLoggedIn_) {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- try {
- registryElement.performLogin(publishURL, userID, password);
- }
- catch (TransportException te) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(te.getMessage());
- return false;
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(uddie.toString());
- return false;
- }
- catch (MalformedURLException me) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(me.getMessage());
- return false;
- }
- }
-
- UDDIProxy proxy = registryElement.getProxy();
- registryElement.getUserId();
- registryElement.getCred();
- BusinessElement busElement = (BusinessElement)selectedElement;
-
- // determine whether this is a owned business
- // if not, the AddPublisherAssertionsAction cannot be performed
- if (!isBusinessOwned(busElement)) {
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
- return false;
- }
-
- try {
- String[] assertionTypes = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE);
- String[] directions = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION);
- String thisBusinessKey = busElement.getBusinessEntity().getBusinessKey();
-
- // get all selected businesses
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
- Vector selectedBusinesses = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
- Enumeration e = selectedBusinesses.elements();
- if (!e.hasMoreElements())
- return true;
-
- // create a vector of publisher assertions based on all the selected businesses
- Vector pubAssertionVector = new Vector();
- int i = 0;
- while (e.hasMoreElements()) {
- ListElement le = (ListElement)e.nextElement();
- BusinessEntity sp = (BusinessEntity)le.getObject();
- KeyedReference keyedRef = new KeyedReference(assertionTypes[i], assertionTypes[i], TModel.RELATIONSHIPS_TMODEL_KEY);
- if (Integer.parseInt(directions[i]) == UDDIActionInputs.DIRECTION_TO)
- pubAssertionVector.add(new PublisherAssertion(sp.getBusinessKey(), thisBusinessKey, keyedRef));
- else
- pubAssertionVector.add(new PublisherAssertion(thisBusinessKey, sp.getBusinessKey(), keyedRef));
- i++;
- }
-
- // proxy.add_publisherAssertions(...)
- DispositionReport report = proxy.add_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
-
- // refresh publisher assertions iff proxy reports success
- if (report.success()) {
- selectedBusinesses.removeAllElements();
- ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
- Hashtable propertyTable = showPAAction.getPropertyTable();
- Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (ids != null)
- propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
- showPAAction.run();
- }
-
- return report.success();
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- DispositionReport report = uddie.getDispositionReport();
- Vector reportErrInfo = report.getResultVector();
- for (int i = 0; i < reportErrInfo.size(); i++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
- }
- return false;
- }
- catch(Exception e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("Exception");
- messageQueue.addMessage(e.getMessage());
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java
deleted file mode 100644
index 7ac33ea0f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class AddToFavoritesAction extends UDDINodeAction
-{
- public AddToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/CheckFavoriteExistsActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean registryExists(String registryName,Node registryNode)
- {
- registryNode.getTreeElement();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME,registryName);
- return favoriteExists(table,FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
- }
-
- public final boolean businessExists(String businessName,Node businessNode)
- {
- BusinessElement busElement = (BusinessElement)businessNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String businessKey = busElement.getBusinessEntity().getBusinessKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME,businessName);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
- return favoriteExists(table,FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
- }
-
- public final boolean serviceExists(String serviceName,Node serviceNode)
- {
- ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String serviceKey = serviceElement.getBusinessService().getServiceKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME,serviceName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY,serviceKey);
- return favoriteExists(table,FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
- }
-
- public final boolean serviceInterfaceExists(String siName,Node siNode)
- {
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String tModelKey = siElement.getTModel().getTModelKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME,siName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY,tModelKey);
- return favoriteExists(table,FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
- }
-
- public final boolean addRegistryToFavorites(String registryName,Node registryNode)
- {
- RegistryElement regElement = (RegistryElement)registryNode.getTreeElement();
- String inquiryURL = regElement.getInquiryURL();
- String publishURL = regElement.getPublishURL();
- if (publishURL == null)
- publishURL = "";
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_PUBLISH_API,publishURL);
- table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME,registryName);
- Enumeration userDefinedCategoriesEnum = regElement.getUserDefinedCategories();
- if (userDefinedCategoriesEnum != null)
- {
- table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_CATEGORIES_ENUM,userDefinedCategoriesEnum);
- table.put(FavoritesModelConstants.PROP_PLUGIN_METADATA_DIRECTORY,controller_.getServletEngineStateLocation());
- }
- return addToFavorites(table,FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
- }
-
- public final boolean addBusinessToFavorites(String businessName,Node businessNode)
- {
- BusinessElement busElement = (BusinessElement)businessNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String businessKey = busElement.getBusinessEntity().getBusinessKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME,businessName);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
- return addToFavorites(table,FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
- }
-
- public final boolean addServiceToFavorites(String serviceName,Node serviceNode)
- {
- ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String serviceKey = serviceElement.getBusinessService().getServiceKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME,serviceName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY,serviceKey);
- return addToFavorites(table,FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
- }
-
- public final boolean addServiceInterfaceToFavorites(String siName,Node siNode)
- {
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- String tModelKey = siElement.getTModel().getTModelKey();
- String inquiryURL = regElement.getInquiryURL();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME,siName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API,inquiryURL);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY,tModelKey);
- return addToFavorites(table,FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
- }
-
- public boolean favoriteExists()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- Node node = nodeManager_.getNode(nodeId);
- String nodeName = node.getNodeName();
- if (node instanceof RegistryNode)
- return registryExists(nodeName,node);
- else if (node instanceof BusinessNode)
- return businessExists(nodeName,node);
- else if (node instanceof ServiceNode)
- return serviceExists(nodeName,node);
- else if (node instanceof ServiceInterfaceNode)
- return serviceInterfaceExists(nodeName,node);
- else
- return false;
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- Node node = nodeManager_.getNode(nodeId);
- String nodeName = node.getNodeName();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- boolean addToFavoritesResult = false;
- if (node instanceof RegistryNode)
- {
- addToFavoritesResult = addRegistryToFavorites(nodeName,node);
- RegistryElement regElement = (RegistryElement)node.getTreeElement();
- Enumeration e = regElement.getUserDefinedCategories();
- if (e != null)
- {
- while (e.hasMoreElements())
- {
- CategoryModel categoryModel = (CategoryModel)e.nextElement();
- Throwable errorException = categoryModel.getErrorException();
- if (errorException != null)
- {
- String[] args = {categoryModel.getDisplayName(),errorException.getMessage()};
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_SAVING_CATEGORY_DATA",args));
- }
- }
- }
- }
- else if (node instanceof BusinessNode)
- addToFavoritesResult = addBusinessToFavorites(nodeName,node);
- else if (node instanceof ServiceNode)
- addToFavoritesResult = addServiceToFavorites(nodeName,node);
- else if (node instanceof ServiceInterfaceNode)
- addToFavoritesResult = addServiceInterfaceToFavorites(nodeName,node);
- if (addToFavoritesResult)
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_FAVORITE_ADDED",nodeName));
- else
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_FAVORITE_NOT_ADDED",nodeName));
- return addToFavoritesResult;
- }
-
- protected boolean addToFavorites(Hashtable table, String rel)
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favNodeManager = favPerspective.getNodeManager();
- TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
- Enumeration e = favRootElement.getElements(rel);
- if (!e.hasMoreElements())
- return false;
- FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
- return favFolderElement.addFavorite(table);
- }
-
- protected boolean favoriteExists(Hashtable table, String rel)
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favNodeManager = favPerspective.getNodeManager();
- TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
- Enumeration e = favRootElement.getElements(rel);
- if (!e.hasMoreElements())
- return false;
- FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
- return favFolderElement.favoriteExists(table);
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java
deleted file mode 100644
index 483d6f635..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusPublishServiceAdvancedAction extends PublishAction
-{
- private RegPublishServiceAdvancedAction regPublishServiceAdvancedAction_;
- public BusPublishServiceAdvancedAction(Controller controller)
- {
- super(controller);
- regPublishServiceAdvancedAction_ = new RegPublishServiceAdvancedAction(controller);
- propertyTable_ = regPublishServiceAdvancedAction_.getPropertyTable();
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- Node businessNode = getSelectedNavigatorNode();
- BusinessElement businessElement = (BusinessElement)businessNode.getTreeElement();
- BusinessEntity businessEntity = businessElement.getBusinessEntity();
- ListElement busListElement = new ListElement(businessEntity);
- Vector serviceBusinessCopy = new Vector();
- serviceBusinessCopy.addElement(busListElement);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
- boolean result = regPublishServiceAdvancedAction_.processOthers(parser,formToolPI);
- if (!propertyTable_.containsKey(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER))
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,businessEntity);
- return result;
- }
-
- public final boolean run()
- {
- return regPublishServiceAdvancedAction_.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java
deleted file mode 100644
index 91c708895..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusPublishServiceSimpleAction extends PublishAction
-{
- private RegPublishServiceSimpleAction regPublishServiceSimpleAction_;
-
- public BusPublishServiceSimpleAction(Controller controller)
- {
- super(controller);
- regPublishServiceSimpleAction_ = new RegPublishServiceSimpleAction(controller);
- propertyTable_ = regPublishServiceSimpleAction_.getPropertyTable();
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- Node businessNode = getSelectedNavigatorNode();
- BusinessElement businessElement = (BusinessElement)businessNode.getTreeElement();
- BusinessEntity businessEntity = businessElement.getBusinessEntity();
- ListElement busListElement = new ListElement(businessEntity);
- Vector serviceBusinessCopy = new Vector();
- serviceBusinessCopy.addElement(busListElement);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
- boolean result = regPublishServiceSimpleAction_.processOthers(parser,formToolPI);
- if (!propertyTable_.containsKey(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER))
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER,businessEntity);
- return result;
- }
-
- public final boolean run()
- {
- return regPublishServiceSimpleAction_.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java
deleted file mode 100644
index 5a9458a69..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusinessGetServicesAction extends UDDINodeAction
-{
- private BusinessNode busNode_;
- public BusinessGetServicesAction(Controller controller)
- {
- super(controller);
- busNode_ = null;
- }
-
- // uddi/actions/BusinessGetServicesActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/BusinessGetServicesActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean validateBusiness()
- {
- int busNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- busNode_ = (BusinessNode)nodeManager_.getNode(busNodeId);
- BusinessElement busElement = (BusinessElement)busNode_.getTreeElement();
- RegFindBusinessUUIDAction verifyAction = new RegFindBusinessUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,busElement.getBusinessEntity().getBusinessKey());
- boolean result = verifyAction.run();
- if (result)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
- return result;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- BusinessEntity sp = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
- RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_BUSINESS_SERVICES",busNode_.getNodeName()));
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);
-
- ListElement businessListElement = new ListElement(sp);
- businessListElement.setTargetViewToolInfo(busNode_.getNodeId(),busNode_.getToolManager().getSelectedToolId(),busNode_.getViewId());
- Vector businessListVector = new Vector();
- businessListVector.addElement(businessListElement);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,businessListVector);
-
-
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java
deleted file mode 100644
index 8dbeb8781..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-
-public class ClearNavigatorFolderNodeAction extends ClearNavigatorNodeAction
-{
- public ClearNavigatorFolderNodeAction(Controller controller)
- {
- super(controller);
- }
-
- // uddi/actions/ClearNavigatorFolderNodeAction.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ClearNavigatorFolderNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- Node node = nodeManager_.getNode(nodeId);
- TreeElement element = node.getTreeElement();
- element.disconnectRel(element.getPropertyAsString(ModelConstants.REL_CHILDREN));
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java
deleted file mode 100644
index 3af63e4c0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class ClearNavigatorNodeAction extends ClearNodeAction
-{
- public ClearNavigatorNodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getNavigatorManager());
- propertyTable_.put(ActionInputs.NODEID,String.valueOf(controller.getUDDIPerspective().getNavigatorManager().getSelectedNodeId()));
- }
-
- // uddi/actions/ClearNavigatorNodeAction.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ClearNavigatorNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final String getTreeContentVar()
- {
- return "navigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "uddi/navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "propertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "uddi/properties_container.jsp";
- }
-
- public final String getStatusContentVar()
- {
- return "statusContent";
- }
-
- public final String getStatusContentPage()
- {
- return "uddi/status_content.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java
deleted file mode 100644
index e92e56530..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ClearNavigatorNodesAction extends UDDIPropertiesFormAction
-{
- public ClearNavigatorNodesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
- if (selectedNodeIds != null)
- propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
- else
- removeProperty(UDDIActionInputs.SELECTED_NODEIDS);
- return true;
- }
-
- public final boolean run()
- {
- String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
- if (selectedNodeIds != null)
- {
- ClearNavigatorNodeAction action = new ClearNavigatorNodeAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- for (int i=0;i<selectedNodeIds.length;i++)
- {
- propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
- action.run();
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java
deleted file mode 100644
index c740396c5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.RegisteredInfo;
-
-public abstract class CommonPublisherAssertionsAction extends UDDIPropertiesFormAction
-{
-
- protected RegistryNode registryNode_;
- protected boolean isLoggedIn_;
-
- public CommonPublisherAssertionsAction(Controller controller)
- {
- super(controller);
-
- registryNode_ = getRegistryNode();
- if (registryNode_ != null)
- isLoggedIn_ = ((RegistryElement)registryNode_.getTreeElement()).isLoggedIn();
- }
-
- protected void synchronizeUDDIObjectTable() {
- String[] selectedBusIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- Node selectedNode = controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode();
- FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
- Vector businessVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
- ListManager businessCopy = (ListManager)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY);
- if (selectedBusIds == null || selectedBusIds.length <= 0) {
- businessVector.removeAllElements();
- businessCopy.clear();
- }
- Enumeration e = businessCopy.getListElements();
- while (e.hasMoreElements()) {
- boolean isIdFound = false;
- ListElement le = (ListElement)e.nextElement();
- int listElementViewId = le.getViewId();
- for (int i = 0; i < selectedBusIds.length; i++) {
- if (listElementViewId == Integer.parseInt(selectedBusIds[i])) {
- isIdFound = true;
- break;
- }
- }
- if (!isIdFound)
- businessVector.remove(le);
- }
- }
-
- protected boolean isBusinessOwned(BusinessElement busElement) {
- boolean isBusinessOwned = false;
- String isBusinessOwnedString = busElement.getPropertyAsString(UDDIModelConstants.IS_BUSINESS_OWNED);
- if (isBusinessOwnedString != null) {
- isBusinessOwned = Boolean.valueOf(isBusinessOwnedString).booleanValue();
- }
- else if (isLoggedIn_) {
- try {
- RegistryElement regElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- RegisteredInfo ri = proxy.get_registeredInfo(regElement.getAuthInfoString());
- Vector beVector = ri.getBusinessInfos().getBusinessInfoVector();
- for (Iterator it = beVector.iterator(); it.hasNext();)
- {
- BusinessInfo bi = (BusinessInfo)it.next();
- if (bi.getBusinessKey().equals(busElement.getBusinessEntity().getBusinessKey()))
- {
- isBusinessOwned = true;
- break;
- }
- }
- busElement.setPropertyAsString(UDDIModelConstants.IS_BUSINESS_OWNED, String.valueOf(isBusinessOwned));
- }
- catch (Exception e) {}
- }
- return isBusinessOwned;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java
deleted file mode 100644
index c184b4fa9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.CompletionStatus;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-import org.uddi4j.transport.TransportException;
-
-public class CompletePublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
- public CompletePublisherAssertionsAction(Controller controller)
- {
- super(controller);
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- if (registryNode_ == null)
- return false;
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
-
- // ids from uddiObjects_table
- String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (selectedBusIds != null && selectedBusIds.length > 0)
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
- // Synchronize client view and server model (uddiObject_table.jsp)
- synchronizeUDDIObjectTable();
-
- // if not yet logged in, validate the parameters needed to log in
- if (!isLoggedIn_) {
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userID != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- }
-
- if (!Validator.validateString(userID))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
- }
-
- // ids from publisher assertion table
- String[] pubAssertionsViewIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
- if (pubAssertionsViewIds == null || pubAssertionsViewIds.length == 0)
- inputsValid = false;
- else
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID, pubAssertionsViewIds);
-
- return inputsValid;
- }
-
- public boolean run()
- {
- if (registryNode_ == null)
- return false;
-
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- // if not yet logged in, log in first
- if (!isLoggedIn_) {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- try {
- registryElement.performLogin(publishURL, userID, password);
- }
- catch (TransportException te) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(te.getMessage());
- return false;
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(uddie.toString());
- return false;
- }
- catch (MalformedURLException me) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(me.getMessage());
- return false;
- }
- }
-
- UDDIProxy proxy = registryElement.getProxy();
- registryElement.getUserId();
- registryElement.getCred();
- BusinessElement busElement = (BusinessElement)selectedElement;
- ListManager pubAssertions = busElement.getPublisherAssertions();
-
- // determine whether this is a owned business
- // if not, the AddPublisherAssertionsAction cannot be performed
- if (!isBusinessOwned(busElement)) {
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
- return false;
- }
-
- try {
- String[] pubAssertionViewIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
- Vector pubAssertionVector = new Vector();
-
- for (int i = 0; i < pubAssertionViewIds.length; i++) {
- int viewID = Integer.parseInt(pubAssertionViewIds[i]);
- ListElement listElement = pubAssertions.getElementWithViewId(viewID);
- PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)listElement.getObject();
- if (!(pubAssertionElement.getStatus().equals(CompletionStatus.COMPLETE)))
- pubAssertionVector.add(pubAssertionElement.getPublisherAssertion());
- }
-
- if (pubAssertionVector.size() <= 0) {
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_INCOMPLETE_ASSERTION_SELECTED"));
- return false;
- }
-
- DispositionReport report = proxy.add_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
- //report status
- Vector reportErrInfo = report.getResultVector();
- for (int j = 0; j < reportErrInfo.size(); j++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(j)).getErrInfo().getText());
- }
-
- ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
- Hashtable propertyTable = showPAAction.getPropertyTable();
- Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (ids != null)
- propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
- showPAAction.run();
-
- return report.success();
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- DispositionReport report = uddie.getDispositionReport();
- Vector reportErrInfo = report.getResultVector();
- for (int j = 0; j < reportErrInfo.size(); j++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(j)).getErrInfo().getText());
- }
- return false;
- }
- catch (Exception e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("Exception");
- messageQueue.addMessage(e.getMessage());
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java
deleted file mode 100644
index 7637f8a20..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryParentElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryTransferTarget;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-
-public abstract class FindAction extends UDDIPropertiesFormAction
-{
- protected QueryElement queryElement_;
- protected String subQueryKey_;
- protected boolean isSubQueryGet_;
- protected String newSubQuery_;
- protected String newSubQueryItem_;
- protected boolean subQueryInitiated_;
- protected RegistryNode regNode_;
- private boolean isRefreshAction_;
-
- public FindAction(Controller controller)
- {
- super(controller);
- queryElement_ = null;
- subQueryKey_ = null;
- isSubQueryGet_ = false;
- subQueryInitiated_ = false;
- regNode_ = getRegistryNode();
- isRefreshAction_ = false;
- }
-
- protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- // Setup for MultipartFormDataParserTransformer
- propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
-
- newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
- String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
- newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
- subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
- String queryName = parser.getParameter(UDDIActionInputs.QUERY_NAME);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.clearErrors();
-
- if (newSubQuery_ != null && newSubQuery_.length() > 0)
- subQueryInitiated_ = true;
- else
- subQueryInitiated_ = false;
-
- if (isSubQueryGetString != null)
- isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
- if (queryName != null)
- propertyTable_.put(UDDIActionInputs.QUERY_NAME,queryName);
-
- if (!Validator.validateString(queryName) && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_QUERY_NAME"));
- }
-
- if (!processOthers(parser,formToolPI) && !subQueryInitiated_)
- inputsValid = false;
-
- for (int i=0;i<removedProperties_.size();i++)
- formToolPI.removeProperty(removedProperties_.elementAt(i));
- formToolPI.updatePropertyTable(propertyTable_);
-
- // Process authentication information. If valid, these should be set in the formTool (not the formToolPI).
- String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-
- boolean validateAuthentication = (ownedChecked != null) && (!regElement.isLoggedIn()) && !overrideAuthenticationValidation();
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userId != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- }
-
- if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(userId))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-
- return inputsValid;
- }
-
- protected boolean overrideAuthenticationValidation()
- {
- return false;
- }
-
- public final boolean isSubQueryInitiated()
- {
- return subQueryInitiated_;
- }
-
- public final boolean isSubQueryGet()
- {
- return isSubQueryGet_;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-
- public final String getNewSubQuery()
- {
- return newSubQuery_;
- }
-
- public final String getNewSubQueryItem()
- {
- return newSubQueryItem_;
- }
-
- public final void setRefreshAction(boolean isRefreshAction)
- {
- isRefreshAction_ = isRefreshAction;
- }
-
- public final boolean isRefreshAction()
- {
- return isRefreshAction_;
- }
-
- protected final void addQueryNode()
- {
- // If the queryElement already exists, remove it first.
- String queryName = queryElement_.getName();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- QueryParentElement queryParentElement = regElement.getQueryParentElement();
- Enumeration e = queryParentElement.getQueries();
- while (e.hasMoreElements())
- {
- QueryElement qe = (QueryElement)e.nextElement();
- if (qe.getName().equals(queryName))
- {
- SubQueryTransferTarget subQueryTransferTarget = (SubQueryTransferTarget)qe.getPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET);
- if (subQueryTransferTarget != null && (qe.getQueryType() == queryElement_.getQueryType()))
- queryElement_.setPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET,subQueryTransferTarget);
- qe.disconnectAll();
- break;
- }
- }
- if (!isRefreshAction_)
- {
- // We can make safe assumptions about the node that is currently selected.
- if (subQueryKey_ != null && subQueryKey_.length() > 0)
- {
- String parentQueryKey;
- int lastSeparatorPos = subQueryKey_.lastIndexOf(':');
- if (lastSeparatorPos == -1)
- parentQueryKey = "";
- else
- parentQueryKey = subQueryKey_.substring(0,lastSeparatorPos);
- FormToolPropertiesInterface parentFormToolPI = ((MultipleFormToolPropertiesInterface)getSelectedFormTool()).getFormToolProperties(parentQueryKey);
- Object queryItem = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_ITEM);
- Object queryStyleBus = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES);
- Object queryStyleSer = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
- Object queryStyleSerInt = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES);
- Hashtable parentQueryData = new Hashtable();
- if (queryItem != null)
- parentQueryData.put(UDDIActionInputs.QUERY_ITEM, queryItem);
- if (queryStyleBus != null)
- parentQueryData.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES, queryStyleBus);
- if (queryStyleSer != null)
- parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICES, queryStyleSer);
- if (queryStyleSerInt != null)
- parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES, queryStyleSerInt);
- queryElement_.setPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET,new SubQueryTransferTarget(getSelectedNavigatorNode(),subQueryKey_,parentQueryData));
- }
- }
- queryParentElement.connect(queryElement_,UDDIModelConstants.REL_QUERIES,ModelConstants.REL_OWNER);
- QueryNode queryNode = (QueryNode)(regNode_.getChildNode(queryParentElement).getChildNode(queryElement_));
- int newSelectedNodeId;
- // If there is only 1 result, select the result. Otherwise, select the query node to present a summary.
- if (queryNode.getChildNodes().size() == 1 && (subQueryKey_ == null || subQueryKey_.length() == 0))
- newSelectedNodeId = ((Node)(queryNode.getChildNodes().elementAt(0))).getNodeId();
- else
- newSelectedNodeId = queryNode.getNodeId();
- NodeManager nodeManager = regNode_.getNodeManager();
- nodeManager.setSelectedNodeId(newSelectedNodeId);
- queryNode.setFindToolProperties(this);
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager toolManager = selectedNode.getCurrentToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
- return transformers;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LoginAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LoginAdvancedAction.java
deleted file mode 100644
index 0d7e0abd1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LoginAdvancedAction.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- * 20060427 136449 clbush@us.ibm.com - Christopher Bush
- ******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import java.rmi.AlreadyBoundException;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessServices;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.response.RegisteredInfo;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-import org.uddi4j.transport.TransportException;
-
-public class LoginAdvancedAction extends PublishAction {
- public LoginAdvancedAction(Controller controller) {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM, String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_
- .put(UDDIActionInputs.QUERY_STYLE_BUSINESSES, String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET, String
- .valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS, String
- .valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser, FormToolPropertiesInterface formToolPI)
- throws MultipartFormDataException {
- String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
-
- // Validate the data.
- boolean inputsValid = true;
- if (ownedChecked != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED, ownedChecked);
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED);
-
- return inputsValid;
- }
-
- private boolean attemptingDoubleLogin(){
- String userId = (String) propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String publishURL = (String) propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- Node rootNode = regNode_.getNodeManager().getRootNode();
- Vector allNodes = rootNode.getChildNodes();
-
- for(int k = 0; k < allNodes.size(); k++){
- Node n = (Node)allNodes.get(k);
- if (n instanceof RegistryNode){
- RegistryElement myElement = ((RegistryElement)n.getTreeElement());
- if (n.getNodeId() != regNode_.getNodeId() && publishURL.equals(myElement.getPublishURL()))
- if(userId.equals(myElement.getUserId()))
- return true;
- }
- }
- return false;
- }
-
- public final boolean run() {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- // System.out.println("+++++ Trying to login +++++");
- try {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String publishURL = (String) propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String) propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String) propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- int maxResults = 300;
-
- // The action can be run under the context of either a registry or a
- // query node.
- RegistryElement regElement = (RegistryElement) regNode_.getTreeElement();
-
-
- if(attemptingDoubleLogin())
- throw new AlreadyBoundException(uddiPerspective.getMessage("MSG_INFO_NO_MULTIPLE_LOGIN"));
-
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL, userId, password);
-
- UDDIProxy proxy = regElement.getProxy();
-
- BusinessInfos busInfos = null;
- TModelInfos tmInfos = null;
-
- RegisteredInfo ri = proxy.get_registeredInfo(regElement.getAuthInfoString());
- busInfos = ri.getBusinessInfos();
- tmInfos = ri.getTModelInfos();
-
- int finalNumberOfBusinessEntities = Math.min(maxResults, busInfos.size());
- Vector businessKeys = new Vector();
- for (int i = 0; i < finalNumberOfBusinessEntities; i++) {
- BusinessInfo busInfo = (BusinessInfo) busInfos.get(i);
- businessKeys.addElement(busInfo.getBusinessKey());
- }
-
- if (finalNumberOfBusinessEntities > 0) {
- if (shouldAddQueryNode) {
- Vector beVector = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
- BusinessEntity be = null;
- BusinessServices bs = null;
- int size = beVector.size();
- if (size > 0) {
- for (int i = 0; i < size; i++) {
- be = (BusinessEntity) beVector.elementAt(i);
- addPublishedItemNode(be, regElement);
- bs = be.getBusinessServices();
- if (bs != null) {
- Vector vServices = bs.getBusinessServiceVector();
- int services = vServices.size();
- for (int j = 0; j < services; j++) {
- addPublishedItemNode(bs.get(j), regElement);
- }
- }
- }
- messageQueue
- .addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND", String.valueOf(size)));
- }
- }
- }
-
- int finalNumberOfTModels = Math.min(maxResults, tmInfos.size());
- Vector tModelKeys = new Vector();
- for (int i = 0; i < finalNumberOfTModels; i++) {
- TModelInfo tmInfo = (TModelInfo) tmInfos.get(i);
- tModelKeys.addElement(tmInfo.getTModelKey());
- }
-
- if (finalNumberOfTModels > 0) {
- if (shouldAddQueryNode) {
- Vector finalTModelVector = proxy.get_tModelDetail(tModelKeys).getTModelVector();
-
- int size = finalTModelVector.size();
- if (size > 0) {
- TModel tm = null;
- for (int i = 0; i < size; i++) {
- tm = (TModel) finalTModelVector.elementAt(i);
- addPublishedItemNode(tm, regElement);
- }
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND", String
- .valueOf(size)));
- }
- }
- }
-
- int id = 1;
- RegistryNode regNode = getRegistryNode();
-
- // we are logged in so change the loginTool to act as a logoutTool;
- regNode.getLoginTool().setAltText(uddiPerspective.getMessage("ALT_LOGOUT"));
- regNode.getLoginTool().setToLogoutLink();
- String registryName = regElement.getName();
- String[] s = new String[2];
- s[0] = registryName;
- s[1] = userId;
- regElement.setName(uddiPerspective.getMessage("MSG_INFO_LOGGED_IN_NODE", s));
-
- if (finalNumberOfBusinessEntities > 0) {
- Node pbeNode = regNode.getChildNode(regElement.getPublishedBusinessesElement());
- id = pbeNode.getNodeId();
- } else if (finalNumberOfTModels > 0) {
- Node psiNode = regNode.getChildNode(regElement.getPublishedServiceInterfacesElement());
- id = psiNode.getNodeId();
- }
- // System.out.println("Node id = " + id);
- uddiPerspective.getNodeManager().setSelectedNodeId(id);
- uddiPerspective.getNodeManager().makeSelectedNodeVisible();
-
- if ((finalNumberOfBusinessEntities < 1) && (finalNumberOfTModels < 1))
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_NO_BUSINESSES_OR_SERVICE_INTERFACES_FOUND"));
-
- return true;
- } catch (TransportException e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- } catch (UDDIException e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- } catch (MalformedURLException e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- } catch (AlreadyBoundException e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("AlreadyBoundException");
- messageQueue.addMessage(e.getMessage());
- }
-
- return false;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LogoutAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LogoutAdvancedAction.java
deleted file mode 100644
index e76df39fd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/LogoutAdvancedAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.transport.TransportException;
-
-public class LogoutAdvancedAction extends PublishAction
-{
- public LogoutAdvancedAction(Controller controller)
- {
- super(controller);
- regNode_.getLoginTool().setToRegistryLink();
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- // Validate the data.
- boolean inputsValid = true;
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (regElement.isLoggedIn()) {
- regElement.performLogout();
- regElement.remove();
- regNode_.getNodeManager().setSelectedNodeId(0);
- }
-
- return true;
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java
deleted file mode 100644
index 67a86f169..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.service.BusinessServices;
-import org.uddi4j.transport.TransportException;
-
-public class ManageReferencedServicesAction extends UDDIPropertiesFormAction
-{
- protected String subQueryKey_;
- protected boolean isSubQueryGet_;
- protected String newSubQuery_;
- protected String newSubQueryItem_;
- protected boolean subQueryInitiated_;
- protected RegistryNode regNode_;
-
- public ManageReferencedServicesAction(Controller controller)
- {
- super(controller);
- subQueryKey_ = null;
- isSubQueryGet_ = false;
- subQueryInitiated_ = false;
- regNode_ = getRegistryNode();
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
- String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
- newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
- subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
- String[] referencedServicesCheckboxes = parser.getParameterValues(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
- String[] serviceNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE);
- String operation = parser.getParameter(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.clearErrors();
-
- if (newSubQuery_ != null && newSubQuery_.length() > 0)
- subQueryInitiated_ = true;
- else
- subQueryInitiated_ = false;
-
- if (isSubQueryGetString != null)
- isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
- if (operation != null)
- propertyTable_.put(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION,operation);
- else
- removeProperty(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
-
- if (referencedServicesCheckboxes != null)
- propertyTable_.put(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE,referencedServicesCheckboxes);
- else
- removeProperty(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
-
- if (serviceNodeIds != null)
- {
- Vector services = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SERVICES);
- if (services == null)
- services = new Vector();
- Hashtable resultHash = new Hashtable();
- for (int i=0;i<serviceNodeIds.length;i++)
- resultHash.put(serviceNodeIds[i],Boolean.TRUE);
- for (int i=0;i<services.size();i++)
- {
- ListElement listElement = (ListElement)services.elementAt(i);
- if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) == null)
- {
- services.removeElementAt(i);
- i--;
- }
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SERVICES,services);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_SERVICES);
-
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- {
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!subQueryInitiated_ && !Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userId != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- }
-
- if (!subQueryInitiated_ && !Validator.validateString(userId))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
- }
-
- for (int i=0;i<removedProperties_.size();i++)
- formToolPI.removeProperty(removedProperties_.elementAt(i));
- formToolPI.updatePropertyTable(propertyTable_);
-
- return inputsValid;
- }
-
- public boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- String operationString = (String)propertyTable_.get(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
- int operation = Integer.parseInt(operationString);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- BusinessElement busElement = (BusinessElement)(getSelectedNavigatorNode().getTreeElement());
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- Vector referencedServices = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES);
- boolean operationResult = true;
- try
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- UDDIProxy proxy = regElement.getProxy();
- BusinessEntity currentSP = busElement.getBusinessEntity();
- BusinessEntity sp = (BusinessEntity)proxy.get_businessDetail(currentSP.getBusinessKey()).getBusinessEntityVector().get(0);
-
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- Hashtable servicesHash = new Hashtable();
- Vector backupBusServiceVector = new Vector();
- switch (operation)
- {
- case UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_ADD:
- Vector services = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SERVICES);
- for (int i=0;i<services.size();i++)
- {
- ListElement serviceListElement = (ListElement)services.elementAt(i);
- BusinessService bs = (BusinessService)serviceListElement.getObject();
- servicesHash.put(bs.getServiceKey(),bs);
- }
-
- // Save the current list of BusinessServices for rollback operations.
- backupAndUpdateBusinessServices(backupBusServiceVector,sp,servicesHash,true);
-
- try
- {
- Vector beVector = new Vector();
- beVector.add(sp);
- sp = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
- for (int i=0;i<services.size();i++)
- {
- ListElement serviceElement = (ListElement)services.elementAt(i);
- BusinessService bs = (BusinessService)serviceElement.getObject();
- String bsName = bs.getDefaultNameString();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_REFERENCED",bsName));
- services.removeElementAt(i);
- i--;
- }
- }
- catch (TransportException e)
- {
- // Roll back and restore the old list of services.
- rollbackBusinessServices(sp,backupBusServiceVector,services,uddiPerspective,messageQueue,"MSG_ERROR_SERVICE_NOT_REFERENCED");
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- operationResult = false;
- }
- catch (UDDIException e)
- {
- // Roll back and restore the old list of services.
- rollbackBusinessServices(sp,backupBusServiceVector,services,uddiPerspective,messageQueue,"MSG_ERROR_SERVICE_NOT_REFERENCED");
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- operationResult = false;
- }
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SERVICES,services);
- break;
- case UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_REMOVE:
- String[] referencedServicesCheckboxes = (String[])propertyTable_.get(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
- Vector selectedReferencedServiceVector = new Vector();
- for (int i=0;i<referencedServicesCheckboxes.length;i++)
- {
- boolean isChecked = Boolean.valueOf(referencedServicesCheckboxes[i]).booleanValue();
- if (isChecked)
- {
- ListElement referencedServiceListElement = (ListElement)referencedServices.elementAt(i);
- BusinessService bs = (BusinessService)referencedServiceListElement.getObject();
- servicesHash.put(bs.getServiceKey(),bs);
- selectedReferencedServiceVector.addElement(bs);
- }
- }
-
- // Save the current list of business services for rollback operations.
- backupAndUpdateBusinessServices(backupBusServiceVector,sp,servicesHash,false);
-
- try
- {
- Vector beVector = new Vector();
- beVector.add(sp);
- sp = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
- for (int i=0;i<selectedReferencedServiceVector.size();i++)
- {
- BusinessService bs = (BusinessService)selectedReferencedServiceVector.elementAt(i);
- String bsName = bs.getDefaultNameString();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_REFERENCE_REMOVED",bsName));
- }
- }
- catch (TransportException e)
- {
- // Roll back and restore the old list of services.
- rollbackBusinessServices(sp,backupBusServiceVector,selectedReferencedServiceVector,uddiPerspective,messageQueue,"MSG_ERROR_REFERENCE_NOT_REMOVED");
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- operationResult = false;
- }
- catch (UDDIException e)
- {
- // Roll back and restore the old list of services.
- rollbackBusinessServices(sp,backupBusServiceVector,selectedReferencedServiceVector,uddiPerspective,messageQueue,"MSG_ERROR_REFERENCE_NOT_REMOVED");
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- operationResult = false;
- }
- }
- // Ensure that the referenced services are refreshed when the form reloads.
- formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES);
- busElement.setBusinessEntity(sp);
- return operationResult;
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- operationResult = false;
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- operationResult = false;
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- operationResult = false;
- }
- return operationResult;
- }
-
- public final boolean isSubQueryInitiated()
- {
- return subQueryInitiated_;
- }
-
- public final boolean isSubQueryGet()
- {
- return isSubQueryGet_;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-
- public final String getNewSubQuery()
- {
- return newSubQuery_;
- }
-
- public final String getNewSubQueryItem()
- {
- return newSubQueryItem_;
- }
-
- // Backup the business services and remove those in serviceHash from the current list. Return the updated list of business services
- private final void backupAndUpdateBusinessServices(Vector backupBusServiceVector,BusinessEntity be,Hashtable servicesHash,boolean isAdd)
- {
- // Save the current list of business services for rollback operations.
- BusinessServices currentBusServices = be.getBusinessServices();
- if (currentBusServices == null)
- currentBusServices = new BusinessServices();
- Vector currentBusServiceVector = currentBusServices.getBusinessServiceVector();
- for (int i=0;i<currentBusServiceVector.size();i++)
- {
- BusinessService currentBusService = (BusinessService)currentBusServiceVector.elementAt(i);
- backupBusServiceVector.addElement(currentBusService);
- // If the current business service is a member of the list to be removed/added, remove it now.
- if (servicesHash.get(currentBusService.getServiceKey()) != null)
- {
- currentBusServiceVector.removeElementAt(i);
- i--;
- }
- }
-
- if (isAdd)
- {
- Enumeration e = servicesHash.elements();
- while (e.hasMoreElements())
- currentBusServiceVector.addElement((BusinessService)e.nextElement());
- }
- be.setBusinessServices(currentBusServices);
- }
-
- private final void rollbackBusinessServices(BusinessEntity be,Vector backupBusServiceVector,Vector operatedServices,Perspective perspective,MessageQueue messageQueue,String errorMessageKey)
- {
- // Roll back and restore the old list of services.
- be.getBusinessServices().setBusinessServiceVector(backupBusServiceVector);
- for (int i=0;i<operatedServices.size();i++)
- {
- ListElement serviceListElement = (ListElement)operatedServices.elementAt(i);
- BusinessService bs = (BusinessService)serviceListElement.getObject();
- String bsName = bs.getDefaultNameString();
- messageQueue.addMessage(perspective.getMessage(errorMessageKey,bsName));
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java
deleted file mode 100644
index bdcf84e39..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class OpenCategoryBrowserAction extends Action
-{
- public OpenCategoryBrowserAction()
- {
- }
-
- private static final void addSessionAndTModelKey(StringBuffer result,String sessionId,String categoryTModelKey)
- {
- result.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&').append(UDDIActionInputs.CATEGORY_TMODEL_KEY).append('=').append(categoryTModelKey);
- }
-
- // uddi/category_browser.jsp?sessionId=...&categoryTModelKey=...
- public static final String getActionLink(String sessionId,String categoryTModelKey)
- {
- StringBuffer actionLink = new StringBuffer("uddi/category_browser.jsp?");
- addSessionAndTModelKey(actionLink,sessionId,categoryTModelKey);
- return actionLink.toString();
- }
-
- public static final String getCategoryContentPage(String sessionId,String categoryTModelKey)
- {
- StringBuffer actionLink = new StringBuffer("uddi/category_content.jsp?");
- addSessionAndTModelKey(actionLink,sessionId,categoryTModelKey);
- return actionLink.toString();
- }
-
- public static final String getWildCardActionLink(String sessionId)
- {
- return getActionLink(sessionId,"%");
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public final boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java
deleted file mode 100644
index 9288c7d5e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060912 141796 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-import org.uddi4j.response.TModelList;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-public class OpenRegistryAction extends UDDIPropertiesFormAction
-{
- public OpenRegistryAction(Controller controller)
- {
- super(controller);
- // Select UDDI Main.
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String registryName = parser.getParameter(UDDIActionInputs.REGISTRY_NAME);
- String inquiryURL = parser.getParameter(UDDIActionInputs.INQUIRY_URL);
- String publishURL = parser.getParameter(UDDIActionInputs.PUBLISH_URL);
- String username = parser.getParameter(UDDIActionInputs.UDDI_USERNAME);
- String password = parser.getParameter(UDDIActionInputs.UDDI_PASSWORD);
- String checkUserDefinedCategoriesChecked = parser.getParameter(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
- String categoriesDirectory = parser.getParameter(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
- if (registryName != null)
- propertyTable_.put(UDDIActionInputs.REGISTRY_NAME,registryName);
-
- if (!Validator.validateString(registryName))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.REGISTRY_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_REGISTRY_NAME"));
- }
-
- if (inquiryURL != null)
- propertyTable_.put(UDDIActionInputs.INQUIRY_URL,inquiryURL);
- if (!Validator.validateURL(inquiryURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.INQUIRY_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_INQUIRY_URL"));
- }
-
- if (publishURL != null)
- propertyTable_.put(UDDIActionInputs.PUBLISH_URL, publishURL);
-
- if (username != null)
- propertyTable_.put(UDDIActionInputs.UDDI_USERNAME, username);
-
- if (password != null)
- propertyTable_.put(UDDIActionInputs.UDDI_PASSWORD, password);
-
- if (checkUserDefinedCategoriesChecked != null)
- propertyTable_.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,checkUserDefinedCategoriesChecked);
- else
- removeProperty(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
-
- if (categoriesDirectory != null)
- propertyTable_.put(UDDIActionInputs.CATEGORIES_DIRECTORY,categoriesDirectory);
- else
- removeProperty(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
- formTool.updatePropertyTable(propertyTable_);
- return inputsValid;
- }
-
- public final void gatherWSUserDefinedCategories(UDDIProxy proxy,Hashtable categoryModels)
- {
- try
- {
- CategoryBag categoryBag = new CategoryBag();
- categoryBag.add(new KeyedReference("","categorization",TModel.TYPES_TMODEL_KEY));
- TModelList tModelList = proxy.find_tModel("%",categoryBag,null,null,100);
- TModelInfos tModelInfos = tModelList.getTModelInfos();
- Vector tModelKeyVector = new Vector();
- for (int i=0;i<tModelInfos.size();i++)
- {
- TModelInfo tModelInfo = tModelInfos.get(i);
- tModelKeyVector.addElement(tModelInfo.getTModelKey());
- }
- TModelDetail tModelDetail = proxy.get_tModelDetail(tModelKeyVector);
- Vector tModelVector = tModelDetail.getTModelVector();
- for (int i=0;i<tModelVector.size();i++)
- {
- TModel tModel = (TModel)tModelVector.elementAt(i);
- boolean checked = false;
- String displayName = null;
- String categoryKey = null;
- categoryBag = tModel.getCategoryBag();
- for (int j=0;j<categoryBag.size();j++)
- {
- KeyedReference kr = categoryBag.get(j);
- String krTModelKey = kr.getTModelKey();
- if (krTModelKey.equalsIgnoreCase(TModel.GENERAL_KEYWORDS_TMODEL_KEY))
- {
- String krKeyName = kr.getKeyName();
- if (krKeyName.equals("urn:x-ibm:uddi:customTaxonomy:key"))
- categoryKey = kr.getKeyValue();
- else if (krKeyName.equals("urn:x-ibm:uddi:customTaxonomy:displayName"))
- displayName = kr.getKeyValue();
- }
- else if (krTModelKey.equalsIgnoreCase(TModel.TYPES_TMODEL_KEY))
- checked = kr.getKeyValue().equals("checked");
- }
- if (categoryKey != null)
- {
- if (displayName == null)
- displayName = tModel.getNameString();
- CategoryModel categoryModel = new CategoryModel();
- categoryModel.setCategoryKey(categoryKey);
- categoryModel.enableChecked(checked);
- categoryModel.setDisplayName(displayName);
- String tModelKey = tModel.getTModelKey();
- categoryModel.setTModelKey(tModelKey);
- categoryModels.put(tModelKey,categoryModel);
- }
- }
- }
- catch (UDDIException e)
- {
- }
- catch (TransportException e)
- {
- }
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- String registryName = (String)propertyTable_.get(UDDIActionInputs.REGISTRY_NAME);
- String inquiryURL = (String)propertyTable_.get(UDDIActionInputs.INQUIRY_URL);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.PUBLISH_URL);
- String registrationURL = (String)propertyTable_.get(UDDIActionInputs.REGISTRATION_URL);
- String username = (String)propertyTable_.get(UDDIActionInputs.UDDI_USERNAME);
- String password = (String)propertyTable_.get(UDDIActionInputs.UDDI_PASSWORD);
- boolean checkForUserDefinedCategoriesChecked = (propertyTable_.get(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES) != null);
- String categoriesDirectory = (String)propertyTable_.get(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
- String recognizedPublishURL = uddiPerspective.getKnownRegistryPublishURL(inquiryURL);
- String recognizedRegistrationURL = uddiPerspective.getKnownRegistryRegistrationURL(inquiryURL);
-
- if (publishURL == null)
- publishURL = recognizedPublishURL;
- if (registrationURL == null)
- registrationURL = recognizedRegistrationURL;
-
- UDDIMainNode uddiMainNode = (UDDIMainNode)(controller_.getUDDIPerspective().getNavigatorManager().getRootNode());
- UDDIMainElement uddiMainElement = (UDDIMainElement)uddiMainNode.getTreeElement();
- Properties props = new Properties();
- props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
- UDDIProxy proxy = new UDDIProxy(props);
- proxy.setInquiryURL(new URL(inquiryURL));
- RegistryElement registryElement = new RegistryElement(proxy,inquiryURL,registryName,uddiMainElement.getModel());
- // Set registry element's publish URL and registration URL provided by external callers (e.g. favorites).
- if (publishURL != null)
- registryElement.setCachedPublishURL(publishURL);
- if (registrationURL != null)
- registryElement.setRegistrationURL(registrationURL);
- if (username != null)
- registryElement.setUserId(username);
- if (password != null)
- registryElement.setCred(password);
- registryElement.setCheckForUserDefinedCategories(checkForUserDefinedCategoriesChecked);
- if (checkForUserDefinedCategoriesChecked)
- {
- Hashtable categoryModels = new Hashtable();
- gatherWSUserDefinedCategories(proxy,categoryModels);
- if (categoryModels.size() > 0)
- registryElement.setUserDefinedCategories(categoryModels);
- }
- registryElement.setCategoriesDirectory(categoriesDirectory);
- uddiMainElement.connect(registryElement,UDDIModelConstants.REL_REGISTRIES,ModelConstants.REL_OWNER);
- NodeManager nodeManager = uddiMainNode.getNodeManager();
- int newRegistryNodeId = uddiMainNode.getChildNode(registryElement).getNodeId();
- // Select the new registry node and add the select action to the history.
- nodeManager.setSelectedNodeId(newRegistryNodeId);
- Node registryNode = nodeManager.getSelectedNode();
- ToolManager toolManager = registryNode.getCurrentToolManager();
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,toolManager.getSelectedTool().getSelectToolActionHref(true));
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_REGISTRY_OPENED",new String[]{registryName,inquiryURL}));
- return true;
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- FormTool formTool = getSelectedFormTool();
- formTool.flagError(UDDIActionInputs.INQUIRY_URL);
- }
- /*
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- */
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java
deleted file mode 100644
index 8e29b626d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public abstract class PublishAction extends UDDIPropertiesFormAction
-{
- protected String subQueryKey_;
- protected boolean subQueryInitiated_;
- protected String newSubQuery_;
- protected boolean isSubQueryGet_;
- protected String newSubQueryItem_;
- protected RegistryNode regNode_;
-
- public PublishAction(Controller controller)
- {
- super(controller);
- subQueryKey_ = null;
- isSubQueryGet_ = false;
- subQueryInitiated_ = false;
- regNode_ = getRegistryNode();
- }
-
- protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- // Setup for MultipartFormDataParserTransformer
- propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
-
- newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
- String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
- newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
- subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.clearErrors();
-
- if (newSubQuery_ != null && newSubQuery_.length() > 0)
- subQueryInitiated_ = true;
- else
- subQueryInitiated_ = false;
-
- if (isSubQueryGetString != null)
- isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
- if (!processOthers(parser,formToolPI) && !subQueryInitiated_)
- inputsValid = false;
-
- for (int i=0;i<removedProperties_.size();i++)
- formToolPI.removeProperty(removedProperties_.elementAt(i));
- formToolPI.updatePropertyTable(propertyTable_);
-
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-
- boolean validateAuthentication = !regElement.isLoggedIn();
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userId != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- }
-
- if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(userId))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-
- return inputsValid;
- }
-
- protected final void addPublishedItemNode(BusinessEntity be,RegistryElement regElement)
- {
- BusinessElement beElement = new BusinessElement(be,regElement.getModel());
- PublishedItemsElement publishedBusinessesElement = regElement.getPublishedBusinessesElement();
- Enumeration e = publishedBusinessesElement.getItems();
- while (e.hasMoreElements())
- {
- BusinessElement element = (BusinessElement)e.nextElement();
- BusinessEntity elementBE = element.getBusinessEntity();
- if (elementBE.getBusinessKey().equals(be.getBusinessKey()))
- {
- element.disconnectAll();
- break;
- }
- }
- connectElements(publishedBusinessesElement,beElement);
- }
-
- protected final void addPublishedItemNode(BusinessService bs,RegistryElement regElement)
- {
- ServiceElement sElement = new ServiceElement(bs,regElement.getModel());
- PublishedItemsElement publishedServicesElement = regElement.getPublishedServicesElement();
- Enumeration e = publishedServicesElement.getItems();
- while (e.hasMoreElements())
- {
- ServiceElement element = (ServiceElement)e.nextElement();
- BusinessService elementBS = element.getBusinessService();
- if (elementBS.getServiceKey().equals(bs.getServiceKey()))
- {
- element.disconnectAll();
- break;
- }
- }
- connectElements(publishedServicesElement,sElement);
- }
-
- protected final void addPublishedItemNode(TModel tModel,RegistryElement regElement)
- {
- ServiceInterfaceElement siElement = new ServiceInterfaceElement(tModel,regElement.getModel());
- PublishedItemsElement publishedServiceInterfacesElement = regElement.getPublishedServiceInterfacesElement();
- Enumeration e = publishedServiceInterfacesElement.getItems();
- while (e.hasMoreElements())
- {
- ServiceInterfaceElement element = (ServiceInterfaceElement)e.nextElement();
- TModel elementTModel = element.getTModel();
- if (tModel.getTModelKey().equals(elementTModel.getTModelKey()))
- {
- element.disconnectAll();
- break;
- }
- }
- connectElements(publishedServiceInterfacesElement,siElement);
- }
-
- private final void connectElements(PublishedItemsElement publishedItemsElement,TreeElement itemElement)
- {
- publishedItemsElement.connect(itemElement,UDDIModelConstants.REL_PUBLISHED_ITEMS,ModelConstants.REL_OWNER);
- int newNodeId = regNode_.getChildNode(publishedItemsElement).getChildNode(itemElement).getNodeId();
- NodeManager nodeManager = regNode_.getNodeManager();
- nodeManager.setSelectedNodeId(newNodeId);
- Node newNode = nodeManager.getSelectedNode();
- ToolManager toolManager = newNode.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
- }
-
- public final boolean isSubQueryInitiated()
- {
- return subQueryInitiated_;
- }
-
- public final boolean isSubQueryGet()
- {
- return isSubQueryGet_;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-
- public final String getNewSubQuery()
- {
- return newSubQuery_;
- }
-
- public final String getNewSubQueryItem()
- {
- return newSubQueryItem_;
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
- return transformers;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java
deleted file mode 100644
index 3c1ada630..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddRegistryToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.BusinessNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.PublishedItemsNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.QueryParentNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class RefreshUDDINodeAction extends UDDINodeAction
-{
- private Vector staleNodes_;
- public RefreshUDDINodeAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(ActionInputs.NODEID,String.valueOf(controller.getUDDIPerspective().getNavigatorManager().getSelectedNodeId()));
- staleNodes_ = new Vector();
- }
-
- // uddi/actions/RefreshUDDINodeActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/RefreshUDDINodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean verifyNodeData()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- Node node = nodeManager_.getNode(nodeId);
- if (node instanceof BusinessNode)
- return refreshBusinessElement((BusinessNode)node);
- else if (node instanceof ServiceNode)
- return refreshServiceElement((ServiceNode)node);
- else if (node instanceof ServiceInterfaceNode)
- return refreshServiceInterfaceElement((ServiceInterfaceNode)node);
- else if (node instanceof QueryNode)
- {
- // Nothing to verify
- return true;
- }
- else if (node != null)
- {
- // RegistryNode
- if (node instanceof RegistryNode)
- refreshRegistryElement((RegistryNode)node);
-
- // FolderNodes
- Vector childNodes = node.getChildNodes();
- Vector refreshActions = new Vector();
- for (int i=0;i<childNodes.size();i++)
- {
- Node childNode = (Node)childNodes.elementAt(i);
- RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller_);
- action.setStaleNodes(staleNodes_);
- Hashtable propertyTable = action.getPropertyTable();
- String childNodeIdString = String.valueOf(childNode.getNodeId());
- propertyTable.put(ActionInputs.NODEID,childNodeIdString);
- if (!action.verifyNodeData())
- staleNodes_.addElement(childNode);
- else
- refreshActions.addElement(action);
- }
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,refreshActions);
- return true;
- }
- return true;
- }
-
- private final void refreshRegistryElement(RegistryNode regNode)
- {
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
- Hashtable userDefinedCategories = null;
- if (regElement.getCheckForUserDefinedCategories())
- {
- userDefinedCategories = new Hashtable();
- OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
- openRegAction.gatherWSUserDefinedCategories(regElement.getProxy(),userDefinedCategories);
- if (!userDefinedCategories.keys().hasMoreElements())
- {
- userDefinedCategories = null;
- regNode.setImagePath(RegistryNode.IMAGE_PATH_STANDARD);
- }
- else
- {
- String categoriesDirectory = regElement.getCategoriesDirectory();
- AddRegistryToUDDIPerspectiveAction addAction = new AddRegistryToUDDIPerspectiveAction(controller_);
- if (categoriesDirectory != null)
- addAction.linkCategoryModelsWithSavedData(userDefinedCategories.elements(),categoriesDirectory);
- else
- addAction.linkCategoryModelsWithSavedData(regElement.getName(),userDefinedCategories.elements());
- regNode.setImagePath(RegistryNode.IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES);
- }
- }
- regElement.setUserDefinedCategories(userDefinedCategories);
- }
-
- private final boolean refreshBusinessElement(BusinessNode busNode)
- {
- BusinessElement busElement = (BusinessElement)busNode.getTreeElement();
- String uuidKey = busElement.getBusinessEntity().getBusinessKey();
- RegFindBusinessUUIDAction verifyAction = new RegFindBusinessUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
- propertyTable.put(UDDIActionInputs.REFRESH_NODE,busNode);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- boolean verifyResult = verifyAction.run();
- if (verifyResult)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new BusinessElement((BusinessEntity)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),busElement.getModel()));
- return verifyResult;
- }
-
- private final boolean refreshServiceElement(ServiceNode serviceNode)
- {
- ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
- String uuidKey = serviceElement.getBusinessService().getServiceKey();
- RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidKey);
- propertyTable.put(UDDIActionInputs.REFRESH_NODE,serviceNode);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- boolean verifyResult = verifyAction.run();
- if (verifyResult)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new ServiceElement((BusinessService)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),serviceElement.getModel()));
- return verifyResult;
- }
-
- private final boolean refreshServiceInterfaceElement(ServiceInterfaceNode siNode)
- {
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
- String uuidKey = siElement.getTModel().getTModelKey();
- RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
- propertyTable.put(UDDIActionInputs.REFRESH_NODE,siNode);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- boolean verifyResult = verifyAction.run();
- if (verifyResult)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new ServiceInterfaceElement((TModel)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),siElement.getModel()));
- return verifyResult;
- }
-
- public final void connectElements(Node parentNode,TreeElement newElement)
- {
- TreeElement parentElement = parentNode.getTreeElement();
- String rel = null;
- if (parentNode instanceof PublishedItemsNode)
- rel = UDDIModelConstants.REL_PUBLISHED_ITEMS;
- else if (parentNode instanceof QueryNode)
- rel = UDDIModelConstants.REL_QUERY_RESULTS;
- else if (parentNode instanceof QueryParentNode)
- rel = UDDIModelConstants.REL_QUERIES;
- parentElement.connect(newElement,rel,ModelConstants.REL_OWNER);
- Node newNode = parentNode.getChildNode(newElement);
- int newNodeId = newNode.getNodeId();
- nodeManager_.setSelectedNodeId(newNodeId);
- ToolManager toolManager = newNode.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- if (!isStaleNode(nodeId))
- {
- Node node = nodeManager_.getNode(nodeId);
- Object latestObject = propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
- if (latestObject != null)
- {
- if (latestObject instanceof Vector)
- {
- Vector refreshActions = (Vector)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
- for (int i=0;i<refreshActions.size();i++)
- {
- RefreshUDDINodeAction refreshAction = (RefreshUDDINodeAction)refreshActions.elementAt(i);
- refreshAction.run();
- }
- nodeManager_.setSelectedNodeId(nodeId);
- }
- else
- {
- TreeElement oldElement = node.getTreeElement();
- oldElement.disconnectAll();
- connectElements(node.getParent(),(TreeElement)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT));
- }
- }
- else
- {
- // QueryNodes
- QueryNode queryNode = (QueryNode)node;
- FindAction findAction = queryNode.getFindAction();
- findAction.setRefreshAction(true);
- if (!findAction.run())
- queryNode.removeChildNodes(true);
- findAction.setRefreshAction(false);
- }
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_NODE_REFRESHED",node.getNodeName()));
- return true;
- }
- return false;
- }
-
- public final Vector getStaleNodes()
- {
- return staleNodes_;
- }
-
- public final void setStaleNodes(Vector staleNodes)
- {
- staleNodes_ = staleNodes;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java
deleted file mode 100644
index fe3cadc53..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class RefreshUDDINodesAction extends UDDIPropertiesFormAction
-{
- private Vector staleNodes_;
-
- public RefreshUDDINodesAction(Controller controller)
- {
- super(controller);
- staleNodes_ = new Vector();
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
- // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
- propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
- return true;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- int collectorNodeId = getSelectedNavigatorNode().getNodeId();
- String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
- RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- for (int i=0;i<selectedNodeIds.length;i++)
- {
- propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
- if (action.verifyNodeData())
- action.run();
- else
- {
- int nodeId = Integer.parseInt(selectedNodeIds[i]);
- staleNodes_.addElement(navigatorManager.getNode(nodeId));
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NODE_DATA_VALIDATION_FAILED",navigatorManager.getNode(nodeId).getNodeName()));
- }
- }
- navigatorManager.setSelectedNodeId(collectorNodeId);
- return true;
- }
-
- public final Vector getStaleNodes()
- {
- return staleNodes_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java
deleted file mode 100644
index 79317283a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindBusinessUUIDAction extends FindAction
-{
- public RegFindBusinessUUIDAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
-
- if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-
- // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
- if (regNode_ == null)
- regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- BusinessEntity[] beList = new BusinessEntity[1];
- Vector beVector = proxy.get_businessDetail(uuidKey).getBusinessEntityVector();
- if (beVector.size() > 0)
- {
- beVector.toArray(beList);
- if (shouldAddQueryNode)
- {
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
- }
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,beList[0]);
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java
deleted file mode 100644
index 51a575796..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.FindQualifier;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-import org.uddi4j.util.TModelBag;
-
-public class RegFindBusinessesAdvancedAction extends FindAction
-{
- public RegFindBusinessesAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
- String[] languages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
- String[] siNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
- String[] discoveryURLValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
- String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
- String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
- String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- getSelectedNavigatorNode();
- getRegistryNode();
- regNode_.getTreeElement();
-
- if (ownedChecked != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED,ownedChecked);
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED);
-
- if (languages != null && names != null)
- {
- Vector nameVector = new Vector();
- for (int i=0;i<names.length;i++)
- {
- Name uddi4jName;
- if (languages[i].length() > 0)
- uddi4jName = new Name(names[i],languages[i]);
- else
- uddi4jName = new Name(names[i]);
- nameVector.addElement(uddi4jName);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-
- if (idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- IdentifierBag idBag = new IdentifierBag();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- idBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-
- if (siNodeIds != null)
- {
- // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
- Vector busServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES);
- if (busServiceInterfaces == null)
- busServiceInterfaces = new Vector();
- else
- busServiceInterfaces.removeAllElements();
- Vector busServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY);
- Vector tModelKeyStringVector = new Vector();
- Hashtable resultHash = new Hashtable();
- for (int i=0;i<siNodeIds.length;i++)
- resultHash.put(siNodeIds[i],Boolean.TRUE);
- for (int i=0;i<busServiceInterfacesCopy.size();i++)
- {
- ListElement listElement = (ListElement)busServiceInterfacesCopy.elementAt(i);
- if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) != null)
- {
- busServiceInterfaces.addElement(listElement);
- TModel tModel = (TModel)listElement.getObject();
- tModelKeyStringVector.addElement(tModel.getTModelKey());
- }
- }
- TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,busServiceInterfaces);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG,tModelBag);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG);
- }
-
- if (discoveryURLValues != null)
- {
- DiscoveryURLs discoveryURLs = new DiscoveryURLs();
- Vector discoveryURLVector = new Vector();
- for (int i=0;i<discoveryURLValues.length;i++)
- {
- DiscoveryURL discoveryURL = new DiscoveryURL(discoveryURLValues[i],"");
- discoveryURLVector.addElement(discoveryURL);
- }
- discoveryURLs.setDiscoveryURLVector(discoveryURLVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLs);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
- if (findQualifierValues != null)
- {
- FindQualifiers findQualifiers = new FindQualifiers();
- Vector findQualifierVector = new Vector();
- for (int i=0;i<findQualifierValues.length;i++)
- {
- FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
- findQualifierVector.addElement(findQualifier);
- }
- findQualifiers.setFindQualifierVector(findQualifierVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS,findQualifiers);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS);
-
- if (maxSearchSet != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,maxSearchSet);
- if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
- inputsValid = false;
- }
-
- if (maxResults != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,maxResults);
- if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
- inputsValid = false;
- }
- return inputsValid;
- }
-
- private DiscoveryURLs dupDiscoveryURLs(DiscoveryURLs discoveryURLs, String useType, String dupUseType) {
- if (discoveryURLs == null)
- return discoveryURLs;
- Vector discoveryURLVector = discoveryURLs.getDiscoveryURLVector();
- if (discoveryURLVector == null)
- return discoveryURLs;
- Vector newDiscoveryURLVector = new Vector(discoveryURLVector);
- Enumeration e = discoveryURLVector.elements();
- while (e.hasMoreElements()) {
- DiscoveryURL discoveryURL = (DiscoveryURL)e.nextElement();
- if (discoveryURL.getUseType().equals(useType)) {
- newDiscoveryURLVector.add(new DiscoveryURL(discoveryURL.getText(), dupUseType));
- }
- }
- DiscoveryURLs newDiscoveryURLs = new DiscoveryURLs();
- newDiscoveryURLs.setDiscoveryURLVector(newDiscoveryURLVector);
- return newDiscoveryURLs;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS);
- Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- DiscoveryURLs discoveryURLs = (DiscoveryURLs)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
- IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- TModelBag tModelBag = (TModelBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG);
- boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED) != null);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET));
- int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS));
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (owned && !regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- UDDIProxy proxy = regElement.getProxy();
-
- BusinessInfos busInfos = null;
- if (owned)
- busInfos = proxy.get_registeredInfo(regElement.getAuthInfoString()).getBusinessInfos();
- else
- busInfos = proxy.find_business(nameVector, dupDiscoveryURLs(discoveryURLs,"",UDDIActionInputs.DISCOVERY_URL_TYPE), identifierBag, categoryBag, tModelBag, findQualifiers, maxSearchSet).getBusinessInfos();
-
- int finalNumberOfBusinessEntities = Math.min(maxResults, busInfos.size());
- Vector businessKeys = new Vector();
- for (int i = 0; i < finalNumberOfBusinessEntities; i++)
- {
- BusinessInfo busInfo = (BusinessInfo)busInfos.get(i);
- businessKeys.addElement(busInfo.getBusinessKey());
- }
-
- if (finalNumberOfBusinessEntities > 0)
- {
- if (shouldAddQueryNode)
- {
- Vector beVector = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
- BusinessEntity[] beList = new BusinessEntity[beVector.size()];
- beVector.toArray(beList);
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java
deleted file mode 100644
index 9a304ca76..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindBusinessesSimpleAction extends FindAction
-{
- public RegFindBusinessesSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-
- // Validate the data.
- boolean inputsValid = true;
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,name);
- else
- {
- // This shouldn't occur.
- inputsValid = false;
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
- Vector nameVector = new Vector();
- nameVector.addElement(new Name(name));
-
- // The action can be run under the context of either a registry or a query node.
- getSelectedNavigatorNode();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
-
- BusinessInfos busInfos = proxy.find_business(nameVector, null, null, null, null, null, UDDIActionInputs.QUERY_MAX_SEARCH_SET).getBusinessInfos();
- int finalNumberOfBusinessEntities = Math.min(UDDIActionInputs.QUERY_MAX_RESULTS, busInfos.size());
- Vector businessKeys = new Vector();
- for (int i = 0; i < finalNumberOfBusinessEntities; i++)
- {
- BusinessInfo busInfo = busInfos.get(i);
- businessKeys.addElement(busInfo.getBusinessKey());
- }
-
- if (finalNumberOfBusinessEntities > 0)
- {
- if (shouldAddQueryNode)
- {
- Vector beVector = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
- BusinessEntity[] beList = new BusinessEntity[beVector.size()];
- beVector.toArray(beList);
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java
deleted file mode 100644
index 1b5bd43cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServiceInterfaceUUIDAction extends FindAction
-{
- public RegFindServiceInterfaceUUIDAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
-
- if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
-
- // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
- if (regNode_ == null)
- regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- TModelDetail tModelDetail = proxy.get_tModelDetail(uuidKey);
- Vector tModelVector = tModelDetail.getTModelVector();
- if (tModelVector.size() > 0)
- {
- TModel tModel = (TModel)tModelVector.elementAt(0);
- if (shouldAddQueryNode)
- {
- TModel[] tModelArray = new TModel[1];
- tModelArray[0] = tModel;
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));
- }
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,tModel);
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java
deleted file mode 100644
index 371fd84ec..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.binding.BindingTemplates;
-import org.uddi4j.datatype.binding.TModelInstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceInfo;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.RegisteredInfo;
-import org.uddi4j.response.Result;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-import org.uddi4j.response.TModelList;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.FindQualifier;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegFindServiceInterfacesAdvancedAction extends FindAction
-{
- public RegFindServiceInterfacesAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String useServiceChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE);
- String[] serviceNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE);
- String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
- String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
- String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
- String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- regNode_.getTreeElement();
-
- if (useServiceChecked != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE,useServiceChecked);
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE);
-
- if (serviceNodeIds != null)
- {
- // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
- Vector siService = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
- if (siService == null)
- siService = new Vector();
- else
- siService.removeAllElements();
- Vector siServiceCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY);
- // The browser will enforce the rule of having only one service in this list.
- ListElement listElement = (ListElement)siServiceCopy.elementAt(0);
- siService.addElement(listElement);
- BusinessService bs = (BusinessService)listElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,siService);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE,bs);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE);
- if (!subQueryInitiated_ && useServiceChecked != null)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_SERVICE"));
- }
- }
-
- if (ownedChecked != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED,ownedChecked);
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED);
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,name);
-
- if (idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- IdentifierBag idBag = new IdentifierBag();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- idBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
- if (findQualifierValues != null)
- {
- FindQualifiers findQualifiers = new FindQualifiers();
- Vector findQualifierVector = new Vector();
- for (int i=0;i<findQualifierValues.length;i++)
- {
- FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
- findQualifierVector.addElement(findQualifier);
- }
- findQualifiers.setFindQualifierVector(findQualifierVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS,findQualifiers);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS);
-
- if (maxSearchSet != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET,maxSearchSet);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,maxSearchSet);
- }
- if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
- inputsValid = false;
- }
-
- if (maxResults != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS,maxResults);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,maxResults);
- }
- if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
- inputsValid = false;
- }
- return inputsValid;
- }
-
- public final boolean overrideAuthenticationValidation()
- {
- return (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE) != null);
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- boolean useService = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE) != null);
- BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS);
- IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
- boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED) != null);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET));
- int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS));
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- Vector tModelKeyVector = new Vector();
-
- if (owned)
- {
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- tModelKeyVector = findAllOwnedTModels(proxy, regElement.getAuthInfoString(), maxResults);
- }
- if (useService)
- {
- BindingTemplates bindingTemplates = bs.getBindingTemplates();
- boolean endSearch = false;
- if (bindingTemplates != null)
- {
- for (int i=0;i<bindingTemplates.size();i++)
- {
- BindingTemplate bt = bindingTemplates.get(i);
- TModelInstanceDetails tModelInstanceDetails = bt.getTModelInstanceDetails();
- for (int j=0;j<tModelInstanceDetails.size();j++)
- {
- TModelInstanceInfo tModelInstanceInfo = tModelInstanceDetails.get(j);
- if (tModelKeyVector.size() < maxResults)
- tModelKeyVector.addElement(tModelInstanceInfo.getTModelKey());
- else
- {
- endSearch = true;
- break;
- }
- }
- if (endSearch)
- break;
- }
- }
- }
- else
- {
- TModelList tModelList = proxy.find_tModel(name,categoryBag,identifierBag,findQualifiers,maxSearchSet);
- TModelInfos tModelInfos = tModelList.getTModelInfos();
- for (int i=0;i<tModelInfos.size();i++)
- {
- TModelInfo tModelInfo = tModelInfos.get(i);
- if (tModelKeyVector.size() < maxResults)
- tModelKeyVector.addElement(tModelInfo.getTModelKey());
- else
- break;
- }
- }
-
- int finalNumberOfTModelKeys = tModelKeyVector.size();
- if (finalNumberOfTModelKeys > 0)
- {
- if (shouldAddQueryNode)
- {
- Vector finalTModelVector = new Vector();
- int currentIndex = 0;
- int windowSize = finalNumberOfTModelKeys;
- while (currentIndex < tModelKeyVector.size())
- {
- int subListToIndex = Math.min(currentIndex+windowSize,tModelKeyVector.size());
- try
- {
- TModelDetail tModelDetail = proxy.get_tModelDetail(new Vector(tModelKeyVector.subList(currentIndex,subListToIndex)));
- Vector tModelVector = tModelDetail.getTModelVector();
- for (int i=0;i<tModelVector.size();i++)
- finalTModelVector.addElement(tModelVector.elementAt(i));
- if (tModelDetail.getTruncatedBoolean())
- windowSize = tModelVector.size();
- currentIndex += windowSize;
- }
- catch (UDDIException e)
- {
- DispositionReport dr = e.getDispositionReport();
- if (((Result) dr.getResultVector().get(0)).getErrInfo().getErrCode() == DispositionReport.E_invalidKeyPassed)
- {
- String errInfoText = ((Result) dr.getResultVector().get(0)).getErrInfo().getText();
- for (int i=currentIndex;i<subListToIndex;i++)
- {
- String tModelKey = (String)tModelKeyVector.elementAt(i);
- if (errInfoText.indexOf(tModelKey) != -1 || errInfoText.indexOf(tModelKey.toUpperCase()) != -1 || errInfoText.indexOf(tModelKey.toLowerCase()) != -1)
- {
- tModelKeyVector.removeElementAt(i);
- break;
- }
- }
- }
- else
- throw e;
- }
- catch (TransportException e)
- {
- throw e;
- }
- }
-
- int finalNumberOfTModels = finalTModelVector.size();
- if (finalNumberOfTModels > 0)
- {
- TModel[] tModelArray = new TModel[finalNumberOfTModels];
- finalTModelVector.toArray(tModelArray);
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-
- // Copied directly from UDDIWSDLProxy's findAllServiceInterfaces() method with minor modifications. The hardcoded strings should NOT be translated.
- private final Vector findAllOwnedTModels(UDDIProxy proxy, String authInfoString, int maxResults) throws UDDIException, TransportException
- {
- RegisteredInfo registeredInfo = null;
-
- // Get the complete list of owned (registered) info.
- // (A RegisteredInfo consists of BusinessInfos and TModelInfos.
- // BusinessInfos also contain ServiceInfos.)
- registeredInfo = proxy.get_registeredInfo(authInfoString);
-
- //Create a Vector to add the TModelKeys from the registeredInfo.
- Vector tModelKeyList = new Vector();
-
- //Get the TModelInfos from the registeredInfo.
- TModelInfos tModelInfos = registeredInfo.getTModelInfos();
-
- //Get all the TModelKeys from within the TModelInfos
- for (int i = 0; i < tModelInfos.size(); i++)
- {
- TModelInfo tModelInfo = tModelInfos.get(i);
- if (tModelKeyList.size() < maxResults)
- tModelKeyList.addElement(tModelInfo.getTModelKey());
- else
- break;
- }
- return tModelKeyList;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java
deleted file mode 100644
index 88bfed51a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.response.TModelInfo;
-import org.uddi4j.response.TModelInfos;
-import org.uddi4j.response.TModelList;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServiceInterfacesSimpleAction extends FindAction
-{
- public RegFindServiceInterfacesSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- uddiPerspective.getMessageQueue();
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
- else
- {
- // This should never occur.
- inputsValid = false;
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- TModelList tModelList = proxy.find_tModel(name,null,null,null,UDDIActionInputs.QUERY_MAX_SEARCH_SET);
- TModelInfos tModelInfos = tModelList.getTModelInfos();
- Vector tModelKeyVector = new Vector();
-
- for (int i=0;i<tModelInfos.size();i++)
- {
- TModelInfo tModelInfo = tModelInfos.get(i);
- if (tModelKeyVector.size() < UDDIActionInputs.QUERY_MAX_RESULTS)
- tModelKeyVector.addElement(tModelInfo.getTModelKey());
- else
- break;
- }
-
- if (tModelKeyVector.size() > 0)
- {
- if (shouldAddQueryNode)
- {
- TModelDetail tModelDetail = proxy.get_tModelDetail(tModelKeyVector);
- Vector tModelVector = tModelDetail.getTModelVector();
- TModel[] tModelArray = new TModel[tModelVector.size()];
- tModelVector.toArray(tModelArray);
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java
deleted file mode 100644
index 75ea5d17f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServiceUUIDAction extends FindAction
-{
- public RegFindServiceUUIDAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidKey);
-
- if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-
- // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
- if (regNode_ == null)
- regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- BusinessService[] bsArray = new BusinessService[1];
- ServiceDetail serviceDetail = proxy.get_serviceDetail(uuidKey);
- Vector bsVector = serviceDetail.getBusinessServiceVector();
- if (bsVector.size() > 0)
- {
- bsVector.toArray(bsArray);
- if (shouldAddQueryNode)
- {
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
- }
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,bsArray[0]);
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java
deleted file mode 100644
index 9b6d2c560..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.RegisteredInfo;
-import org.uddi4j.response.Result;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.response.ServiceInfo;
-import org.uddi4j.response.ServiceInfos;
-import org.uddi4j.response.ServiceList;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.FindQualifier;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.KeyedReference;
-import org.uddi4j.util.TModelBag;
-
-public class RegFindServicesAdvancedAction extends FindAction
-{
- public RegFindServicesAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
- String[] busNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_BUSINESS);
- String[] languages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
- String[] siNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
- String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
- String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
- String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- regNode_.getTreeElement();
-
- if (ownedChecked != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED,ownedChecked);
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED);
-
- if (busNodeIds != null)
- {
- // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
- Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- if (serviceBusiness == null)
- serviceBusiness = new Vector();
- else
- serviceBusiness.removeAllElements();
- Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
- // The browser will enforce the rule of having only one business in this list.
- ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
- serviceBusiness.addElement(listElement);
- BusinessEntity sp = (BusinessEntity)listElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
- }
-
- if (languages != null && names != null)
- {
- Vector nameVector = new Vector();
- for (int i=0;i<names.length;i++)
- {
- Name uddi4jName;
- if (languages[i].length() > 0)
- uddi4jName = new Name(names[i],languages[i]);
- else
- uddi4jName = new Name(names[i]);
- nameVector.addElement(uddi4jName);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- if (siNodeIds != null)
- {
- // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
- Vector serviceServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- if (serviceServiceInterfaces == null)
- serviceServiceInterfaces = new Vector();
- else
- serviceServiceInterfaces.removeAllElements();
- Vector serviceServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
- Vector tModelKeyStringVector = new Vector();
- Hashtable resultHash = new Hashtable();
- for (int i=0;i<siNodeIds.length;i++)
- resultHash.put(siNodeIds[i],Boolean.TRUE);
- for (int i=0;i<serviceServiceInterfacesCopy.size();i++)
- {
- ListElement listElement = (ListElement)serviceServiceInterfacesCopy.elementAt(i);
- if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) != null)
- {
- serviceServiceInterfaces.addElement(listElement);
- TModel tModel = (TModel)listElement.getObject();
- tModelKeyStringVector.addElement(tModel.getTModelKey());
- }
- }
- TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,serviceServiceInterfaces);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG,tModelBag);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG);
- }
-
- if (findQualifierValues != null)
- {
- FindQualifiers findQualifiers = new FindQualifiers();
- Vector findQualifierVector = new Vector();
- for (int i=0;i<findQualifierValues.length;i++)
- {
- FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
- findQualifierVector.addElement(findQualifier);
- }
- findQualifiers.setFindQualifierVector(findQualifierVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS,findQualifiers);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS);
-
- if (maxSearchSet != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET,maxSearchSet);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,maxSearchSet);
- }
- if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
- inputsValid = false;
- }
-
- if (maxResults != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS,maxResults);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,maxResults);
- }
- if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
- {
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
- inputsValid = false;
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS);
- BusinessEntity sp = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
- Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
- TModelBag tModelBag = (TModelBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG);
- boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED) != null);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET));
- int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS));
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (owned && !regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- UDDIProxy proxy = regElement.getProxy();
- String businessKey;
- if (sp != null)
- businessKey = sp.getBusinessKey();
- else
- businessKey = "";
-
- int finalNumberOfServiceKeys;
- Vector serviceKeyVector;
- if (owned)
- {
- serviceKeyVector = findAllOwnedServices(proxy,regElement.getAuthInfoString(),businessKey,maxResults);
- finalNumberOfServiceKeys = serviceKeyVector.size();
- }
- else
- {
- ServiceList serviceList = proxy.find_service(businessKey,nameVector,categoryBag,tModelBag,findQualifiers,maxSearchSet);
- ServiceInfos sInfos = serviceList.getServiceInfos();
- finalNumberOfServiceKeys = Math.min(maxResults,sInfos.size());
- serviceKeyVector = new Vector();
- for (int i=0;i<finalNumberOfServiceKeys;i++)
- {
- ServiceInfo sInfo = sInfos.get(i);
- serviceKeyVector.addElement(sInfo.getServiceKey());
- }
- }
-
- if (finalNumberOfServiceKeys > 0)
- {
- if (shouldAddQueryNode)
- {
- Vector finalBusServiceVector = new Vector();
- int currentIndex = 0;
- int windowSize = finalNumberOfServiceKeys;
- while (currentIndex < serviceKeyVector.size())
- {
- int subListToIndex = Math.min(currentIndex+windowSize,serviceKeyVector.size());
- try
- {
- ServiceDetail serviceDetail = proxy.get_serviceDetail(new Vector(serviceKeyVector.subList(currentIndex,subListToIndex)));
- Vector busServiceVector = serviceDetail.getBusinessServiceVector();
- for (int i=0;i<busServiceVector.size();i++)
- finalBusServiceVector.addElement(busServiceVector.elementAt(i));
- if (serviceDetail.getTruncatedBoolean())
- windowSize = busServiceVector.size();
- currentIndex += windowSize;
- }
- catch (UDDIException e)
- {
- DispositionReport dr = e.getDispositionReport();
- if (((Result) dr.getResultVector().get(0)).getErrInfo().getErrCode() == DispositionReport.E_invalidKeyPassed)
- {
- String errInfoText = ((Result) dr.getResultVector().get(0)).getErrInfo().getText();
- for (int i=currentIndex;i<subListToIndex;i++)
- {
- String serviceKey = (String)serviceKeyVector.elementAt(i);
- if (errInfoText.indexOf(serviceKey) != -1 || errInfoText.indexOf(serviceKey.toUpperCase()) != -1 || errInfoText.indexOf(serviceKey.toLowerCase()) != -1)
- {
- serviceKeyVector.removeElementAt(i);
- break;
- }
- }
- }
- else
- throw e;
- }
- catch (TransportException e)
- {
- throw e;
- }
- }
-
- int finalNumberOfBusinessServices = finalBusServiceVector.size();
- if (finalNumberOfBusinessServices > 0)
- {
- BusinessService[] bsArray = new BusinessService[finalNumberOfBusinessServices];
- finalBusServiceVector.toArray(bsArray);
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- }
- return false;
- }
-
- // Copied directly from UDDIWSDLProxy's findAllOwnedServices() method with minor modifications. The hardcoded strings should NOT be translated.
- private final Vector findAllOwnedServices(UDDIProxy proxy,String authInfoString,String businessKey,int maxResults) throws UDDIException, TransportException
- {
- RegisteredInfo registeredInfo = null;
-
- // Get the complete list of owned (registered) info.
- // (A RegisteredInfo consists of BusinessInfos and TModelInfos.
- // BusinessInfos also contain ServiceInfos.)
- registeredInfo = proxy.get_registeredInfo(authInfoString);
-
- //Create a vector to add the serviceKeys from the registeredInfo to.
- Vector serviceKeyList = new Vector();
-
- //Get the businessInfos from the registeredInfo.
- BusinessInfos businessInfos = registeredInfo.getBusinessInfos();
-
- //Get all the serviceKeys from the serviceInfos within the businessInfos,
- //and add them to the serviceKeyList.
- boolean endSearch = false;
- for (int i = 0; i < businessInfos.size(); i++)
- {
- BusinessInfo businessInfo = businessInfos.get(i);
- String currentBusinessKey = businessInfo.getBusinessKey();
- if (businessKey.length() > 0 && currentBusinessKey.equals(businessKey))
- endSearch = true;
- ServiceInfos serviceInfos = businessInfo.getServiceInfos();
- for (int j = 0; j < serviceInfos.size(); j++)
- {
- ServiceInfo serviceInfo = serviceInfos.get(j);
- if (serviceInfo.getBusinessKey().equals(currentBusinessKey))
- {
- if (serviceKeyList.size() < maxResults)
- serviceKeyList.add(serviceInfo.getServiceKey());
- else
- {
- endSearch = true;
- break;
- }
- }
- }
- if (endSearch)
- break;
- }
- return serviceKeyList;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java
deleted file mode 100644
index d857541ed..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.response.ServiceInfo;
-import org.uddi4j.response.ServiceInfos;
-import org.uddi4j.response.ServiceList;
-import org.uddi4j.transport.TransportException;
-
-public class RegFindServicesSimpleAction extends FindAction
-{
- public RegFindServicesSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-
- // Validate the data.
- boolean inputsValid = true;
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,name);
- else
- {
- // This shouldn't occur.
- inputsValid = false;
- }
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
- Vector nameVector = new Vector();
- nameVector.addElement(new Name(name));
-
- // The action can be run under the context of either a registry or a query node.
- getSelectedNavigatorNode();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- ServiceList serviceList = proxy.find_service("",nameVector,null,null,null,UDDIActionInputs.QUERY_MAX_SEARCH_SET);
-
- ServiceInfos sInfos = serviceList.getServiceInfos();
- int finalNumberOfBusinessServices = Math.min(UDDIActionInputs.QUERY_MAX_RESULTS,sInfos.size());
- Vector serviceKeyVector = new Vector();
- for (int i=0;i<finalNumberOfBusinessServices;i++)
- {
- ServiceInfo sInfo = sInfos.get(i);
- serviceKeyVector.addElement(sInfo.getServiceKey());
- }
-
- if (finalNumberOfBusinessServices > 0)
- {
- if (shouldAddQueryNode)
- {
- ServiceDetail serviceDetail = proxy.get_serviceDetail(serviceKeyVector);
- Vector businessServiceVector = serviceDetail.getBusinessServiceVector();
- String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
- BusinessService[] bsArray = new BusinessService[finalNumberOfBusinessServices];
- businessServiceVector.toArray(bsArray);
- queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
- addQueryNode();
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
- }
- return true;
- }
- else
- throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (FormInputException e)
- {
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java
deleted file mode 100644
index e340ccd22..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegPublishBusinessAdvancedAction extends PublishAction
-{
- public RegPublishBusinessAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
- String[] discoveryURLValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- Hashtable languageHash = new Hashtable();
- if (nameLanguages != null && names != null)
- {
- Vector nameVector = new Vector();
- // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
- // 1) Only the first row can have a blank language.
- // 2) Only 1 name per language.
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
- for (int i=0;i<names.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Name uddi4jName;
- if (nameLanguages[i].length() > 0)
- uddi4jName = new Name(names[i],nameLanguages[i]);
- else
- {
- uddi4jName = new Name(names[i]);
- if (i != 0 && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(nameLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(nameLanguages[i],Boolean.TRUE);
- if (names[i].trim().length() < 1)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- nameVector.addElement(uddi4jName);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- if (!subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
- }
- }
-
- if (descriptionLanguages != null && descriptions != null)
- {
- Vector descriptionVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0 && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (descriptions[i].trim().length() < 1)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- descriptionVector.addElement(uddi4jDescription);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,descriptionVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-
- if (idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- IdentifierBag idBag = new IdentifierBag();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- idBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-
- if (discoveryURLValues != null)
- {
- DiscoveryURLs discoveryURLs = new DiscoveryURLs();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL");
- for (int i=0;i<discoveryURLValues.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- if (!subQueryInitiated_ && !Validator.validateURL(discoveryURLValues[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- discoveryURLs.add(new DiscoveryURL(discoveryURLValues[i],""));
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLs);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
- IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- DiscoveryURLs discoveryURLs = (DiscoveryURLs)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
-
- BusinessEntity be = new BusinessEntity();
- be.setBusinessKey("");
- be.setNameVector(nameVector);
- be.setDescriptionVector(descriptionVector);
- be.setIdentifierBag(identifierBag);
- be.setCategoryBag(categoryBag);
- be.setDiscoveryURLs(discoveryURLs);
- Vector beVector = new Vector();
- beVector.add(be);
-
- be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
- addPublishedItemNode(be,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
- return true;
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java
deleted file mode 100644
index e2199b7e7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-
-public class RegPublishBusinessSimpleAction extends PublishAction
-{
- public RegPublishBusinessSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
- String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,name);
-
- if (!subQueryInitiated_ && !Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
-
- if (description != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION,description);
-
- return inputsValid;
- }
-
- public final boolean run()
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
- String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION);
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- try
- {
- UDDIProxy proxy = regElement.getProxy();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- BusinessEntity be = new BusinessEntity();
- be.setBusinessKey("");
- be.setDefaultName(new Name(name));
- be.setDefaultDescriptionString(description);
- Vector beVector = new Vector();
- beVector.add(be);
-
- be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
- addPublishedItemNode(be,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
- return true;
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java
deleted file mode 100644
index 2d241f625..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegPublishServiceAdvancedAction extends PublishAction
-{
- public RegPublishServiceAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String busNodeIds = parser.getParameter(UDDIActionInputs.NODEID_BUSINESS);
- String[] serIntIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
- String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
- String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (busNodeIds != null)
- {
- Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- if (serviceBusiness == null)
- serviceBusiness = new Vector();
- else
- serviceBusiness.removeAllElements();
- Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
- // The browser will enforce the rule of having only one business in this list.
- ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
- serviceBusiness.addElement(listElement);
- BusinessEntity sp = (BusinessEntity)listElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,sp.getBusinessKey());
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
- if (!subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_BUSINESS"));
- }
- }
-
- if (serIntIds != null && serIntIds.length > 0)
- {
- Vector serviceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- if (serviceInterfaces == null)
- serviceInterfaces = new Vector();
- else
- serviceInterfaces.removeAllElements();
- Vector serviceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
- Vector tmodels = new Vector();
- for (Iterator it = serviceInterfacesCopy.iterator(); it.hasNext();)
- {
- ListElement listElement = (ListElement)it.next();
- int targetNodeId = listElement.getTargetNodeId();
- for (int i = 0; i < serIntIds.length; i++)
- {
- try
- {
- if (targetNodeId == Integer.parseInt(serIntIds[i]))
- {
- serviceInterfaces.add(listElement);
- tmodels.add(listElement.getObject());
- break;
- }
- }
- catch (NumberFormatException nfe)
- {
- }
- }
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES, serviceInterfaces);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL, tmodels);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL);
- }
-
- if (wsdlURL != null)
- {
- propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,wsdlURL);
- }
-
- if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
-
- Hashtable languageHash = new Hashtable();
- if (nameLanguages != null && names != null)
- {
- Vector nameVector = new Vector();
- // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
- // 1) Only the first row can have a blank language.
- // 2) Only 1 name per language.
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
- for (int i=0;i<names.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Name uddi4jName;
- if (nameLanguages[i].length() > 0)
- uddi4jName = new Name(names[i],nameLanguages[i]);
- else
- {
- uddi4jName = new Name(names[i]);
- if (i != 0 && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(nameLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(nameLanguages[i],Boolean.TRUE);
- if (names[i].trim().length() < 1)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- nameVector.addElement(uddi4jName);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- if (!subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
- }
- }
-
- if (descriptionLanguages != null && descriptions != null)
- {
- Vector descriptionVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0 && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (descriptions[i].trim().length() < 1)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- descriptionVector.addElement(uddi4jDescription);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
- String businessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- Vector tModelVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL);
- String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
-
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-
- BusinessService bs;
- if (tModelVector != null && tModelVector.size() > 0)
- bs = uddi4jHelper.newBusinessService(wsdlURL, def, (TModel[])tModelVector.toArray(new TModel[0]));
- else
- {
- RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
- int currentNodeId = getSelectedNavigatorNode().getNodeId();
- NodeManager nodeManager = regNode_.getNodeManager();
- TModel[] tModels = null;
- if (uddi4jHelper.isMonolithicWSDL(def))
- {
- tModels = new TModel[1];
- tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
- }
- else
- {
- String[] imports = uddi4jHelper.getImports(def, wsdlURL);
- tModels = new TModel[imports.length];
- for (int i = 0; i < tModels.length; i++)
- tModels[i] = uddi4jHelper.newTModel(imports[i]);
- }
- Hashtable tModelsTable = new Hashtable();
- if (tModels != null)
- {
- for (int i=0;i<tModels.length;i++)
- {
- boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
- if (inputsValid)
- {
- regPublishSIAction.run();
- Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
- if (savedTModel != null)
- tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
- // Reselect the current node.
- nodeManager.setSelectedNodeId(currentNodeId);
- }
- }
- }
- bs = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
- }
-
- if (be != null)
- bs.setBusinessKey(be.getBusinessKey());
- else if (businessKey != null)
- bs.setBusinessKey(businessKey);
- bs.setNameVector(nameVector);
- bs.setDescriptionVector(descriptionVector);
- bs.setCategoryBag(categoryBag);
- Vector bsVector = new Vector();
- bsVector.add(bs);
- regElement.handlePreInvocation(bs);
- bs = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
- addPublishedItemNode(bs,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",bs.getDefaultNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("WSDLException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e)){
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- regElement.setDefaults();
- }
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java
deleted file mode 100644
index 001f5c7cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class RegPublishServiceInterfaceAdvancedAction extends PublishAction
-{
- public RegPublishServiceInterfaceAdvancedAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
- }
-
- protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
- // Validate the data.
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- Hashtable languageHash = new Hashtable();
-
- if (wsdlURL != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
-
- if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,name);
-
- if (!subQueryInitiated_ && !Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
-
- if (descriptionLanguages != null && descriptions != null)
- {
- Vector descriptionVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0 && !subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (descriptions[i].trim().length() < 1)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
- descriptionVector.addElement(uddi4jDescription);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,descriptionVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-
- if (idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- IdentifierBag idBag = new IdentifierBag();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- idBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-
- if (catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- CategoryBag catBag = new CategoryBag();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- catBag.add(kr);
- }
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catBag);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
- return inputsValid;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
- IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
- // The action can be run under the context of either a registry or a query node.
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
-
- TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
- tModel.setName(name);
- tModel.setDescriptionVector(descriptionVector);
- tModel.setIdentifierBag(identifierBag);
-
- // The category bag may contain wsdlSpec.
- CategoryBag defaultCategoryBag = tModel.getCategoryBag();
- Vector defaultKeyedReferenceVector = null;
- if (defaultCategoryBag != null)
- {
- if (categoryBag == null)
- categoryBag = defaultCategoryBag;
- else
- {
- defaultKeyedReferenceVector = defaultCategoryBag.getKeyedReferenceVector();
- for (int i=0;i<defaultKeyedReferenceVector.size();i++)
- {
- KeyedReference kr = (KeyedReference)defaultKeyedReferenceVector.elementAt(i);
- if (categoryBag != null)
- categoryBag.add(kr);
- }
- }
- }
- tModel.setCategoryBag(categoryBag);
-
- Vector tModelVector = new Vector();
- tModelVector.add(tModel);
- tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
- propertyTable_.put(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL, tModel);
- addPublishedItemNode(tModel,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("WSDLException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e)){
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- regElement.setDefaults();
- }
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java
deleted file mode 100644
index ba7ffe6c6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-
-public class RegPublishServiceInterfaceSimpleAction extends PublishAction
-{
- public RegPublishServiceInterfaceSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
- String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (wsdlURL != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
-
- if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
-
- if (!subQueryInitiated_ && !Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
-
- if (description != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,description);
-
- return inputsValid;
- }
-
- public final boolean populatePropertyTable(String wsdlURL, TModel tModel)
- {
- boolean inputsValid = true;
- String name = tModel.getNameString();
- String description = tModel.getDefaultDescriptionString();
- if (wsdlURL != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
- else
- inputsValid = false;
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
- else
- inputsValid = false;
-
- if (description != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,description);
- else
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,"");
- return inputsValid;
- }
-
- public final boolean run()
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
- String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION);
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- try
- {
- UDDIProxy proxy = regElement.getProxy();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
- tModel.setName(name);
- tModel.setDefaultDescriptionString(description);
-
- Vector tModelVector = new Vector();
- tModelVector.add(tModel);
- tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
- propertyTable_.put(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL, tModel);
- addPublishedItemNode(tModel,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- e.printStackTrace();
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("WSDLException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (TransportException e)
- {
- e.printStackTrace();
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- e.printStackTrace();
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java
deleted file mode 100644
index dac66084d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-
-public class RegPublishServiceSimpleAction extends PublishAction
-{
- public RegPublishServiceSimpleAction(Controller controller)
- {
- super(controller);
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String busNodeIds = parser.getParameter(UDDIActionInputs.NODEID_BUSINESS);
- String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
- String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (busNodeIds != null)
- {
- Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
- if (serviceBusiness == null)
- serviceBusiness = new Vector();
- else
- serviceBusiness.removeAllElements();
- Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY);
- // The browser will enforce the rule of having only one business in this list.
- ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
- serviceBusiness.addElement(listElement);
- BusinessEntity be = (BusinessEntity)listElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS,serviceBusiness);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER,be);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,be.getBusinessKey());
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
- removeProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER);
- if (!subQueryInitiated_)
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_BUSINESS"));
- }
- }
-
- if (wsdlURL != null)
- {
- propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,wsdlURL);
- }
-
- if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
-
- if (name != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,name);
-
- if (!subQueryInitiated_ && !Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
-
- if (description != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,description);
-
- return inputsValid;
- }
-
- public final boolean run()
- {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER);
- String businessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL);
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
- String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION);
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- try
- {
- UDDIProxy proxy = regElement.getProxy();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
-
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
- RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
- int currentNodeId = getSelectedNavigatorNode().getNodeId();
- NodeManager nodeManager = regNode_.getNodeManager();
-
- Hashtable tModelsTable = new Hashtable();
- TModel[] tModels = null;
- if (uddi4jHelper.isMonolithicWSDL(def))
- {
- tModels = new TModel[1];
- tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
- }
- else
- {
- String[] imports = uddi4jHelper.getImports(def, wsdlURL);
- tModels = new TModel[imports.length];
- for (int i = 0; i < tModels.length; i++)
- tModels[i] = uddi4jHelper.newTModel(imports[i]);
- }
-
- if (tModels != null)
- {
- for (int i=0;i<tModels.length;i++)
- {
- boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
- if (inputsValid)
- {
- regPublishSIAction.run();
- Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
- if (savedTModel != null)
- {
- tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
- }
- // Reselect the current node.
- nodeManager.setSelectedNodeId(currentNodeId);
- }
- }
- }
-
- BusinessService bs = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
- if (be != null)
- bs.setBusinessKey(be.getBusinessKey());
- else if (businessKey != null)
- bs.setBusinessKey(businessKey);
- bs.setDefaultName(new Name(name));
- bs.setDefaultDescriptionString(description);
- Vector bsVector = new Vector();
- bsVector.add(bs);
- regElement.handlePreInvocation(bs);
- bs = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
- addPublishedItemNode(bs,regElement);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",bs.getDefaultNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("WSDLException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (TransportException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(e.getMessage());
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(e.getMessage());
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java
deleted file mode 100644
index 7fec49200..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.assertion.PublisherAssertion;
-import org.uddi4j.response.CompletionStatus;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-import org.uddi4j.transport.TransportException;
-
-public class RemovePublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
- public RemovePublisherAssertionsAction(Controller controller)
- {
- super(controller);
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- if (registryNode_ == null)
- return false;
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
-
- // ids from uddiObjects_table
- String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (selectedBusIds != null && selectedBusIds.length > 0)
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
- // Synchronize client view and server model (uddiObject_table.jsp)
- synchronizeUDDIObjectTable();
-
- // if not yet logged in, validate the parameters needed to log in
- if (!isLoggedIn_) {
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (!Validator.validateURL(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userID!= null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- }
-
- if (!Validator.validateString(userID))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
- }
-
- // ids from publisher assertion table
- String[] pubAssertionsViewIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
- if (pubAssertionsViewIds == null || pubAssertionsViewIds.length == 0)
- inputsValid = false;
- else
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID, pubAssertionsViewIds);
-
- return inputsValid;
- }
-
- public boolean run()
- {
- if (registryNode_ == null)
- return false;
-
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- if (!(selectedElement instanceof BusinessElement))
- return false;
-
- // if not yet logged in, log in first
- if (!isLoggedIn_) {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- try {
- registryElement.performLogin(publishURL, userID, password);
- }
- catch (TransportException te) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(te.getMessage());
- return false;
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(uddie.toString());
- return false;
- }
- catch (MalformedURLException me) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(me.getMessage());
- return false;
- }
- }
-
- UDDIProxy proxy = registryElement.getProxy();
- registryElement.getUserId();
- registryElement.getCred();
- BusinessElement busElement = (BusinessElement)selectedElement;
- ListManager pubAssertions = busElement.getPublisherAssertions();
-
- // determine whether this is a owned business
- // if not, the AddPublisherAssertionsAction cannot be performed
- if (!isBusinessOwned(busElement)) {
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
- return false;
- }
-
- try {
- String[] pubAssertionViewIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
- Vector pubAssertionVector = new Vector();
- boolean refreshRequired = false;
-
- for (int i = 0; i < pubAssertionViewIds.length; i++) {
- int viewID = Integer.parseInt(pubAssertionViewIds[i]);
- ListElement listElement = pubAssertions.getElementWithViewId(viewID);
- PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)listElement.getObject();
- PublisherAssertion pubAssertion = pubAssertionElement.getPublisherAssertion();
- pubAssertionVector.add(pubAssertion);
- if (pubAssertionElement.getStatus().equals(CompletionStatus.COMPLETE))
- refreshRequired = true;
- }
-
- DispositionReport report = proxy.delete_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
- //report status
- Vector reportErrInfo = report.getResultVector();
- for (int i = 0; i < reportErrInfo.size(); i++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
- }
-
- // refresh is required, refresh the whole publisher assertion table
- if (refreshRequired) {
- ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
- Hashtable propertyTable = showPAAction.getPropertyTable();
- Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (ids != null)
- propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
- showPAAction.run();
- }
- // refresh is not required, delete the selected publisher assertion elements
- else {
- for (int k = 0; k < pubAssertionViewIds.length; k++) {
- pubAssertions.removeElementWithViewId(Integer.parseInt(pubAssertionViewIds[k]));
- }
- }
-
- return report.success();
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- DispositionReport report = uddie.getDispositionReport();
- Vector reportErrInfo = report.getResultVector();
- for (int i = 0; i < reportErrInfo.size(); i++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
- }
- return false;
- }
- catch (Exception e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("Exception");
- messageQueue.addMessage(e.getMessage());
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java
deleted file mode 100644
index e984e2511..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class RemoveSubQueryItemAction extends Action
-{
- private Controller controller_;
-
- public RemoveSubQueryItemAction(Controller controller)
- {
- super();
- controller_ = controller;
- }
-
- // uddi/actions/RemoveSubQueryItemActionJSP.jsp?subQueryKey=...&subQueryListKey=...&subQueryListItemId=...
- public static final String getActionLink(String subQueryKey,String subQueryListKey,int subQueryListItemId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/RemoveSubQueryItemActionJSP.jsp?");
- actionLink.append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_KEY).append('=').append(subQueryListKey);
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_ITEMID).append('=').append(subQueryListItemId);
- return actionLink.toString();
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- String subQueryKey = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryListKey = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_KEY);
- String subQueryListItemId = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_ITEMID);
-
- if (subQueryKey != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_KEY,subQueryKey);
-
- if (subQueryListKey != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_KEY,subQueryListKey);
-
- if (subQueryListItemId != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_ITEMID,subQueryListItemId);
-
- return true;
- }
-
- public boolean run()
- {
- propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY);
- propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY);
- int subQueryListItemId = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_ITEMID));
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node currentNode = navigatorManager.getSelectedNode();
- FormTool formTool = (FormTool)(currentNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY));
- Vector list = (Vector)formToolPI.getProperty((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY));
- list.removeElementAt(subQueryListItemId);
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java
deleted file mode 100644
index 1ede38f0e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ResizeUDDIFramesAction extends ResizeFramesAction
-{
- public ResizeUDDIFramesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- // Save the current frameset sizes.
- String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
- String perspectiveContentFramesetCols = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-
- // Set the new frameset sizes.
- if (frameName.equals(UDDIFrameNames.NAVIGATOR_CONTAINER))
- {
- uddiPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
- uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- if (perspectiveContentFramesetCols.startsWith("100%"))
- {
- // Restore.
- uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
- }
- else
- {
- // Maximize.
- uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- uddiPerspective.setPerspectiveContentFramesetCols("100%,0%");
- }
- }
- else if (frameName.equals(UDDIFrameNames.PROPERTIES_CONTAINER))
- {
- if (actionsContainerFramesetRows.startsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
- uddiPerspective.setActionsContainerFramesetRows(uddiPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- uddiPerspective.setActionsContainerFramesetRows("100%,0%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- else if (frameName.equals(UDDIFrameNames.STATUS_CONTAINER))
- {
- if (actionsContainerFramesetRows.endsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
- uddiPerspective.setActionsContainerFramesetRows(uddiPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- uddiPerspective.setActionsContainerFramesetRows("0%,100%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java
deleted file mode 100644
index 8a165f49f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectCategoryNodeAction extends SelectNodeAction
-{
- public SelectCategoryNodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getCategoryManager());
- }
-
- // uddi/actions/SelectCategoryNodeAction.jsp?sessionId=...&nodeId=...
- public static String getActionLink(String sessionId,int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/SelectCategoryNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final String getActionLinkForHistory()
- {
- // Do not add this action to the history.
- return null;
- }
-
- public final boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- performBaseAction(nodeId);
- return true;
- }
-
- public final String getTreeContentVar()
- {
- return "categoryBrowserWindowContent";
- }
-
- public final String getTreeContentPage()
- {
- return null;
- }
-
- public final String getPropertiesContainerVar()
- {
- return null;
- }
-
- public final String getPropertiesContainerPage()
- {
- return null;
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java
deleted file mode 100644
index cfe477412..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class SelectFindToolAction extends SelectPropertiesToolAction
-{
- protected String subQueryKey_;
- protected boolean toolLinkChanged_;
-
- public SelectFindToolAction(Controller controller)
- {
- super(controller);
- subQueryKey_ = null;
- toolLinkChanged_ = false;
- }
-
- public boolean processLinkParameters(HttpServletRequest request)
- {
- boolean result = super.processLinkParameters(request);
- subQueryKey_ = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
- return result;
- }
-
- // /uddi/actions/SelectFindToolAction.jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...>&subQueryKey=...<&isHistory=1>
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId,String subQueryKey,boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/SelectFindToolActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- {
- actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
- actionLink.append('&').append(ActionInputs.VIEWTOOLID).append('=').append(viewToolId);
- }
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
-
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- public boolean run()
- {
- if (!super.run())
- return false;
- FormTool formTool = (FormTool)(selectedNode_.getCurrentToolManager().getSelectedTool());
- String currentSubQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
- if (subQueryKey_ != null && !subQueryKey_.equals(currentSubQueryKey))
- {
- toolLinkChanged_ = true;
- formTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,subQueryKey_);
- }
- return true;
- }
-
- public boolean requiresViewSelection()
- {
- return toolLinkChanged_;
- }
-
- protected String getActionLinkForHistory()
- {
- int nodeId = selectedNode_.getNodeId();
- int toolId = selectedTool_.getToolId();
- int viewId = selectedNode_.getViewId();
- int viewToolId = selectedNode_.getViewToolId();
- return getActionLink(nodeId,toolId,viewId,viewToolId,subQueryKey_,true);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java
deleted file mode 100644
index 9cbee39f0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class SelectNavigatorNodeAction extends SelectNodeAction
-{
- public SelectNavigatorNodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getNavigatorManager());
- }
-
- // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...<&isHistory=1>
- public static String getActionLink(int nodeId,boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/SelectNavigatorNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- public String getActionLinkForHistory()
- {
- ToolManager toolManager = selectedNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = selectedNode_.getNodeId();
- selectedTool.getToolId();
- selectedNode_.getViewId();
- selectedNode_.getViewToolId();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return selectedTool.getSelectToolActionHref(true);
- else
- return getActionLink(nodeId,true);
- }
-
- public final String getTreeContentVar()
- {
- return "navigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "uddi/navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "propertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "uddi/properties_container.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java
deleted file mode 100644
index b86e157d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectPropertiesToolAction extends SelectNodeToolAction
-{
- public SelectPropertiesToolAction(Controller controller)
- {
- super(controller, controller.getUDDIPerspective().getNavigatorManager());
- }
-
- // /uddi/actions/SelectPropertiesToolAction.jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...><&isHistory=1>
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId,boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/SelectPropertiesToolActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- {
- actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
- actionLink.append('&').append(ActionInputs.VIEWTOOLID).append('=').append(viewToolId);
- }
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- int nodeId = selectedNode_.getNodeId();
- int toolId = selectedTool_.getToolId();
- int viewId = selectedNode_.getViewId();
- int viewToolId = selectedNode_.getViewToolId();
- return getActionLink(nodeId,toolId,viewId,viewToolId,true);
- }
-
- public final String getTreeContentVar()
- {
- return "navigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "uddi/navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "propertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "uddi/properties_container.jsp";
- }
-
- public final String getPropertiesContentVar()
- {
- return "propertiesContent";
- }
-
- public final String getPropertiesContentPage()
- {
- return "uddi/properties_content.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java
deleted file mode 100644
index e7bb5be75..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class SelectSubQueryItemAction extends SelectPropertiesToolAction
-{
- private boolean requiresTreeViewRefresh_;
- private boolean requiresViewSelection_;
- private boolean newUUIDQueryCreated_;
- private String itemName_;
- public SelectSubQueryItemAction(Controller controller)
- {
- super(controller);
- requiresTreeViewRefresh_ = false;
- requiresViewSelection_ = false;
- newUUIDQueryCreated_ = false;
- itemName_ = null;
- }
-
- // /uddi/actions/SelectSubQueryItemAction.jsp?nodeId=...&toolId=...<&viewId=...>&subQueryKey=...&subQueryListKey=...&subQueryListItemId=...&queryItem=...<&isHistory=1>
- public static final String getActionLink(int nodeId,int toolId,int viewId,String subQueryKey,String subQueryListKey,int subQueryListItemId,int queryItem,boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/SelectSubQueryItemActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_KEY).append('=').append(subQueryListKey);
- actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_ITEMID).append('=').append(subQueryListItemId);
- actionLink.append('&').append(UDDIActionInputs.QUERY_ITEM).append('=').append(queryItem);
-
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- public boolean processLinkParameters(HttpServletRequest request)
- {
- boolean result = super.processLinkParameters(request);
- String subQueryKey = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryListKey = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_KEY);
- String subQueryListItemId = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_ITEMID);
- String queryItemString = request.getParameter(UDDIActionInputs.QUERY_ITEM);
-
- if (subQueryKey != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_KEY,subQueryKey);
-
- if (subQueryListKey != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_KEY,subQueryListKey);
-
- if (subQueryListItemId != null)
- propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_ITEMID,subQueryListItemId);
-
- if (queryItemString != null)
- propertyTable_.put(UDDIActionInputs.QUERY_ITEM,queryItemString);
- return result;
- }
-
- private final boolean findByUUID()
- {
- Node currentNode = nodeManager_.getSelectedNode();
- FormTool formTool = (FormTool)(currentNode.getCurrentToolManager().getSelectedTool());
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY));
- Vector list = (Vector)formToolPI.getProperty((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY));
- ListElement listElement = (ListElement)list.elementAt(Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_ITEMID)));
- int queryItem = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_ITEM));
- FindAction findAction = null;
- String uuidKey = null;
- String uuidKeyValue = null;
- switch (queryItem)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- findAction = new RegFindBusinessUUIDAction(controller_);
- uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY;
- BusinessEntity sp = (BusinessEntity)listElement.getObject();
- uuidKeyValue = sp.getBusinessKey();
- itemName_ = sp.getDefaultNameString();
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- findAction = new RegFindServiceUUIDAction(controller_);
- uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY;
- BusinessService bs = (BusinessService)listElement.getObject();
- uuidKeyValue = bs.getServiceKey();
- itemName_ = bs.getDefaultNameString();
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- findAction = new RegFindServiceInterfaceUUIDAction(controller_);
- uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY;
- TModel tModel = (TModel)listElement.getObject();
- uuidKeyValue = tModel.getTModelKey();
- itemName_ = tModel.getNameString();
- }
- Hashtable propertyTable = findAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uuidKeyValue);
- propertyTable.put(uuidKey,uuidKeyValue);
- boolean result = findAction.run();
- if (result)
- {
- Node itemNode = nodeManager_.getSelectedNode();
- int nodeId = itemNode.getNodeId();
- int toolId = itemNode.getToolManager().getSelectedToolId();
- int viewId = ActionInputs.VIEWID_DEFAULT;
- int viewToolId = ActionInputs.VIEWTOOLID_DEFAULT;
- propertyTable_.put(ActionInputs.NODEID,String.valueOf(nodeId));
- propertyTable_.put(ActionInputs.TOOLID,String.valueOf(toolId));
- propertyTable_.put(ActionInputs.VIEWID,String.valueOf(viewId));
- propertyTable_.put(ActionInputs.VIEWTOOLID,String.valueOf(viewToolId));
- super.run();
- requiresTreeViewRefresh_ = true;
- requiresViewSelection_ = true;
- newUUIDQueryCreated_ = true;
- listElement.setTargetViewToolInfo(nodeId,toolId,viewId);
- return true;
- }
- else
- {
- // The item is no longer in the registry.
- return false;
- }
- }
-
- public final String getItemName()
- {
- return itemName_;
- }
-
- public boolean run()
- {
- // Given the nodeId, toolId and viewId, check if the node or view is stale.
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- int toolId = Integer.parseInt((String)propertyTable_.get(ActionInputs.TOOLID));
- int viewId = ActionInputs.VIEWID_DEFAULT;
- try
- {
- viewId = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
- }
- catch (NumberFormatException e)
- {
- }
- int viewToolId = 0;
- if (!isStaleNode(nodeId))
- {
- // Enusre the node is visible.
- requiresTreeViewRefresh_ = makeNodeVisible(nodeManager_.getNode(nodeId));
-
- Node node = nodeManager_.getNode(nodeId);
- if (viewId != ActionInputs.VIEWID_DEFAULT)
- {
- ViewTool viewTool = (ViewTool)(node.getToolManager().getTool(toolId));
- ToolManager elementToolManager = viewTool.getToolManager(viewId);
- if (elementToolManager != null)
- viewToolId = elementToolManager.getSelectedToolId();
- else
- {
- // Stale view
- return findByUUID();
- }
- }
- propertyTable_.put(ActionInputs.VIEWTOOLID,String.valueOf(viewToolId));
- return super.run();
- }
- else
- {
- // Stale node
- return findByUUID();
- }
- }
-
- protected String getActionLinkForHistory()
- {
- int nodeId = selectedNode_.getNodeId();
- int toolId = selectedTool_.getToolId();
- int viewId = selectedNode_.getViewId();
- int viewToolId = selectedNode_.getViewToolId();
- return SelectPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
- }
-
- public boolean requiresTreeViewRefresh()
- {
- return super.requiresTreeViewRefresh()|requiresTreeViewRefresh_;
- }
-
- public boolean requiresViewSelection()
- {
- return super.requiresViewSelection()|requiresViewSelection_;
- }
-
- public boolean requiresStatusUpdate()
- {
- return newUUIDQueryCreated_;
- }
-
- public final String getStatusContentVar()
- {
- return "statusContent";
- }
-
- public final String getStatusContentPage()
- {
- return "uddi/status_content.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java
deleted file mode 100644
index 1995301c9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.NodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class ServiceGetBusinessAction extends NodeAction
-{
- private ServiceNode serviceNode_;
- public ServiceGetBusinessAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getNavigatorManager());
- serviceNode_ = null;
- }
-
- // uddi/actions/ServiceGetBusinessActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceGetBusinessActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean validateService()
- {
- int serviceNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- serviceNode_ = (ServiceNode)nodeManager_.getNode(serviceNodeId);
- ServiceElement serviceElement = (ServiceElement)serviceNode_.getTreeElement();
- RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceElement.getBusinessService().getServiceKey());
- boolean result = verifyAction.run();
- if (result)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
- return result;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
- RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SERVICE_BUSINESS",serviceNode_.getNodeName()));
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,bs.getBusinessKey());
-
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java
deleted file mode 100644
index 336ef1aa7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class ServiceGetServiceInterfacesAction extends UDDINodeAction
-{
- private ServiceNode serviceNode_;
- public ServiceGetServiceInterfacesAction(Controller controller)
- {
- super(controller);
- serviceNode_ = null;
- }
-
- // uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean validateService()
- {
- int serviceNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- serviceNode_ = (ServiceNode)nodeManager_.getNode(serviceNodeId);
- ServiceElement serviceElement = (ServiceElement)serviceNode_.getTreeElement();
- RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceElement.getBusinessService().getServiceKey());
- boolean result = verifyAction.run();
- if (result)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
- return result;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
- RegFindServiceInterfacesAdvancedAction action = new RegFindServiceInterfacesAdvancedAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SERVICE_SERVICE_INTERFACES",serviceNode_.getNodeName()));
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE,Boolean.TRUE);
- ListElement serviceListElement = new ListElement(bs);
- serviceListElement.setTargetViewToolInfo(serviceNode_.getNodeId(),serviceNode_.getToolManager().getSelectedToolId(),serviceNode_.getViewId());
- Vector serviceListVector = new Vector();
- serviceListVector.addElement(serviceListElement);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,serviceListVector);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE,bs);
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java
deleted file mode 100644
index 683b728cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.TModelBag;
-
-public class ServiceInterfaceGetBusinessesAction extends UDDINodeAction
-{
- private ServiceInterfaceNode siNode_;
- public ServiceInterfaceGetBusinessesAction(Controller controller)
- {
- super(controller);
- siNode_ = null;
- }
-
- // uddi/actions/ServiceInterfacGetBusinessesActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean validateServiceInterface()
- {
- int siNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- siNode_ = (ServiceInterfaceNode)nodeManager_.getNode(siNodeId);
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode_.getTreeElement();
- RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,siElement.getTModel().getTModelKey());
- boolean result = verifyAction.run();
- if (result)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
- return result;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- TModel tModel = (TModel)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
- RegFindBusinessesAdvancedAction action = new RegFindBusinessesAdvancedAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SI_BUSINESSES",siNode_.getNodeName()));
-
- ListElement siListElement = new ListElement(tModel);
- siListElement.setTargetViewToolInfo(siNode_.getNodeId(),siNode_.getToolManager().getSelectedToolId(),siNode_.getViewId());
- Vector siListVector = new Vector();
- siListVector.addElement(siListElement);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,siListVector);
-
- Vector tModelKeyStringVector = new Vector();
- tModelKeyStringVector.addElement(tModel.getTModelKey());
- TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG,tModelBag);
-
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java
deleted file mode 100644
index e53a47940..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.ServiceInterfaceNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.TModelBag;
-
-public class ServiceInterfaceGetServicesAction extends UDDINodeAction
-{
- private ServiceInterfaceNode siNode_;
- public ServiceInterfaceGetServicesAction(Controller controller)
- {
- super(controller);
- siNode_ = null;
- }
-
- // uddi/actions/ServiceInterfacGetServicesActionJSP.jsp?nodeId=...
- public static String getActionLink(int nodeId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- return actionLink.toString();
- }
-
- public final boolean validateServiceInterface()
- {
- int siNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- siNode_ = (ServiceInterfaceNode)nodeManager_.getNode(siNodeId);
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode_.getTreeElement();
- RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
- Hashtable propertyTable = verifyAction.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,siElement.getTModel().getTModelKey());
- boolean result = verifyAction.run();
- if (result)
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
- return result;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- TModel tModel = (TModel)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
- RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SI_SERVICES",siNode_.getNodeName()));
-
- ListElement siListElement = new ListElement(tModel);
- siListElement.setTargetViewToolInfo(siNode_.getNodeId(),siNode_.getToolManager().getSelectedToolId(),siNode_.getViewId());
- Vector siListVector = new Vector();
- siListVector.addElement(siListElement);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,siListVector);
-
- Vector tModelKeyStringVector = new Vector();
- tModelKeyStringVector.addElement(tModel.getTModelKey());
- TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG,tModelBag);
-
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java
deleted file mode 100644
index aab8643c5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublisherAssertionElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.response.AssertionStatusItem;
-import org.uddi4j.response.AssertionStatusReport;
-import org.uddi4j.response.CompletionStatus;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.RelatedBusinessInfo;
-import org.uddi4j.response.RelatedBusinessesList;
-import org.uddi4j.response.Result;
-import org.uddi4j.response.SharedRelationships;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.FindQualifiers;
-import org.uddi4j.util.KeyedReference;
-
-public class ShowPublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
-
- protected String subQueryKey_;
- protected boolean isSubQueryGet_;
- protected boolean subQueryInitiated_;
- protected String newSubQuery_;
- protected String newSubQueryItem_;
-
- public ShowPublisherAssertionsAction(Controller controller)
- {
- super(controller);
-
- subQueryKey_ = null;
- isSubQueryGet_ = false;
- subQueryInitiated_ = false;
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- if (registryNode_ == null)
- return false;
-
- // ids from uddiObjects_table
- String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
- if (selectedBusIds != null && selectedBusIds.length > 0)
- propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
-
- newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
- String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
- newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
- subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-
- // Validate the data.
- controller_.getUDDIPerspective();
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.clearErrors();
-
- if (newSubQuery_ != null && newSubQuery_.length() > 0)
- subQueryInitiated_ = true;
- else
- subQueryInitiated_ = false;
-
- if (isSubQueryGetString != null)
- isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
- // if not yet logged in, validate the parameters needed to log in
- // NOTE: This action does NOT require the user to be logged in.
- if (!isLoggedIn_) {
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (userID != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
- }
-
- return true;
- }
-
- public final boolean isSubQueryInitiated()
- {
- return subQueryInitiated_;
- }
-
- public final boolean isSubQueryGet()
- {
- return isSubQueryGet_;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-
- public final String getNewSubQuery()
- {
- return newSubQuery_;
- }
-
- public final String getNewSubQueryItem()
- {
- return newSubQueryItem_;
- }
-
- public boolean run()
- {
- // Synchronize client view and server model (uddiObject_table.jsp)
- synchronizeUDDIObjectTable();
-
- if (registryNode_ == null)
- return false;
-
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- if (!(selectedElement instanceof BusinessElement))
- return false;
-
- // if not yet logged in, log in first
- if (!isLoggedIn_) {
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- try {
- if (Validator.validateURL(publishURL) &&
- Validator.validateString(userID) &&
- password != null) {
- registryElement.performLogin(publishURL, userID, password);
- isLoggedIn_ = registryElement.isLoggedIn();
- }
- }
- catch (TransportException te) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("TransportException");
- messageQueue.addMessage(te.getMessage());
- return false;
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(uddie.toString());
- return false;
- }
- catch (MalformedURLException me) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("MalformedURLException");
- messageQueue.addMessage(me.getMessage());
- return false;
- }
- }
-
- // show all assertion iff is logged in and business is owned
- // else show only completed ones
- BusinessElement busElement = (BusinessElement)selectedElement;
- if (isLoggedIn_ && isBusinessOwned(busElement))
- return showPublisherAssertionsForOwnedBus(busElement);
- else
- return showPublisherAssertionsForNonOwnedBus(busElement);
- }
-
- private boolean showPublisherAssertionsForOwnedBus(BusinessElement busElement) {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- // try to get a list of all publisher assertion based on the current registry's authToken
- ListManager listManager = new ListManager();
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS);
- Vector queryInputVector = new Vector();
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- registryElement.getUserId();
- registryElement.getCred();
-
- // show all publisher assertions
- UDDIProxy proxy = ((RegistryElement)registryNode_.getTreeElement()).getProxy();
- AssertionStatusReport assertionReport;
- try {
- assertionReport = proxy.get_assertionStatusReport(registryElement.getAuthInfoString(), (CompletionStatus)null);
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- DispositionReport report = uddie.getDispositionReport();
- Vector reportErrInfo = report.getResultVector();
- for (int i = 0; i < reportErrInfo.size(); i++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
- }
- return false;
- }
- catch (Exception e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("Exception");
- messageQueue.addMessage(e.getMessage());
- return false;
- }
- Vector assertionVector = assertionReport.getAssertionStatusItemVector();
- Vector otherBusinessKeys = new Vector();
- Vector pubAssertionElements = new Vector();
-
- for (int i = 0; i < assertionVector.size(); i++) {
- AssertionStatusItem assertionItem = (AssertionStatusItem)assertionVector.elementAt(i);
- // determine the from/to business keys
- String fromKey = assertionItem.getFromKey().getText();
- String toKey = assertionItem.getToKey().getText();
- String owningBusinessKey = busElement.getBusinessEntity().getBusinessKey();
- // ignore this assertion if neither the from key nor the to key equals to this business's key
- if (!owningBusinessKey.equals(fromKey) && !owningBusinessKey.equals(toKey))
- continue;
- String otherBusinessKey = ((owningBusinessKey.equals(fromKey)) ? toKey : fromKey);
- // retrieve the information of the "other business"
- otherBusinessKeys.add(otherBusinessKey);
-
- // retrieve the status of the publisher assertion
- String status = assertionItem.getCompletionStatus().getText();
- KeyedReference keyedRef = assertionItem.getKeyedReference();
- PublisherAssertionElement pubAssertionElement = new PublisherAssertionElement(
- fromKey,
- toKey,
- owningBusinessKey,
- null,
- -1,
- status,
- keyedRef);
- pubAssertionElements.add(pubAssertionElement);
- }
- if (otherBusinessKeys.size() > 0) {
- Vector busEntities;
- try {
- busEntities = proxy.get_businessDetail(otherBusinessKeys).getBusinessEntityVector();
- }
- catch (Exception ex) {
- busEntities = new Vector();
- if (otherBusinessKeys.size() > 1) {
- for (int j = 0; j < otherBusinessKeys.size(); j++) {
- try {
- busEntities.add(proxy.get_businessDetail((String)otherBusinessKeys.get(j)).getBusinessEntityVector().get(0));
- }
- catch (Exception exception) {
- pubAssertionElements.remove(j);
- }
- }
- }
- else
- pubAssertionElements.remove(0);
- }
- for (int j = 0; j < busEntities.size(); j++) {
- BusinessEntity be = (BusinessEntity)busEntities.get(j);
- PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)pubAssertionElements.get(j);
- ListElement le = new ListElement(be);
- queryInputVector.add(le);
- int subQueryItemId = queryInputVector.indexOf(le);
- pubAssertionElement.setServiceProvider(le);
- pubAssertionElement.setSubQueryItemId(subQueryItemId);
- listManager.add(new ListElement(pubAssertionElement));
- }
- }
- busElement.setPublisherAssertions(listManager);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS, queryInputVector);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED"));
- return true;
- }
-
- private boolean showPublisherAssertionsForNonOwnedBus(BusinessElement busElement) {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- // try to get a list of publisher assertions based on the business key
- ListManager listManager = new ListManager();
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
- formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS);
- Vector queryInputVector = new Vector();
- UDDIProxy proxy = ((RegistryElement)registryNode_.getTreeElement()).getProxy();
- RelatedBusinessesList relatedBusList;
- try {
- relatedBusList = proxy.find_relatedBusinesses(busElement.getBusinessEntity().getBusinessKey(),
- (KeyedReference)null,
- (FindQualifiers)null);
- }
- catch (UDDIException uddie) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- DispositionReport report = uddie.getDispositionReport();
- Vector reportErrInfo = report.getResultVector();
- for (int i = 0; i < reportErrInfo.size(); i++) {
- messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
- }
- return false;
- }
- catch (Exception e) {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("Exception");
- messageQueue.addMessage(e.getMessage());
- return false;
- }
- Vector relatedBusVector = relatedBusList.getRelatedBusinessInfos().getRelatedBusinessInfoVector();
- Vector otherBusinessKeys = new Vector();
- Vector pubAssertionElements = new Vector();
- for (int i = 0; i < relatedBusVector.size(); i++) {
- RelatedBusinessInfo relatedBusInfo = (RelatedBusinessInfo)relatedBusVector.elementAt(i);
- // determine the from/to business keys
- String fromKey;
- String toKey;
- String owningBusinessKey;
- if (relatedBusInfo.getDefaultSharedRelationships().getDirection().equals(SharedRelationships.DIRECTION_FROMKEY)) {
- fromKey = busElement.getBusinessEntity().getBusinessKey();
- toKey = relatedBusInfo.getBusinessKey();
- owningBusinessKey = fromKey;
- otherBusinessKeys.add(toKey);
- }
- else {
- fromKey = relatedBusInfo.getBusinessKey();
- toKey = busElement.getBusinessEntity().getBusinessKey();
- owningBusinessKey = toKey;
- otherBusinessKeys.add(fromKey);
- }
-
- Vector keyedRefVector = relatedBusInfo.getDefaultSharedRelationships().getKeyedReferenceVector();
- PublisherAssertionElement[] pubAssertionElementArray = new PublisherAssertionElement[keyedRefVector.size()];
- for (int k = 0; k < keyedRefVector.size(); k++) {
- // retrieve the status of the publisher assertion
- String status = CompletionStatus.COMPLETE;
- KeyedReference keyedRef = (KeyedReference)keyedRefVector.elementAt(k);
- PublisherAssertionElement pubAssertionElement = new PublisherAssertionElement(
- fromKey,
- toKey,
- owningBusinessKey,
- null,
- -1,
- status,
- keyedRef);
- pubAssertionElementArray[k] = pubAssertionElement;
- }
- pubAssertionElements.add(pubAssertionElementArray);
- }
- if (otherBusinessKeys.size() > 0) {
- Vector busEntities;
- try {
- busEntities = proxy.get_businessDetail(otherBusinessKeys).getBusinessEntityVector();
- }
- catch (Exception ex) {
- busEntities = new Vector();
- if (otherBusinessKeys.size() > 1) {
- for (int j = 0; j < otherBusinessKeys.size(); j++) {
- try {
- busEntities.add(proxy.get_businessDetail((String)otherBusinessKeys.get(j)).getBusinessEntityVector().get(0));
- }
- catch (Exception exception) {
- pubAssertionElements.remove(j);
- }
- }
- }
- else
- pubAssertionElements.remove(0);
- }
- for (int j = 0; j < busEntities.size(); j++) {
- BusinessEntity be = (BusinessEntity)busEntities.get(j);
- ListElement le = new ListElement(be);
- queryInputVector.add(le);
- int subQueryItemId = queryInputVector.indexOf(le);
- PublisherAssertionElement[] pubAssertionElementArray = (PublisherAssertionElement[])pubAssertionElements.get(j);
- for (int k = 0; k < pubAssertionElementArray.length; k++) {
- pubAssertionElementArray[k].setServiceProvider(le);
- pubAssertionElementArray[k].setSubQueryItemId(subQueryItemId);
- listManager.add(new ListElement(pubAssertionElementArray[k]));
- }
- }
- }
- busElement.setPublisherAssertions(listManager);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS, queryInputVector);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED"));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java
deleted file mode 100644
index e9019b533..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public final class SwitchPerspectiveFromUDDIAction extends ShowPerspectiveAction
-{
- public SwitchPerspectiveFromUDDIAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- String perspectiveContentFramesetCols = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-
- // Save the frameset sizes iff no frame is maximized.
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
- uddiPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-
- if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
- uddiPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-
- return super.run();
- }
-
- public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- StringBuffer formLink = new StringBuffer("uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp?");
- formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
- if (forHistory)
- formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return formLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java
deleted file mode 100644
index 513d36625..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class ToggleCategoryNodeAction extends ToggleNodeAction
-{
- public ToggleCategoryNodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getCategoryManager());
- }
-
- // uddi/actions/ToggleNavigatorNodeAction.jsp?sId=...&nodeId=...&open=...
- public static final String getActionLink(String sessionId,int nodeId,boolean open)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ToggleCategoryNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
- return actionLink.toString();
- }
-
- public final boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- performBaseAction(nodeId);
- return true;
- }
-
- public final String getActionLinkForHistory()
- {
- return null;
- }
-
- public final String getTreeContentVar()
- {
- return "categoryBrowserWindowContent";
- }
-
- public final String getTreeContentPage()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- return OpenCategoryBrowserAction.getCategoryContentPage(controller_.getSessionId(),uddiPerspective.getCategoryTModelKey());
- }
-
- public final String getTreeContainerPage()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- return OpenCategoryBrowserAction.getActionLink(controller_.getSessionId(),uddiPerspective.getCategoryTModelKey());
- }
-
- public final String getPropertiesContainerVar()
- {
- return null;
- }
-
- public final String getPropertiesContainerPage()
- {
- return null;
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java
deleted file mode 100644
index a66d5645f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ToggleNavigatorNodeAction extends ToggleNodeAction
-{
- public ToggleNavigatorNodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getNavigatorManager());
- }
-
- // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...&open=...
- public static String getActionLink(int nodeId,boolean open)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/ToggleNavigatorNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
- return actionLink.toString();
- }
-
- // This should be called only to select the toggled node when, at the time of
- // the collapse event, a descendant node was selected.
- public final String getActionLinkForHistory()
- {
- ToolManager toolManager = toggledNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = toggledNode_.getNodeId();
- int toolId = selectedTool.getToolId();
- int viewId = toggledNode_.getViewId();
- int viewToolId = toggledNode_.getViewToolId();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
- else
- return SelectNavigatorNodeAction.getActionLink(nodeId,true);
- }
-
- public final String getTreeContentVar()
- {
- return "navigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "uddi/navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "propertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "uddi/properties_container.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java
deleted file mode 100644
index fa629313e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.MultipleFormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.SubQueryTransferTarget;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class TransferSubQueryResultsAction extends UDDIPropertiesFormAction
-{
- private Node targetNode_;
- public TransferSubQueryResultsAction(Controller controller)
- {
- super(controller);
- targetNode_ = null;
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
- // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
- propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
- return true;
- }
-
- public static final String getActionLinkForReturn()
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/TransferSubQueryResultsActionJSP.jsp?");
- actionLink.append(UDDIActionInputs.SHOW_RESULTS_TARGET).append("=1");
- return actionLink.toString();
- }
-
- public final void enableShowResultsTarget()
- {
- // This should only be called if the user clicks on the target link on the query results page. Insert a zero element
- // array so that no results are transferred but the jump back to the correct query and its info occurs.
- propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,new String[0]);
- }
-
- public final boolean run()
- {
- // Transfer the results in this Query node into the property expected by the originating node.
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- uddiPerspective.getMessageQueue();
-
- String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
- Node currentNode = getSelectedNavigatorNode();
- TreeElement currentElement = currentNode.getTreeElement();
- SubQueryTransferTarget target = (SubQueryTransferTarget)(currentElement.getPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET));
- String subQueryKey = target.getSubQueryKey();
- String targetQueryKey;
-
- int lastSeparatorPos = subQueryKey.lastIndexOf(':');
- if (lastSeparatorPos == -1)
- targetQueryKey = "";
- else
- targetQueryKey = subQueryKey.substring(0,lastSeparatorPos);
-
- String targetProperty = subQueryKey.substring(lastSeparatorPos+1,subQueryKey.length());
- FormTool targetFormTool = target.getTargetFormTool();
- ((MultipleFormToolPropertiesInterface)targetFormTool).getFormToolProperties(subQueryKey);
- FormToolPropertiesInterface targetQueryFormToolPI = ((MultipleFormToolPropertiesInterface)targetFormTool).getFormToolProperties(targetQueryKey);
- Vector targetList = (Vector)targetQueryFormToolPI.getProperty(targetProperty);
- if (targetList == null)
- targetList = new Vector();
-
- NodeManager nodeManager = currentNode.getNodeManager();
- for (int i=0;i<selectedNodeIds.length;i++)
- {
- int selectedNodeId = Integer.parseInt(selectedNodeIds[i]);
- Node selectedNode = nodeManager.getNode(selectedNodeId);
- TreeElement treeElement = selectedNode.getTreeElement();
- Object object;
- if (treeElement instanceof BusinessElement)
- object = ((BusinessElement)treeElement).getBusinessEntity();
- else if (treeElement instanceof ServiceElement)
- object = ((ServiceElement)treeElement).getBusinessService();
- else
- {
- // Service interface
- object = ((ServiceInterfaceElement)treeElement).getTModel();
- }
- ListElement targetListElement = new ListElement(object);
- targetListElement.setTargetViewToolInfo(selectedNodeId,selectedNode.getToolManager().getSelectedToolId(),selectedNode.getViewId());
- if (targetProperty.equals(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE))
- {
- // Clear the manager so a replacement occurs.
- targetList.removeAllElements();
- }
- targetList.addElement(targetListElement);
- }
- targetQueryFormToolPI.setProperty(targetProperty,targetList);
- Hashtable savedParentQueryProperties = target.getParentQueryData();
- Enumeration e = savedParentQueryProperties.keys();
- while (e.hasMoreElements())
- {
- String key = (String)e.nextElement();
- targetQueryFormToolPI.setProperty(key,savedParentQueryProperties.get(key));
- }
-
- // Select the node and the datastructure which is the target of the subquery.
- int targetNodeId = target.getNodeId();
- int targetToolId = target.getToolId();
- int targetViewId = target.getViewId();
- int targetViewToolId = target.getViewToolId();
- nodeManager.setSelectedNodeId(targetNodeId);
- targetNode_ = nodeManager.getSelectedNode();
- targetNode_.getToolManager().setSelectedToolId(targetToolId);
- targetNode_.setViewId(targetViewId);
- if (targetViewId != ActionInputs.VIEWID_DEFAULT)
- targetNode_.getViewToolManager().setSelectedToolId(targetViewToolId);
- targetFormTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,targetQueryKey);
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,SelectFindToolAction.getActionLink(targetNodeId,targetToolId,targetViewId,targetViewToolId,targetQueryKey,true));
- return true;
- }
-
- public final Node getTargetNode()
- {
- return targetNode_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java
deleted file mode 100644
index 41b5083e0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class TransferToAddCategoryDataAction extends Action
-{
- public TransferToAddCategoryDataAction()
- {
- }
-
- // uddi/actions/TransferToAddCategoryDataActionJSP.jsp?sessionId=...&categoryTModelKey=...
- public static final String getActionLink(String sessionId,String categoryTModelKey)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/TransferToAddCategoryDataActionJSP.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&').append(UDDIActionInputs.CATEGORY_TMODEL_KEY).append('=').append(categoryTModelKey);
- return actionLink.toString();
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public final boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java
deleted file mode 100644
index b99e81b5d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class UDDIAddToWSDLPerspectiveAction extends LinkAction
-{
- public UDDIAddToWSDLPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
- {
- StringBuffer actionLink = new StringBuffer("uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeId);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolId);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewId);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolId);
- return actionLink.toString();
- }
-
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- String nodeIdString = request.getParameter(ActionInputs.NODEID);
- // Perform data validation.
- try
- {
- Integer.parseInt(nodeIdString);
- }
- catch (NumberFormatException e)
- {
- // Validation failed!
- return false;
- }
- propertyTable_.put(ActionInputs.NODEID,nodeIdString);
- return true;
- }
-
- public boolean run()
- {
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager nodeManager = uddiPerspective.getNavigatorManager();
- Node node = nodeManager.getNode(nodeId);
- TreeElement element = node.getTreeElement();
- if (element instanceof ServiceElement)
- {
- ServiceElement serviceElement = (ServiceElement)element;
- BusinessService bs = serviceElement.getBusinessService();
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- String wsdlURL = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
- if (wsdlURL == null)
- {
- try
- {
- Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
- File tempFile = File.createTempFile("temp",".wsdl");
- UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
- action.writeWSDLDefinition(new FileOutputStream(tempFile),def);
- wsdlURL = tempFile.toURL().toString();
- }
- catch (WSDLException e)
- {
- wsdlURL = null;
- }
- catch (MalformedURLException e)
- {
- wsdlURL = null;
- }
- catch (IOException e)
- {
- wsdlURL = null;
- }
- }
-
- if (wsdlURL != null)
- {
- OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
- Hashtable propertyTable = openWSDLAction.getPropertyTable();
- propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
- boolean actionResult = openWSDLAction.run();
- if (actionResult) {
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_WSDL_ADDED_TO_WSDL_PERSPECTIVE",wsdlURL));
- return true;
- }
- }
- }
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_WSDL_NOT_ADDED_TO_WSDL_PERSPECTIVE"));
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIExceptionHandler.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIExceptionHandler.java
deleted file mode 100644
index cffa842e2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIExceptionHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.response.Result;
-
-public class UDDIExceptionHandler {
-
- public static boolean requiresReset(UDDIException e){
-
- DispositionReport dp = e.getDispositionReport();
- Vector rv = dp.getResultVector();
- for(int i = 0;i < rv.size();i++){
- Result result = (Result)rv.get(i);
- if(result.getErrno().equals("10140"))
- return true;
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java
deleted file mode 100644
index bbfdd65eb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDIImportWSDLToFileSystemAction extends ImportToFileSystemAction
-{
- private NodeManager nodeManager_;
- private Definition def_;
- private String defaultWSDLFileName_;
-
- public UDDIImportWSDLToFileSystemAction(Controller controller)
- {
- super(controller);
- nodeManager_ = controller.getUDDIPerspective().getNavigatorManager();
- def_ = null;
- defaultWSDLFileName_ = "temp.wsdl";
- }
-
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
- {
- return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp");
- }
-
- public final boolean write(OutputStream os)
- {
- return writeWSDLDefinition(os,def_);
- }
-
- public final String getDefaultFileName()
- {
- return defaultWSDLFileName_;
- }
-
- public final boolean run()
- {
- MessageQueue messageQueue = controller_.getUDDIPerspective().getMessageQueue();
- int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- Node node = nodeManager_.getNode(nodeId);
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- String wsdlUrl = null;
- if (node != null)
- {
- TreeElement element = node.getTreeElement();
- if (element instanceof ServiceElement)
- {
- ServiceElement serviceElement = (ServiceElement)element;
- BusinessService bs = serviceElement.getBusinessService();
- wsdlUrl = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
- }
- else if (element instanceof ServiceInterfaceElement)
- {
- TModel tModel = ((ServiceInterfaceElement)element).getTModel();
- wsdlUrl = uddi4jHelper.getWSDL(tModel);
- }
- }
- if (wsdlUrl != null)
- {
- try
- {
- def_ = uddi4jHelper.getWSDLDefinition(wsdlUrl);
- if (def_ != null)
- {
- String wsdlPathname;
- int index = wsdlUrl.indexOf('/');
- if (index != -1)
- wsdlPathname = wsdlUrl.substring(index+1, wsdlUrl.length());
- else
- wsdlPathname = wsdlUrl;
- defaultWSDLFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlPathname);
- }
- return true;
- }
- catch (Throwable t)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_RETRIEVING_WSDL_DOC"));
- }
- }
- return false;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getUDDIPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getUDDIPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java
deleted file mode 100644
index 7f823d96f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-public class UDDIImportWSDLToWorkbenchAction extends ImportToWorkbenchAction
-{
- public UDDIImportWSDLToWorkbenchAction(Controller controller)
- {
- super(controller);
- }
-
- public FormTool getSelectedFormTool()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- return (FormTool)uddiPerspective.getNavigatorManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
- }
-
- public ImportToFileSystemAction newImportToFileSystemAction() {
- UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
- Hashtable table = action.getPropertyTable();
-
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- NodeManager nodeManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = nodeManager.getSelectedNode();
-
- table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-
- return action;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getUDDIPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getUDDIPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java
deleted file mode 100644
index 6095284a0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDILaunchWebServiceWizardAction extends LaunchWebServiceWizardAction
-{
- public UDDILaunchWebServiceWizardAction(Controller controller)
- {
- super(controller);
- }
-
- public FormTool getSelectedFormTool()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- return (FormTool)uddiPerspective.getNavigatorManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
- }
-
- public boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager nodeManager = uddiPerspective.getNavigatorManager();
- Node node = nodeManager.getSelectedNode();
- TreeElement element = node.getTreeElement();
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- String wsdlUrl = null;
- if (element instanceof ServiceElement)
- {
- ServiceElement serviceElement = (ServiceElement)element;
- BusinessService bs = serviceElement.getBusinessService();
- wsdlUrl = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
- }
- else if (element instanceof ServiceInterfaceElement)
- {
- TModel tModel = ((ServiceInterfaceElement)element).getTModel();
- wsdlUrl = uddi4jHelper.getWSDL(tModel);
- }
-
- try
- {
- if (wsdlUrl != null)
- {
- Definition def = uddi4jHelper.getWSDLDefinition(wsdlUrl);
- File tempFile = File.createTempFile("temp",".wsdl");
- UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
- action.writeWSDLDefinition(new FileOutputStream(tempFile),def);
- wsdlUrl = tempFile.toURL().toString();
- return launchWizard(wsdlUrl);
- }
- }
- catch (Throwable t)
- {
- messageQueue.addMessage(controller_.getMessage("MSG_ERROR_RETRIEVING_WSDL_DOC"));
- }
- return false;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getUDDIPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getUDDIPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java
deleted file mode 100644
index 9a5892a80..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.NodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-
-public abstract class UDDINodeAction extends NodeAction
-{
- protected RegistryNode regNode_;
- public UDDINodeAction(Controller controller)
- {
- super(controller,controller.getUDDIPerspective().getNavigatorManager());
- regNode_ = getRegistryNode();
- }
-
- public final Node getSelectedNavigatorNode()
- {
- Node selectedNavigatorNode = nodeManager_.getSelectedNode();
- return selectedNavigatorNode;
- }
-
- public final RegistryNode getRegistryNode()
- {
- UDDIMainNode uddiMainNode = (UDDIMainNode)nodeManager_.getRootNode();
- return uddiMainNode.getRegistryNode(getSelectedNavigatorNode());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java
deleted file mode 100644
index 15801dfdb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-
-public abstract class UDDIPropertiesFormAction extends FormAction
-{
- protected NodeManager navigatorManager_;
- public UDDIPropertiesFormAction(Controller controller)
- {
- super(controller);
- navigatorManager_ = controller.getUDDIPerspective().getNavigatorManager();
- }
-
- public final Node getSelectedNavigatorNode()
- {
- return navigatorManager_.getSelectedNode();
- }
-
- public final FormTool getSelectedFormTool()
- {
- return (FormTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
- }
-
- public final RegistryNode getRegistryNode()
- {
- return getRegistryNode(getSelectedNavigatorNode());
- }
-
- public final RegistryNode getRegistryNode(Node registryChildNode)
- {
- UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager_.getRootNode();
- return uddiMainNode.getRegistryNode(registryChildNode);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java
deleted file mode 100644
index 9dc37d37d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.DispositionReport;
-import org.uddi4j.transport.TransportException;
-
-public class UnpublishAction extends UDDIPropertiesFormAction
-{
- protected RegistryNode registryNode_;
- protected boolean isLoggedIn_;
-
- public UnpublishAction(Controller controller)
- {
- super(controller);
- registryNode_ = getRegistryNode();
- }
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- RegistryElement regElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
-
- // if not yet logged in, validate the parameters needed to log in
- if (!regElement.isLoggedIn())
- {
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- boolean inputsValid = true;
- if (publishURL != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL, publishURL);
-
- if (!Validator.validateURL(publishURL))
- {
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- inputsValid = false;
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userId != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-
- if (!Validator.validateString(userId))
- {
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- inputsValid = false;
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD, password);
-
- formTool.updatePropertyTable(propertyTable_);
-
- return inputsValid;
- }
-
- return true;
- }
-
- public boolean run()
- {
-
- RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-
- try
- {
- if (!registryElement.isLoggedIn())
- {
- // if not yet logged in, log in first
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
- registryElement.performLogin(publishURL,userId,password);
- }
-
- String selectedElementKey = selectedElement.getKey();
- String unpublishTypeMessageKey = null;
- UDDIProxy proxy = registryElement.getProxy();
- String authInfo = registryElement.getAuthInfoString();
- DispositionReport dr = null;
- if (selectedElement instanceof BusinessElement)
- {
- unpublishTypeMessageKey = "MSG_INFO_BUSINESS_UNPUBLISHED";
- dr = proxy.delete_business(authInfo,selectedElementKey);
- }
- else if (selectedElement instanceof ServiceElement)
- {
- unpublishTypeMessageKey = "MSG_INFO_SERVICE_UNPUBLISHED";
- dr = proxy.delete_service(authInfo,selectedElementKey);
- }
- else if (selectedElement instanceof ServiceInterfaceElement)
- {
- unpublishTypeMessageKey = "MSG_INFO_SERVICE_INTERFACE_UNPUBLISHED";
- dr = proxy.delete_tModel(authInfo,selectedElementKey);
- }
- if (!dr.success())
- throw new Exception(dr.toString());
- else
- {
- selectedElement.disconnectAll();
- messageQueue.addMessage(uddiPerspective.getMessage(unpublishTypeMessageKey,selectedElement.getName()));
- return true;
- }
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- return false;
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e))
- registryElement.setDefaults();
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- return false;
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- return false;
- }
- catch (Exception e)
- {
- handleUnexpectedException(uddiPerspective, messageQueue, "Exception", e);
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java
deleted file mode 100644
index 62e466aea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.PublishedItemsNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public abstract class UpdateAction extends UDDIPropertiesFormAction
-{
- protected RegistryNode regNode_;
- private boolean requiresAuthentication_;
- public UpdateAction(Controller controller,boolean requiresAuthentication)
- {
- super(controller);
- regNode_ = getRegistryNode();
- requiresAuthentication_ = requiresAuthentication;
- }
-
- protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-
- protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- // Setup for MultipartFormDataParserTransformer
- propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
-
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- FormTool formTool = getSelectedFormTool();
- FormToolPropertiesInterface formToolPI = formTool;
- formToolPI.clearErrors();
- boolean inputsValid = processOthers(parser,formToolPI);
- for (int i=0;i<removedProperties_.size();i++)
- formToolPI.removeProperty(removedProperties_.elementAt(i));
- formToolPI.updatePropertyTable(propertyTable_);
-
- String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-
- boolean validateAuthentication = !regElement.isLoggedIn() & requiresAuthentication_;
-
- if (publishURL != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- }
-
- if (validateAuthentication && !Validator.validateString(publishURL))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
- }
-
- if (userId != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- }
-
- if (validateAuthentication && !Validator.validateString(userId))
- {
- inputsValid = false;
- formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
- }
-
- if (password != null)
- {
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-
- return inputsValid;
- }
-
- public abstract boolean refreshFromRegistry();
-
- protected final void refreshNode(BusinessEntity be)
- {
- Node node = getSelectedNavigatorNode();
- Node parentNode = node.getParent();
- TreeElement element = node.getTreeElement();
- element.disconnectAll();
- BusinessElement newBusinessElement = new BusinessElement(be,regNode_.getTreeElement().getModel());
- connectElements(parentNode,newBusinessElement);
- }
-
- protected final void refreshNode(BusinessService bs)
- {
- Node node = getSelectedNavigatorNode();
- Node parentNode = node.getParent();
- TreeElement element = node.getTreeElement();
- element.disconnectAll();
- ServiceElement newServiceElement = new ServiceElement(bs,regNode_.getTreeElement().getModel());
- connectElements(parentNode,newServiceElement);
- }
-
- protected final void refreshNode(TModel tModel)
- {
- Node node = getSelectedNavigatorNode();
- Node parentNode = node.getParent();
- TreeElement element = node.getTreeElement();
- element.disconnectAll();
- ServiceInterfaceElement newServiceInterfaceElement = new ServiceInterfaceElement(tModel,regNode_.getTreeElement().getModel());
- connectElements(parentNode,newServiceInterfaceElement);
- }
-
- private final void connectElements(Node parentNode,TreeElement newElement)
- {
- TreeElement parentElement = parentNode.getTreeElement();
- String rel = null;
- if (parentNode instanceof PublishedItemsNode)
- rel = UDDIModelConstants.REL_PUBLISHED_ITEMS;
- else
- {
- // QueryNode
- rel = UDDIModelConstants.REL_QUERY_RESULTS;
- }
- parentElement.connect(newElement,rel,ModelConstants.REL_OWNER);
- Node newNode = parentNode.getChildNode(newElement);
- int newNodeId = newNode.getNodeId();
- NodeManager nodeManager = parentNode.getNodeManager();
- nodeManager.setSelectedNodeId(newNodeId);
- ToolManager toolManager = newNode.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
- }
-
- protected final void reindexListElementVector(Vector v)
- {
- for (int i=0;i<v.size();i++)
- {
- ListElement listElement = (ListElement)v.elementAt(i);
- listElement.setViewId(i);
- // targetViewId determines whether or not a successfully validated list element remains in edit state.
- }
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
- return transformers;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java
deleted file mode 100644
index 7b51d034d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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:
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class UpdateBusinessAction extends UpdateAction
-{
- private boolean isUpdate_;
- public UpdateBusinessAction(Controller controller)
- {
- super(controller,true);
- isUpdate_ = true;
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- String[] discoveryURLModifiedStates = parser.getParameterValues(UDDIActionInputs.DISCOVERYURL_MODIFIED);
- String[] discoveryURLViewIds = parser.getParameterValues(UDDIActionInputs.DISCOVERYURL_VIEWID);
- String[] discoveryURLs = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
- String[] nameModifiedStates = parser.getParameterValues(UDDIActionInputs.NAME_MODIFIED);
- String[] nameViewIds = parser.getParameterValues(UDDIActionInputs.NAME_VIEWID);
- String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
- String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] idModifiedStates = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_MODIFIED);
- String[] idViewIds = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_VIEWID);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
- String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
-
-
- if (discoveryURLModifiedStates != null && discoveryURLViewIds != null && discoveryURLs != null)
- {
- Vector oldDiscoveryURLListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
- Vector newDiscoveryURLListElementVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL");
- for (int i=0;i<discoveryURLs.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- DiscoveryURL discoveryURL = new DiscoveryURL(discoveryURLs[i],"");
- if (!Validator.validateURL(discoveryURLs[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int discoveryURLViewId = Integer.parseInt(discoveryURLViewIds[i]);
- boolean isModified = Boolean.valueOf(discoveryURLModifiedStates[i]).booleanValue();
-
- if (discoveryURLViewId == -1 || isModified)
- newDiscoveryURLListElementVector.addElement(new ListElement(discoveryURL));
- else
- newDiscoveryURLListElementVector.addElement(oldDiscoveryURLListElementVector.elementAt(discoveryURLViewId));
- }
- reindexListElementVector(newDiscoveryURLListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,newDiscoveryURLListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
- Hashtable languageHash = new Hashtable();
- if (nameModifiedStates != null && nameViewIds != null && nameLanguages != null && names != null)
- {
- Vector oldNameListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- Vector newNameListElementVector = new Vector();
- // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
- // 1) Only the first row can have a blank language.
- // 2) Only 1 name per language.
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
- for (int i=0;i<names.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Name uddi4jName;
- if (nameLanguages[i].length() > 0)
- uddi4jName = new Name(names[i],nameLanguages[i]);
- else
- {
- uddi4jName = new Name(names[i]);
- if (i != 0)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(nameLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(nameLanguages[i],Boolean.TRUE);
- if (!Validator.validateString(names[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int nameViewId = Integer.parseInt(nameViewIds[i]);
- boolean isModified = Boolean.valueOf(nameModifiedStates[i]).booleanValue();
-
- if (nameViewId == -1 || isModified)
- newNameListElementVector.addElement(new ListElement(uddi4jName));
- else
- newNameListElementVector.addElement(oldNameListElementVector.elementAt(nameViewId));
- }
- reindexListElementVector(newNameListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,newNameListElementVector);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
- }
-
- if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
- {
- Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
- Vector newDescriptionListElementVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (!Validator.validateString(descriptions[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
- boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-
- if (descriptionViewId == -1 || isModified)
- newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
- else
- newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
- }
- reindexListElementVector(newDescriptionListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,newDescriptionListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-
- if (idModifiedStates != null && idViewIds != null && idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- Vector oldIdListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- Vector newIdListElementVector = new Vector();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- int idViewId = Integer.parseInt(idViewIds[i]);
- boolean isModified = Boolean.valueOf(idModifiedStates[i]).booleanValue();
- if (idViewId == -1 || isModified)
- newIdListElementVector.addElement(new ListElement(kr));
- else
- newIdListElementVector.addElement(oldIdListElementVector.elementAt(idViewId));
- }
- reindexListElementVector(newIdListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,newIdListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-
- if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- Vector newCatListElementVector = new Vector();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- int catViewId = Integer.parseInt(catViewIds[i]);
- boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
- if (catViewId == -1 || isModified)
- newCatListElementVector.addElement(new ListElement(kr));
- else
- newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
- }
- reindexListElementVector(newCatListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,newCatListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
- return inputsValid;
- }
-
- public final boolean refreshFromRegistry()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- uddiPerspective.getMessageQueue();
- try
- {
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- Vector beVector = proxy.get_businessDetail(uuidKey).getBusinessEntityVector();
- BusinessEntity be;
- if (beVector.size() > 0)
- be = (BusinessEntity)beVector.get(0);
- else
- be = null;
- if (be != null)
- {
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,be);
- return true;
- }
- }
- catch (TransportException e)
- {
- // Feedback via Javascript popups.
- }
- catch (UDDIException e)
- {
- // Feedback via Javascript popups.
- }
- isUpdate_ = false;
- return false;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- Vector discoveryURLListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
- Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
- Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
- Vector idListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
- Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-
- Vector discoveryURLVector = new Vector();
- if (discoveryURLListElementVector != null)
- {
- for (int i=0;i<discoveryURLListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)discoveryURLListElementVector.elementAt(i);
- DiscoveryURL discoveryURL = (DiscoveryURL)listElement.getObject();
- discoveryURLVector.addElement(discoveryURL);
- }
- }
-
- Vector nameVector = new Vector();
- for (int i=0;i<nameListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
- Name name = (Name)listElement.getObject();
- nameVector.addElement(name);
- }
-
- Vector descriptionVector = null;
- if (descriptionListElementVector != null)
- {
- descriptionVector = new Vector();
- for (int i=0;i<descriptionListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- descriptionVector.addElement(description);
- }
- }
-
- IdentifierBag idBag = null;
- if (idListElementVector != null)
- {
- idBag = new IdentifierBag();
- for (int i=0;i<idListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)idListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- idBag.add(kr);
- }
- }
-
- CategoryBag catBag = null;
- if (catListElementVector != null)
- {
- catBag = new CategoryBag();
- for (int i=0;i<catListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)catListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- catBag.add(kr);
- }
- }
-
- if (discoveryURLVector.size() > 0)
- be.setDiscoveryURLs(new DiscoveryURLs(discoveryURLVector));
- else
- be.setDiscoveryURLs(null);
- be.setNameVector(nameVector);
- be.setDescriptionVector(descriptionVector);
- be.setIdentifierBag(idBag);
- be.setCategoryBag(catBag);
-
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
- Vector beVector = new Vector();
- beVector.add(be);
- be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
- refreshNode(be);
- if (isUpdate_)
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_UPDATED",be.getDefaultNameString()));
- else
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
- return true;
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e)){
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- regElement.setDefaults();
- }
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java
deleted file mode 100644
index 0f6f173cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.text.ParseException;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-
-public class UpdateRegistryAction extends UpdateAction
-{
- public UpdateRegistryAction(Controller controller)
- {
- super(controller,false);
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String nameModifiedState = parser.getParameter(UDDIActionInputs.NAME_MODIFIED);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
- String[] userDefinedCategoryTModelKeys = parser.getParameterValues(UDDIActionInputs.CATEGORY_TMODEL_KEY);
- String[] userDefinedCategoryData = parser.getParameterValues(UDDIActionInputs.CATEGORY_FILENAME);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (nameModifiedState != null && name != null)
- {
- boolean isModified = Boolean.valueOf(nameModifiedState).booleanValue();
- String newName;
- if (isModified)
- newName = name;
- else
- newName = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME,newName);
- if (!Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-
- if (userDefinedCategoryTModelKeys != null && userDefinedCategoryData != null)
- {
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- for (int i=0;i<userDefinedCategoryTModelKeys.length;i++)
- {
- CategoryModel userDefinedCategory = regElement.getUserDefinedCategory(userDefinedCategoryTModelKeys[i]);
-// TODO: Move UDDIPreferenceContext down to org.eclipse.wst.ws
-// UDDIPreferenceContext context = WebServicePlugin.getInstance().getUDDIPreferenceContext();
-// userDefinedCategory.setColumnDelimiter(context.getUddiCatDataColumnDelimiter());
-// userDefinedCategory.setStringDelimiter(context.getUddiCatDataStringDelimiter());
- userDefinedCategory.setColumnDelimiter("#");
- userDefinedCategory.setStringDelimiter("\"");
- String displayName = userDefinedCategory.getDisplayName();
- if (userDefinedCategoryData[i] == null || userDefinedCategoryData[i].length() < 1)
- {
- inputsValid = false;
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE",displayName));
- formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);
- }
- else
- {
- byte rc = userDefinedCategory.loadData(new BufferedReader(new StringReader(userDefinedCategoryData[i])));
- switch (rc)
- {
- case CategoryModel.OPERATION_SUCCESSFUL:
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_USER_DEFINED_CATEGORY_DATA_LOADED",displayName));
- break;
- case CategoryModel.ERROR_FILE:
- inputsValid = false;
- ParseException pe = (ParseException)userDefinedCategory.getErrorException();
- String[] args1 = {String.valueOf(pe.getErrorOffset()),displayName,pe.getMessage(),userDefinedCategory.getCategoryKey()};
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_FORMAT",args1));
- formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);
- break;
- case CategoryModel.ERROR_CATEGORY_KEY:
- default:
- inputsValid = false;
- String[] args2 = {displayName,userDefinedCategory.getErrorException().getMessage(),userDefinedCategory.getCategoryKey()};
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_KEY",args2));
- formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);
- }
- }
- }
- }
- return inputsValid;
- }
-
- public final boolean refreshFromRegistry()
- {
- return true;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- regElement.setName(name);
- regNode_.getTreeElement().setName(name);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_REGISTRY_UPDATED",name));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java
deleted file mode 100644
index aaabfb66a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegPublishTool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.Name;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.ServiceDetail;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-public class UpdateServiceAction extends UpdateAction
-{
- private boolean isUpdate_;
- public UpdateServiceAction(Controller controller)
- {
- super(controller,true);
- isUpdate_ = true;
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidBusinessKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- String uuidServiceKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
- String wsdlURLModifiedState = parser.getParameter(UDDIActionInputs.WSDL_URL_MODIFIED);
- String wsdlURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- String[] nameModifiedStates = parser.getParameterValues(UDDIActionInputs.NAME_MODIFIED);
- String[] nameViewIds = parser.getParameterValues(UDDIActionInputs.NAME_VIEWID);
- String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
- String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
- String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
- String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
- String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidBusinessKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidBusinessKey);
-
- if (uuidServiceKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidServiceKey);
-
- if (wsdlURLModifiedState != null && wsdlURL != null)
- {
- ListElement wsdlURLListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- boolean isModified = Boolean.valueOf(wsdlURLModifiedState).booleanValue();
- if (isModified)
- wsdlURLListElement = new ListElement(wsdlURL);
- else
- wsdlURL = (String)wsdlURLListElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,wsdlURLListElement);
- if (!Validator.validateURL(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-
- Hashtable languageHash = new Hashtable();
- if (nameModifiedStates != null && nameViewIds != null && nameLanguages != null && names != null)
- {
- Vector oldNameListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- Vector newNameListElementVector = new Vector();
- // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
- // 1) Only the first row can have a blank language.
- // 2) Only 1 name per language.
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
- for (int i=0;i<names.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Name uddi4jName;
- if (nameLanguages[i].length() > 0)
- uddi4jName = new Name(names[i],nameLanguages[i]);
- else
- {
- uddi4jName = new Name(names[i]);
- if (i != 0)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(nameLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(nameLanguages[i],Boolean.TRUE);
- if (!Validator.validateString(names[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int nameViewId = Integer.parseInt(nameViewIds[i]);
- boolean isModified = Boolean.valueOf(nameModifiedStates[i]).booleanValue();
-
- if (nameViewId == -1 || isModified)
- newNameListElementVector.addElement(new ListElement(uddi4jName));
- else
- newNameListElementVector.addElement(oldNameListElementVector.elementAt(nameViewId));
- }
- reindexListElementVector(newNameListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,newNameListElementVector);
- }
- else
- {
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
- }
-
- if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
- {
- Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- Vector newDescriptionListElementVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (!Validator.validateString(descriptions[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
- boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-
- if (descriptionViewId == -1 || isModified)
- newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
- else
- newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
- }
- reindexListElementVector(newDescriptionListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,newDescriptionListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-
- if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
- Vector newCatListElementVector = new Vector();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- int catViewId = Integer.parseInt(catViewIds[i]);
- boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
- if (catViewId == -1 || isModified)
- newCatListElementVector.addElement(new ListElement(kr));
- else
- newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
- }
- reindexListElementVector(newCatListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,newCatListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
- return inputsValid;
- }
-
- public final boolean refreshBusinessFromRegistry()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- uddiPerspective.getMessageQueue();
- try
- {
- String uuidBusinessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- Vector beVector = proxy.get_businessDetail(uuidBusinessKey).getBusinessEntityVector();
- BusinessEntity be;
- if (beVector.size() > 0)
- be = (BusinessEntity)beVector.get(0);
- else
- be = null;
- if (be != null)
- {
- propertyTable_.put(UDDIActionInputs.LATEST_BUSINESS,be);
- return true;
- }
- }
- catch (TransportException e)
- {
- // Feedback via Javascript popups.
- }
- catch (UDDIException e)
- {
- // Feedback via Javascript popups.
- }
- return false;
- }
-
- public final boolean refreshFromRegistry()
- {
- controller_.getUDDIPerspective();
- try
- {
- String uuidServiceKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- ServiceDetail serviceDetail = proxy.get_serviceDetail(uuidServiceKey);
- Vector businessServiceVector = serviceDetail.getBusinessServiceVector();
- if (businessServiceVector.size() > 0)
- {
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,businessServiceVector.elementAt(0));
- return true;
- }
- }
- catch (UDDIException e)
- {
- // Feedback via Javascript popups.
- }
- catch (TransportException e)
- {
- // Feedback via Javascript popups.
- }
- isUpdate_ = false;
- return false;
- }
-
- public final RegPublishTool setupRegPublishTool()
- {
- // Prepare for re-publishing a now-stale service whose business has also been eliminated.
- RegPublishTool regPublishTool = regNode_.getRegPublishTool();
- regPublishTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
- regPublishTool.setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- regPublishTool.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
-
- regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL));
-
- Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- Vector nameVector = new Vector();
- for (int i=0;i<nameListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
- Name name = (Name)listElement.getObject();
- nameVector.addElement(name);
- }
-
- Vector descriptionVector = null;
- if (descriptionListElementVector != null)
- {
- descriptionVector = new Vector();
- for (int i=0;i<descriptionListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- descriptionVector.addElement(description);
- }
- }
- else
- regPublishTool.removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-
- CategoryBag catBag = null;
- if (catListElementVector != null)
- {
- catBag = new CategoryBag();
- for (int i=0;i<catListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)catListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- catBag.add(kr);
- }
- }
- else
- regPublishTool.removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
- if (descriptionVector != null)
- regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
- if (catBag != null)
- regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
- return regPublishTool;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- try
- {
- BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_BUSINESS);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- String uuidServiceKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
- ListElement wsdlURLListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
- Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
- Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
- String wsdlURL = (String)wsdlURLListElement.getObject();
-
- Vector nameVector = new Vector();
- for (int i=0;i<nameListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
- Name name = (Name)listElement.getObject();
- nameVector.addElement(name);
- }
-
- Vector descriptionVector = null;
- if (descriptionListElementVector != null)
- {
- descriptionVector = new Vector();
- for (int i=0;i<descriptionListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- descriptionVector.addElement(description);
- }
- }
-
- CategoryBag catBag = null;
- if (catListElementVector != null)
- {
- catBag = new CategoryBag();
- for (int i=0;i<catListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)catListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- catBag.add(kr);
- }
- }
-
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
-
- // Note: The JSP will prevent this routine from executing if be is null.
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-
- // Publish/update the service interfaces first.
- RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
- int currentNodeId = getSelectedNavigatorNode().getNodeId();
- NodeManager nodeManager = regNode_.getNodeManager();
-
- Hashtable tModelsTable = new Hashtable();
- TModel[] tModels = null;
- if (uddi4jHelper.isMonolithicWSDL(def))
- {
- tModels = new TModel[1];
- tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
- }
- else
- {
- String[] imports = uddi4jHelper.getImports(def, wsdlURL);
- tModels = new TModel[imports.length];
- for (int i = 0; i < tModels.length; i++)
- tModels[i] = uddi4jHelper.newTModel(imports[i]);
- }
-
- if (tModels != null)
- {
- for (int i=0;i<tModels.length;i++)
- {
- boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
- if (inputsValid)
- {
- regPublishSIAction.run();
- Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
- if (savedTModel != null)
- {
- tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
- }
- // Reselect the current node.
- nodeManager.setSelectedNodeId(currentNodeId);
- }
- }
- }
-
- BusinessService busService = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
- if (isUpdate_)
- busService.setServiceKey(uuidServiceKey);
- busService.setBusinessKey(be.getBusinessKey());
- busService.setNameVector(nameVector);
- busService.setDescriptionVector(descriptionVector);
- busService.setCategoryBag(catBag);
- regElement.handlePreInvocation(busService);
- Vector bsVector = new Vector();
- bsVector.add(busService);
- busService = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
- refreshNode(busService);
- if (isUpdate_)
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_UPDATED",busService.getDefaultNameString()));
- else
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",busService.getDefaultNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"WSDLException",e);
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e))
- regElement.setDefaults();
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java
deleted file mode 100644
index b8456b253..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import java.net.MalformedURLException;
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.KeyedReference;
-
-public class UpdateServiceInterfaceAction extends UpdateAction
-{
- private boolean isUpdate_;
- public UpdateServiceInterfaceAction(Controller controller)
- {
- super(controller,true);
- isUpdate_ = true;
- }
-
- protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
- {
- String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
- String wsdlURLModifiedState = parser.getParameter(UDDIActionInputs.WSDL_URL_MODIFIED);
- String wsdlURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- String nameModifiedState = parser.getParameter(UDDIActionInputs.NAME_MODIFIED);
- String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
- String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
- String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
- String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
- String[] idModifiedStates = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_MODIFIED);
- String[] idViewIds = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_VIEWID);
- String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
- String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
- String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
- String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
- String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
- String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
- String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
- String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
- boolean inputsValid = true;
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
- if (uuidKey != null)
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
-
- if (wsdlURLModifiedState != null && wsdlURL != null)
- {
- ListElement wsdlURLListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- boolean isModified = Boolean.valueOf(wsdlURLModifiedState).booleanValue();
- if (isModified)
- wsdlURLListElement = new ListElement(wsdlURL);
- else
- wsdlURL = (String)wsdlURLListElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,wsdlURLListElement);
- if (!Validator.validateURL(wsdlURL))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
- }
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-
- if (nameModifiedState != null && name != null)
- {
- ListElement nameListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- boolean isModified = Boolean.valueOf(nameModifiedState).booleanValue();
- if (isModified)
- nameListElement = new ListElement(name);
- else
- name = (String)nameListElement.getObject();
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,nameListElement);
- if (!Validator.validateString(name))
- {
- inputsValid = false;
- formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
- }
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-
- Hashtable languageHash = new Hashtable();
- if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
- {
- Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
- Vector newDescriptionListElementVector = new Vector();
- String[] parameters = new String[2];
- parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
- languageHash.clear();
- for (int i=0;i<descriptions.length;i++)
- {
- parameters[1] = String.valueOf(i+1);
- Description uddi4jDescription;
- if (descriptionLanguages[i].length() > 0)
- uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
- else
- {
- uddi4jDescription = new Description(descriptions[i]);
- if (i != 0)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
- }
- }
- if (languageHash.get(descriptionLanguages[i]) != null)
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
- }
- else
- languageHash.put(descriptionLanguages[i],Boolean.TRUE);
- if (!Validator.validateString(descriptions[i]))
- {
- inputsValid = false;
- formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
- }
-
- int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
- boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-
- if (descriptionViewId == -1 || isModified)
- newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
- else
- newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
- }
- reindexListElementVector(newDescriptionListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,newDescriptionListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-
- if (idModifiedStates != null && idViewIds != null && idTypes != null && idKeyNames != null && idKeyValues != null)
- {
- Vector oldIdListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- Vector newIdListElementVector = new Vector();
- for (int i=0;i<idKeyNames.length;i++)
- {
- KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
- int idViewId = Integer.parseInt(idViewIds[i]);
- boolean isModified = Boolean.valueOf(idModifiedStates[i]).booleanValue();
- if (idViewId == -1 || isModified)
- newIdListElementVector.addElement(new ListElement(kr));
- else
- newIdListElementVector.addElement(oldIdListElementVector.elementAt(idViewId));
- }
- reindexListElementVector(newIdListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,newIdListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-
- if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
- {
- Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
- Vector newCatListElementVector = new Vector();
- for (int i=0;i<catTypes.length;i++)
- {
- KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
- int catViewId = Integer.parseInt(catViewIds[i]);
- boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
- if (catViewId == -1 || isModified)
- newCatListElementVector.addElement(new ListElement(kr));
- else
- newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
- }
- reindexListElementVector(newCatListElementVector);
- propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,newCatListElementVector);
- }
- else
- removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
- return inputsValid;
- }
-
- public final boolean refreshFromRegistry()
- {
- controller_.getUDDIPerspective();
- try
- {
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- UDDIProxy proxy = regElement.getProxy();
- TModelDetail tModelDetail = proxy.get_tModelDetail(uuidKey);
- Vector tModelVector = tModelDetail.getTModelVector();
- if (tModelVector.size() > 0)
- {
- propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,tModelVector.elementAt(0));
- return true;
- }
- }
- catch (UDDIException e)
- {
- // Feedback via Javascript popups.
- }
- catch (TransportException e)
- {
- // Feedback via Javascript popups.
- }
- isUpdate_ = false;
- return false;
- }
-
- public final boolean run()
- {
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- MessageQueue messageQueue = uddiPerspective.getMessageQueue();
- try
- {
- String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
- String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
- String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
- String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
- ListElement wsdlURLListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- ListElement nameListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
- Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
- Vector idListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
- Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
- String wsdlURL = (String)wsdlURLListElement.getObject();
-
- String name = (String)nameListElement.getObject();
-
- Vector descriptionVector = null;
- if (descriptionListElementVector != null)
- {
- descriptionVector = new Vector();
- for (int i=0;i<descriptionListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
- Description description = (Description)listElement.getObject();
- descriptionVector.addElement(description);
- }
- }
-
- IdentifierBag idBag = null;
- if (idListElementVector != null)
- {
- idBag = new IdentifierBag();
- for (int i=0;i<idListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)idListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- idBag.add(kr);
- }
- }
-
- CategoryBag catBag = null;
- if (catListElementVector != null)
- {
- catBag = new CategoryBag();
- for (int i=0;i<catListElementVector.size();i++)
- {
- ListElement listElement = (ListElement)catListElementVector.elementAt(i);
- KeyedReference kr = (KeyedReference)listElement.getObject();
- catBag.add(kr);
- }
- }
-
- TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
- if (isUpdate_)
- tModel.setTModelKey(uuidKey);
- tModel.setName(name);
- tModel.setDescriptionVector(descriptionVector);
- tModel.setIdentifierBag(idBag);
- tModel.setCategoryBag(catBag);
-
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- if (!regElement.isLoggedIn())
- regElement.performLogin(publishURL,userId,password);
- UDDIProxy proxy = regElement.getProxy();
- Vector tModelVector = new Vector();
- tModelVector.add(tModel);
- tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
- refreshNode(tModel);
- if (isUpdate_)
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_UPDATED",tModel.getNameString()));
- else
- messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
- return true;
- }
- catch (WSDLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"WSDLException",e);
- }
- catch (TransportException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
- }
- catch (UDDIException e)
- {
- if(UDDIExceptionHandler.requiresReset(e)){
- RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
- regElement.setDefaults();
- }
- messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
- messageQueue.addMessage("UDDIException");
- messageQueue.addMessage(e.toString());
- }
- catch (MalformedURLException e)
- {
- handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java
deleted file mode 100644
index f47b2b09c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.constants;
-
-public class UDDIActionInputs
-{
- // OpenRegistryAction
- public static final String REGISTRY_NAME = "registryName";
- public static final String INQUIRY_URL = "inquiryURL";
- public static final String PUBLISH_URL = "publishURL";
- public static final String REGISTRATION_URL = "registrationURL";
- public static final String CHECK_USER_DEFINED_CATEGORIES = "checkUserDefinedCategories";
- public static final String UDDI_USERNAME = "uddiUsername";
- public static final String UDDI_PASSWORD = "uddiPassword";
-
- // Fixed and user-defined categories
- public static final String CATEGORIES_DIRECTORY = "categoriesDirectory";
- public static final String CATEGORY_TMODEL_KEY = "categoryTModelKey";
- public static final String CATEGORY_FILENAME = "categoryFileName";
- public static final String USER_DEFINED_CATEGORIES = "userDefinedCategories";
-
- // Discovery URL use type
- public static final String DISCOVERY_URL_TYPE = "businessEntity";
-
- // Results (NODEID)
- public static final String NODEID_SERVICE_INTERFACE = "nodeId_ServiceInterface";
- public static final String NODEID_SERVICE = "nodeId_Service";
- public static final String NODEID_BUSINESS = "nodeId_Business";
-
- // RegFind..Actions/RegPublish..Actions
- public static final String QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE = "overrideAddQueryNode";
- public static final String QUERY_NAME = "queryName";
- public static final String QUERY_ITEM = "queryItem";
- public static final int QUERY_ITEM_QUERIES = -1;
- public static final int QUERY_ITEM_BUSINESSES = 0;
- public static final int QUERY_ITEM_SERVICES = 1;
- public static final int QUERY_ITEM_SERVICE_INTERFACES = 2;
- public static final int QUERY_STYLE_SIMPLE = 0;
- public static final int QUERY_STYLE_ADVANCED = 1;
- public static final int QUERY_STYLE_UUID = 2;
- public static final String QUERY_INPUT_ADVANCED_OWNED = "advancedOwned";
- public static final String QUERY_INPUT_ADVANCED_PUBLISH_URL = "advancedPublishURL";
- public static final String QUERY_INPUT_ADVANCED_USERID = "advancedUserId";
- public static final String QUERY_INPUT_ADVANCED_PASSWORD = "advancedPassword";
- public static final String QUERY_INPUT_ADVANCED_NAME_LANGUAGE = "advancedNameLanguage";
- public static final String QUERY_INPUT_ADVANCED_NAME = "advancedName";
- public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE = "advancedIdentifierType";
- public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME = "advancedIdentifierKeyName";
- public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE = "advancedIdentifierKeyValue";
- public static final String QUERY_INPUT_ADVANCED_CATEGORY_TYPE = "advancedCategoryType";
- public static final String QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME = "advancedCategoryKeyName";
- public static final String QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE = "advancedCategoryKeyValue";
- public static final String QUERY_INPUT_ADVANCED_DISCOVERYURL = "advancedDiscoveryURL";
- public static final String QUERY_INPUT_ADVANCED_FINDQUALIFIER = "advancedFindQualifier";
- public static final String QUERY_INPUT_ADVANCED_SORT_BY_NAME = "advancedSortByName";
- public static final String QUERY_INPUT_ADVANCED_SORT_BY_DATE = "advancedSortByDate";
- public static final String QUERY_INPUT_ADVANCED_MAX_SEARCH_SET = "advancedMaxSearchSet";
- public static final int QUERY_MAX_SEARCH_SET = 100;
- public static final String QUERY_INPUT_ADVANCED_MAX_RESULTS = "advancedMaxResults";
- public static final int QUERY_MAX_RESULTS = 10;
-
- public static final String QUERY_STYLE_BUSINESSES = "queryStyleBusinesses";
- public static final String QUERY_INPUT_SIMPLE_BUSINESS_NAME = "simpleBusinessName";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_OWNED = "advancedBusinessOwned";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_NAMES = "advancedBusinessNames";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS = "advancedBusinessIdentifiers";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES = "advancedBusinessCategories";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS = "advancedBusinessDiscoveryURLs";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES = "advancedBusinessServiceInterfaces";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY = "advancedBusinessServiceInterfacesCopy";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG = "advancedBusinessTModelBag";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS = "advancedBusinessFindQualifiers";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET = "advancedBusinessMaxSearchSet";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS = "advancedBusinessMaxResults";
-
- public static final String QUERY_STYLE_SERVICES = "queryStyleServices";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_NAME = "simpleServiceName";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_OWNED = "advancedServiceOwned";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_BUSINESS = "advancedServiceBusiness";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY = "advancedServiceBusinessCopy";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER = "advancedServiceServiceProvider";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_NAMES = "advancedServiceNames";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES = "advancedServiceCategories";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES = "advancedServiceServiceInterfaces";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY = "advancedServiceServiceInterfacesCopy";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_TMODEL = "advancedServiceTModel";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG = "advancedServiceTModelBag";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS = "advancedServiceFindQualifiers";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET = "advancedServiceMaxSearchSet";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS = "advancedServiceMaxResults";
-
- public static final String QUERY_STYLE_SERVICE_INTERFACES = "queryStyleServiceInterfaces";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME = "simpleServiceInterfaceName";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE = "advancedUseService";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE = "advancedServiceInterfaceService";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY = "advancedServiceInterfaceServiceCopy";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE = "advancedServiceInterfaceBusinessService";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED = "advancedServiceInterfaceOwned";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME = "advancedServiceInterfaceName";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS = "advancedServiceInterfaceIdentifiers";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES = "advancedServiceInterfaceCategories";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS = "advancedServiceInterfaceFindQualifiers";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET = "advancedServiceInterfaceMaxSearchSet";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS = "advancedServiceInterfaceMaxResults";
-
- public static final String QUERY_INPUT_ADVANCED_REGISTRY_NAME = "advancedRegistryName";
-
- public static final String QUERY_INPUT_UUID_KEY = "uuidKey";
- public static final String QUERY_INPUT_UUID_BUSINESS_KEY = "uuidBusinessKey";
- public static final String QUERY_INPUT_UUID_SERVICE_KEY = "uuidServiceKey";
- public static final String QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY = "uuidServiceInterfaceKey";
-
- public static final String QUERY_OUTPUT_SAVED_TMODEL = "savedTModel";
-
- // Sub Queries:
- public static final String SUBQUERIES_PROPERTIES = "subQueriesProperties";
- public static final String SUBQUERY_KEY = "subQueryKey";
- public static final String NEW_SUBQUERY_INITIATED = "newSubQueryInitiated";
- public static final String NEW_SUBQUERY_QUERY_ITEM = "newSubQueryQueryItem";
- public static final String SELECTED_NODEIDS = "selectedNodeIds";
- public static final String SUBQUERY_LIST_KEY = "subQueryListKey";
- public static final String SUBQUERY_LIST_ITEMID = "subQueryListItemId";
- public static final String SHOW_RESULTS_TARGET = "showResultsTarget";
- public static final String SUBQUERY_GET = "subQueryGet";
-
- // RegPublish..Actions (some constants from the RegFind...Actions will be reused.
- public static final String QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION = "simpleBusinessDescription";
-
- public static final String QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE = "advancedDescriptionLanguage";
- public static final String QUERY_INPUT_ADVANCED_DESCRIPTION = "advancedDescription";
- public static final String QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS = "advancedBusinessDescriptions";
-
- public static final String QUERY_INPUT_WSDL_URL = "wsdlURL";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL = "simpleServiceInterfaceWSDLURL";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION = "simpleServiceInterfaceDescription";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL = "advancedServiceInterfaceWSDLURL";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS = "advancedServiceInterfaceDescriptions";
-
- public static final String QUERY_INPUT_SIMPLE_SERVICE_BUSINESS = "simpleServiceBusiness";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY = "simpleServiceBusinessCopy";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER = "simpleServiceServiceProvider";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL = "simpleServiceWSDLURL";
- public static final String QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION = "simpleServiceDescription";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL = "advancedServiceWSDLURL";
- public static final String QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS = "advancedServiceDescriptions";
-
- // WSDL Browser
- public static final String PROJECT = "project";
- public static final String WSDL_TYPE = "wsdlType";
- public static final int WSDL_TYPE_SERVICE_INTERFACE = 0;
- public static final int WSDL_TYPE_SERVICE = 1;
- public static final String QUERY_INPUT_WEBPROJECT_WSDL_URL = "webProjectWSDLURL";
- public static final String QUERY_INPUT_FAVORITE_WSDL_URL = "favoriteWSDLURL";
-
- // Details
- public static final String LATEST_OBJECT = "latestObject";
- public static final String DISCOVERYURL_MODIFIED = "discoveryURLModified";
- public static final String DISCOVERYURL_VIEWID = "discoveryURLViewId";
- public static final String NAME_MODIFIED = "nameModified";
- public static final String NAME_VIEWID = "businessViewId";
- public static final String DESCRIPTION_MODIFIED = "descriptionModified";
- public static final String DESCRIPTION_VIEWID = "descriptionViewId";
- public static final String IDENTIFIER_MODIFIED = "identifierModified";
- public static final String IDENTIFIER_VIEWID = "identifierViewId";
- public static final String CATEGORY_MODIFIED = "categoryModified";
- public static final String CATEGORY_VIEWID = "categoryViewId";
- public static final String WSDL_URL_MODIFIED = "wsdlURLModified";
- public static final String PUBLISH_ACTION = "publishAction";
- public static final String LATEST_BUSINESS = "latestBusiness";
-
- // Refresh action
- public static final String REFRESH_NODE = "refreshNode";
-
- // Manage PublisherAssertions
- // "To" means from another business to my owning business
- public static final int DIRECTION_TO = 0;
- // "From" means from my owning business to another business
- public static final int DIRECTION_FROM = 1;
- public static final String PUBLISHER_ASSERTIONS_VIEWID = "publisherAssertionsViewId";
- public static final String PUBLISHER_ASSERTIONS_SELECTED_BUS_ID = "publisherAssertionsSelectedBusID";
- public static final String PUBLISHER_ASSERTIONS_DIRECTION = "publisherAssertionsDirection";
- public static final String QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS = "queryInputAddPublisherAssertions";
- public static final String QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY = "queryInputAddPublisherAssertionsCopy";
- public static final String QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS = "queryInputExistingPublisherAssertions";
- public static final String PUBLISHER_ASSERTIONS_TYPE = "publisherAssertionsType";
- public static final String PUBLISHER_ASSERTIONS_TYPE_PARENT_CHILD = "parent-child";
- public static final String PUBLISHER_ASSERTIONS_TYPE_PEER_TO_PEER = "peer-peer";
- public static final String PUBLISHER_ASSERTIONS_TYPE_IDENTITY = "identity";
-
- // Manage Referenced Services
- public static final String QUERY_INPUT_REFERENCED_SERVICES = "referencedServices";
- public static final String QUERY_INPUT_SERVICES = "services";
- public static final String MANAGE_REFERENCED_SERVICES_OPERATION = "managedReferencedServicesOperation";
- public static final int MANAGE_REFERENCED_SERVICES_OPERATION_ADD = 0;
- public static final int MANAGE_REFERENCED_SERVICES_OPERATION_REMOVE = 1;
- public static final String REFERENCED_SERVICE_SELECT_STATE = "referencedServiceSelectState";
-
- // ResizeUDDIFrameAction
- public static final String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
- public static final String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java
deleted file mode 100644
index f3d0b4d50..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.constants;
-
-public class UDDIFrameNames
-{
- public final static String NAVIGATOR_CONTAINER = "uddi_navigator_container";
- public final static String NAVIGATOR_TOOLBAR = "uddi_navigator_toolbar";
- public final static String NAVIGATOR_CONTENT = "uddi_navigator_content";
- public final static String ACTIONS_CONTAINER = "uddi_actions_container";
- public final static String PROPERTIES_CONTAINER = "uddi_properties_container";
- public final static String PROPERTIES_TOOLBAR = "uddi_properties_toolbar";
- public final static String PROPERTIES_CONTENT = "uddi_properties_content";
- public final static String STATUS_CONTAINER = "uddi_status_container";
- public final static String STATUS_TOOLBAR = "uddi_status_toolbar";
- public final static String STATUS_CONTENT = "uddi_status_content";
-
- public final static String CATEGORIES_WORKAREA = "categories_workarea";
- public final static String CATEGORIES_TOOLBAR = "categories_toolbar";
- public final static String CATEGORIES_CONTENT = "categories_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java
deleted file mode 100644
index ee3c9a272..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.constants;
-
-public class UDDIModelConstants
-{
- // Registries under UDDIMain.
- public static final String REL_REGISTRIES = "registries";
-
- // Executed Queries folder under a registry.
- public static final String REL_QUERIES_PARENT = "queriesParent";
-
- // Published Businesses folder under a registry.
- public static final String REL_PUBLISHED_BUSINESSES_PARENT = "publishedBusinessesParent";
-
- // Published Services folder under a registry.
- public static final String REL_PUBLISHED_SERVICES_PARENT = "publishedServicesParent";
-
- // Published Service interfaces folder under a registry.
- public static final String REL_PUBLISHED_SERVICE_INTERFACES_PARENT = "publishedServiceInterfacesParent";
-
- // Queries under the Queries folder.
- public static final String REL_QUERIES = "queries";
- public static final String INITIAL_RESULTS = "initialResults";
- public static final String QUERY_TYPE = "queryType";
- public static final String SUBQUERY_TRANSFER_TARGET = "subQueryTransferTarget";
-
- // Objects under a Query node.
- public static final String REL_QUERY_RESULTS = "queryResults";
-
- // Categories
- public static final String REL_SUBCATEGORIES = "subCategories";
-
- // Published items inside the Published items folder.
- public static final String REL_PUBLISHED_ITEMS = "publishedItems";
-
- // Businesses
- public static final String IS_BUSINESS_OWNED = "isBusinessOwned";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java
deleted file mode 100644
index 0cb5d0237..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-public abstract class AbstractUDDIElement extends TreeElement
-{
- public AbstractUDDIElement(String name, Model model)
- {
- super(name, model);
- }
-
- public final TreeElement getParentElement()
- {
- return getParentElement(this);
- }
-
- public final TreeElement getParentElement(TreeElement child)
- {
- Enumeration e = child.getElements(ModelConstants.REL_OWNER);
- if (e.hasMoreElements())
- return (TreeElement)e.nextElement();
- else
- return null;
- }
-
- public final RegistryElement getRegistryElement()
- {
- if (this instanceof RegistryElement)
- return (RegistryElement)this;
- else
- {
- TreeElement childElement = this;
- TreeElement parentElement = getParentElement(childElement);
- while (parentElement != null && parentElement != childElement)
- {
- if (parentElement instanceof RegistryElement)
- return (RegistryElement)parentElement;
- childElement = parentElement;
- parentElement = getParentElement(childElement);
- }
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java
deleted file mode 100644
index 61e613d60..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusinessElement extends AbstractUDDIElement
-{
- private BusinessEntity be_;
- private ListManager publisherAssertions_;
-
- public BusinessElement(BusinessEntity be,Model model)
- {
- super(be.getDefaultNameString(),model);
- be_ = be;
- setKey(be_.getBusinessKey());
- publisherAssertions_ = null;
- }
-
- public final BusinessEntity getBusinessEntity()
- {
- return be_;
- }
-
- public final void setBusinessEntity(BusinessEntity be)
- {
- be_ = be;
- setKey(be_.getBusinessKey());
- }
-
- public ListManager getPublisherAssertions()
- {
- return publisherAssertions_;
- }
-
- public void setPublisherAssertions(ListManager listManager)
- {
- publisherAssertions_ = listManager;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java
deleted file mode 100644
index 907f3a18c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.uddi4j.util.KeyedReference;
-
-public class CategoryElement extends AbstractUDDIElement
-{
- private KeyedReference category_;
-
- public CategoryElement(String name,KeyedReference category,Model model)
- {
- super(name,model);
- category_ = category;
- saveCategoryProperties();
- }
-
- private final void saveCategoryProperties()
- {
- if (category_ != null)
- {
- String keyName = category_.getKeyName();
- if (keyName != null)
- setName(keyName);
- }
- }
-
- public final KeyedReference getCategory()
- {
- return category_;
- }
-
- public final String getNameForTree()
- {
- StringBuffer nameForTree = new StringBuffer("[");
- nameForTree.append(category_.getKeyValue()).append("] ").append(category_.getKeyName());
- return nameForTree.toString();
- }
-
- public final void updateCategory(String keyName,String keyValue,String tModelKey)
- {
- category_.setKeyName(keyName);
- category_.setKeyValue(keyValue);
- category_.setTModelKey(tModelKey);
- saveCategoryProperties();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java
deleted file mode 100644
index f2966562b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.text.ParseException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Vector;
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Category;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.uddi4j.util.KeyedReference;
-
-public class CategoryModel extends BasicModel
-{
- private ServletContext application_;
- private String defaultDataFile_;
- private Hashtable categoryElements_;
- private String columnDelimiter_;
- private String stringDelimiter_;
- private String categoryKey_;
- private boolean checked_;
- private String displayName_;
- private String tModelKey_;
- private Throwable errorException_;
-
- // Return codes for loading and saving category data.
- public static final byte OPERATION_SUCCESSFUL = 0x00;
- public static final byte ERROR_FILE = 0x01;
- public static final byte ERROR_SECURITY = 0x02;
- public static final byte ERROR_ENCODING = 0x03;
- public static final byte ERROR_IO = 0x04;
- public static final byte ERROR_CATEGORY_KEY = 0x05;
-
- private final String defaultColumnDelimiter_ = "#";
- private final String defaultStringDelimiter_ = "\"";
-
- public CategoryModel()
- {
- super("categories");
- application_ = null;
- defaultDataFile_ = null;
- columnDelimiter_ = defaultColumnDelimiter_;
- stringDelimiter_ = defaultStringDelimiter_;
- categoryElements_ = null;
- categoryKey_ = null;
- checked_ = true;
- displayName_ = null;
- tModelKey_ = null;
- errorException_ = null;
- }
-
- /**
- * CategoryModels load their data from the file named via the
- * {@link #setDefaultDataFile(String)} method. The data file
- * name is interpretted as either a physical pathname or a
- * context-root relative pathname depending on whether the
- * servlet context or "application" is null (default) or not.
- * @param application The application context, null by default.
- * Value can be the ServletContext of the WSExplorer or null.
- */
- public final void setServletContext(ServletContext application)
- {
- application_ = application;
- }
-
- public final void setDefaultDataFile(String defaultDataFile)
- {
- defaultDataFile_ = defaultDataFile;
- }
-
- public final void setCategoryKey(String categoryKey)
- {
- categoryKey_ = categoryKey;
- }
-
- public final String getCategoryKey()
- {
- return categoryKey_;
- }
-
- public final void setColumnDelimiter(String columnDelimiter)
- {
- columnDelimiter_ = columnDelimiter;
- }
-
- public final String getColumnDelimiter()
- {
- return columnDelimiter_;
- }
-
- public final void setStringDelimiter(String stringDelimiter)
- {
- stringDelimiter_ = stringDelimiter;
- }
-
- public final String getStringDelimiter()
- {
- return stringDelimiter_;
- }
-
- public final void enableChecked(boolean isChecked)
- {
- checked_ = isChecked;
- }
-
- public final boolean isChecked()
- {
- return checked_;
- }
-
- public final void setDisplayName(String displayName)
- {
- displayName_ = displayName;
- }
-
- public final String getDisplayName()
- {
- return displayName_;
- }
-
- public final void setTModelKey(String tModelKey)
- {
- tModelKey_ = tModelKey;
- }
-
- public final String getTModelKey()
- {
- return tModelKey_;
- }
-
- public final boolean isDataLoaded()
- {
- return (categoryElements_ != null);
- }
-
- public final Throwable getErrorException()
- {
- return errorException_;
- }
-
- private final boolean isEnclosedInQuotes(String string)
- {
- return string.startsWith("\"") && string.endsWith("\"");
- }
-
- public final void loadFromTaxonomy(Taxonomy taxonomy)
- {
- String name = taxonomy.getName();
- CategoryElement root = new CategoryElement(name,null,this);
- setRootElement(root);
- categoryElements_ = new Hashtable();
- for (Iterator it = taxonomy.getCategory().iterator(); it.hasNext();)
- {
- addCategory(root, (Category)it.next());
- }
- }
-
- private void addCategory(CategoryElement parent, Category category)
- {
- String keyName = category.getName();
- String keyValue = category.getCode();
- CategoryElement child = new CategoryElement(keyName,new KeyedReference(keyName,keyValue,tModelKey_),this);
- parent.connect(child,UDDIModelConstants.REL_SUBCATEGORIES,ModelConstants.REL_OWNER);
- categoryElements_.put(keyValue, child);
- for (Iterator it = category.getCategory().iterator(); it.hasNext();)
- {
- addCategory(child, (Category)it.next());
- }
- }
-
- public final byte loadFromDefaultDataFile()
- {
- try
- {
- if (defaultDataFile_ == null)
- throw new FileNotFoundException();
- BufferedReader br = null;
- if (application_ == null)
- br = new BufferedReader(new InputStreamReader(new FileInputStream(defaultDataFile_),HTMLUtils.UTF8_ENCODING));
- else
- br = new BufferedReader(new InputStreamReader(application_.getResourceAsStream(defaultDataFile_),HTMLUtils.UTF8_ENCODING));
- return loadData(br);
- }
- catch (FileNotFoundException e)
- {
- errorException_ = e;
- return ERROR_FILE;
- }
- catch (SecurityException e)
- {
- errorException_ = e;
- return ERROR_SECURITY;
- }
- catch (UnsupportedEncodingException e)
- {
- errorException_ = e;
- return ERROR_ENCODING;
- }
- }
-
- public final byte loadFromDelimiterFile()
- {
- // Get the associated .properties file and set the delimiters. The defaultDataFile_ is set to the delimiter file in this case.
- // The properties file contains the following keys:
- // wsad.dataFile - location of the category data file.
- // wsad.checked - whether or not the category is checked.
- // wsad.name - the display name of the category.
- // column.delimiter - the delimiter character used for separating columns.
- // string.delimiter - the delimiter character used to encapsulate data such that column delimiter characters are treated as data.
- try
- {
- Properties p = new Properties();
- InputStream fin = null;
- if (application_ == null)
- fin = new FileInputStream(defaultDataFile_);
- else
- fin = application_.getResourceAsStream(defaultDataFile_);
- p.load(fin);
- fin.close();
- columnDelimiter_ = p.getProperty("column.delimiter");
- stringDelimiter_ = p.getProperty("string.delimiter");
- defaultDataFile_ = p.getProperty("wsad.dataFile");
- return loadFromDefaultDataFile();
- }
- catch (FileNotFoundException e)
- {
- errorException_ = e;
- return ERROR_FILE;
- }
- catch (SecurityException e)
- {
- errorException_ = e;
- return ERROR_SECURITY;
- }
- catch (IOException e)
- {
- errorException_ = e;
- return ERROR_IO;
- }
- }
-
- public final byte loadData(BufferedReader br)
- {
- errorException_ = null;
- CategoryElement rootElement = null;
- categoryElements_ = new Hashtable();
- byte returnCode = OPERATION_SUCCESSFUL;
- String line = null;
- int lineNumber = 0;
- try
- {
- char columnDelimiterChar = columnDelimiter_.charAt(0);
- char stringDelimiterChar = stringDelimiter_.charAt(0);
- Vector values = new Vector();
- while((line = br.readLine()) != null)
- {
- lineNumber++;
- // Ignore blank lines.
- if (line.trim().length() == 0)
- continue;
- int index = 0;
- int length = line.length();
- boolean inStringDelimiters = false;
- values.removeAllElements();
- StringBuffer currentToken = new StringBuffer();
- while (index < length)
- {
- char currentChar = line.charAt(index);
- if (inStringDelimiters)
- {
- // In quote so ignoring delimiters
- if (currentChar == stringDelimiterChar)
- {
- if (index < length - 1)
- {
- // currentChar could be a closing string delimiter or escape
- // Need to look ahead to be sure...
- char followingChar = line.charAt(index + 1);
- if (followingChar == stringDelimiterChar)
- {
- // There is an escaped quote
- currentToken.append(stringDelimiterChar);
- // jump forward two characters.
- index += 2;
- }
- else
- {
- // There was a closing string delimiter...jump forward to the next delimiter
- inStringDelimiters = false;
- //look for the next column delimiter character
- int nextDelimiter = line.indexOf(columnDelimiterChar, index);
- if (nextDelimiter == -1)
- {
- // There were no more delimiters so break out of the loop
- break;
- }
- else
- {
- values.addElement(currentToken.toString());
- //values[tokenCount++] = currentToken.toString();
- currentToken.setLength(0);
- inStringDelimiters = false;
- index = nextDelimiter + 1;
- }
- }
- }
- else
- {
- // This is the last character and it's a closing string delimiter.
- index++;
- inStringDelimiters = false;
- }
- }
- else
- {
- currentToken.append(currentChar);
- index++;
- }
- }
- else if (currentChar == columnDelimiterChar)
- {
- // There was a delimiter outside of quotes
- values.addElement(currentToken.toString());
- //values[tokenCount++] = currentToken.toString();
- currentToken.setLength(0);
- index++;
- }
- else if (currentChar == stringDelimiterChar)
- {
- // A quote appearing outside of quotes must be a opening quote
- inStringDelimiters = true;
- index++;
- }
- else
- {
- // There is a normal char outside of quotes
- currentToken.append(currentChar);
- index++;
- }
- }
- // Expect token count to be values.length - 1 at this point if everything is ok
- if (inStringDelimiters)
- {
- br.close();
- throw new ParseException(line,lineNumber);
- }
-
- // Add the final token.
- values.addElement(currentToken.toString());
-
- // 3 columns format. From left to right, these are:
- // 1) category's key value
- // 2) category's key name
- // 3) category's parent key value
- // Convert to 4 columns format.
- if (values.size() == 3)
- {
- if (categoryKey_ != null)
- values.insertElementAt(categoryKey_, 0);
- else
- values.insertElementAt(tModelKey_, 0);
- }
-
- // 4 columns format. From left to right, these are:
- // 1) type of category (categoryKey)
- // 2) category's key value
- // 3) category's key name
- // 4) category's parent key value
- if (values.size() == 4)
- {
- String categoryKey = (String)values.elementAt(0);
- if (categoryKey_ == null)
- categoryKey_ = categoryKey;
- else if (!categoryKey_.equals(categoryKey))
- throw new Exception(categoryKey);
- String keyValue = (String)values.elementAt(1);
- String keyName = (String)values.elementAt(2);
- String parentKeyValue = (String)values.elementAt(3);
- if (rootElement == null)
- {
- rootElement = new CategoryElement(displayName_,null,this);
- setRootElement(rootElement);
- }
- if (isEnclosedInQuotes(keyName))
- keyName = keyName.substring(1,keyName.length()-1);
- // Check if the CategoryElement already exists. If it does, refresh the Category.
- CategoryElement categoryElement = (CategoryElement)categoryElements_.get(keyValue);
- if (categoryElement != null)
- categoryElement.updateCategory(keyName,keyValue,tModelKey_);
- else
- categoryElement = new CategoryElement(keyName,new KeyedReference(keyName,keyValue,tModelKey_),this);
- Element parentElement;
- if (parentKeyValue.equals(keyValue))
- parentElement = rootElement;
- else
- parentElement = (Element)categoryElements_.get(parentKeyValue);
- if (parentElement == null)
- {
- parentElement = new CategoryElement("temp",new KeyedReference("",parentKeyValue,tModelKey_),this);
- categoryElements_.put(parentKeyValue,parentElement);
- }
- else
- parentElement.connect(categoryElement,UDDIModelConstants.REL_SUBCATEGORIES,ModelConstants.REL_OWNER);
- categoryElements_.put(keyValue,categoryElement);
- }
- else
- {
- br.close();
- throw new ParseException(line,lineNumber);
- }
- }
- br.close();
- return returnCode;
- }
- catch (IOException e)
- {
- errorException_ = e;
- returnCode = ERROR_IO;
- }
- catch (ParseException e)
- {
- errorException_ = e;
- returnCode = ERROR_FILE;
- }
- catch (Exception e)
- {
- errorException_ = e;
- returnCode = ERROR_CATEGORY_KEY;
- }
- categoryElements_ = null;
- return returnCode;
- }
-
- private final void saveData(PrintWriter pw,CategoryElement categoryElement,CategoryElement parentElement,boolean isFirst)
- {
- // File format:
- // <categoryKey>#<keyValue>#<keyName>#<parentKeyValue>
- KeyedReference kr = categoryElement.getCategory();
- // Check if this is not the root element.
- if (kr != null)
- {
- String keyName = kr.getKeyName();
- String keyValue = kr.getKeyValue();
- String parentKeyValue;
- if (parentElement == null)
- parentKeyValue = keyValue;
- else
- {
- KeyedReference parentKr = parentElement.getCategory();
- // Check if the parent is the root element.
- if (parentKr == null)
- parentKeyValue = keyValue;
- else
- parentKeyValue = parentKr.getKeyValue();
- }
- if (!isFirst)
- pw.println();
- else
- isFirst = false;
- pw.print(mangle(categoryKey_));
- pw.print(columnDelimiter_);
- pw.print(mangle(keyValue));
- pw.print(columnDelimiter_);
- pw.print(mangle(keyName));
- pw.print(columnDelimiter_);
- pw.print(mangle(parentKeyValue));
- }
- Enumeration e = categoryElement.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
- if (e != null)
- {
- while (e.hasMoreElements())
- saveData(pw,(CategoryElement)e.nextElement(),categoryElement,isFirst);
- }
- }
-
- // Mangle an input string if it contains default column delimiter characters by surrounding it with the string delimiters.
- private final String mangle(String input)
- {
- if (input != null && input.indexOf(columnDelimiter_) != -1)
- {
- StringBuffer s = new StringBuffer(input);
- s.insert(0,stringDelimiter_).append(stringDelimiter_);
- return s.toString();
- }
- return input;
- }
-
- public final byte saveData(String fileName)
- {
- // The fileName should already be URLEncoded.
- byte returnCode = OPERATION_SUCCESSFUL;
- errorException_ = null;
- if (isDataLoaded())
- {
- try
- {
- PrintWriter pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream(fileName),HTMLUtils.UTF8_ENCODING),true);
- CategoryElement rootElement = (CategoryElement)getRootElement();
- saveData(pw,rootElement,null,true);
- pw.flush();
- pw.close();
- // Save the properties file.
- Properties p = new Properties();
- p.setProperty("wsad.dataFile",fileName);
- p.setProperty("wsad.checked",String.valueOf(checked_));
- p.setProperty("wsad.name",displayName_);
- p.setProperty("column.delimiter",columnDelimiter_);
- p.setProperty("string.delimiter",stringDelimiter_);
- StringBuffer propertiesFileName = new StringBuffer(fileName.substring(0,fileName.lastIndexOf('.')));
- propertiesFileName.append(".properties");
- FileOutputStream fout = new FileOutputStream(propertiesFileName.toString());
- p.store(fout,null);
- fout.close();
- }
- catch (FileNotFoundException e)
- {
- errorException_ = e;
- returnCode = ERROR_FILE;
- }
- catch (SecurityException e)
- {
- errorException_ = e;
- returnCode = ERROR_SECURITY;
- }
- catch (UnsupportedEncodingException e)
- {
- errorException_ = e;
- returnCode = ERROR_ENCODING;
- }
- catch (IOException e)
- {
- errorException_ = e;
- returnCode = ERROR_IO;
- }
- }
- return returnCode;
- }
-
- public String toString()
- {
- return displayName_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java
deleted file mode 100644
index c275efe26..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-
-public class PublishedItemsElement extends AbstractUDDIElement
-{
- public PublishedItemsElement(int type,String name,Model model)
- {
- super(name,model);
- setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_PUBLISHED_ITEMS);
- setPropertyAsString(UDDIModelConstants.QUERY_TYPE,String.valueOf(type));
- }
-
- public final int getType()
- {
- return Integer.parseInt(getPropertyAsString(UDDIModelConstants.QUERY_TYPE));
- }
-
- public Enumeration getItems()
- {
- return getElements(UDDIModelConstants.REL_PUBLISHED_ITEMS);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java
deleted file mode 100644
index 5232c835e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.uddi4j.datatype.assertion.PublisherAssertion;
-import org.uddi4j.util.KeyedReference;
-
-public class PublisherAssertionElement {
-
- // owningBusinessKey_ is the key of the business element that owns this
- // publisherAssertionElement
- private String fromKey_;
- private String toKey_;
- private String owningBusinessKey_;
-
- // the other business that the containing business is asserted from or to
- private ListElement sp_;
- private int subQueryItemId_;
-
- // status of this publisherAssertion
- private String status_;
- private KeyedReference keyedReference_;
-
- public PublisherAssertionElement(String fromKey, String toKey, String owningBusinessKey, ListElement sp, int subQueryItemId, String status, KeyedReference keyedRef) {
- fromKey_ = fromKey;
- toKey_ = toKey;
- owningBusinessKey_ = owningBusinessKey;
- sp_ = sp;
- subQueryItemId_ = subQueryItemId;
- status_ = status;
- keyedReference_ = keyedRef;
- }
-
- public void setFromKey(String fromKey) {
- fromKey_ = fromKey;
- }
-
- public String getFromKey() {
- return fromKey_;
- }
-
- public void setToKey(String toKey) {
- toKey_ = toKey;
- }
-
- public String getToKey() {
- return toKey_;
- }
-
- public void setOwningBusinessKey(String key) {
- owningBusinessKey_ = key;
- }
-
- public String getOwningBusinessKey() {
- return owningBusinessKey_;
- }
-
- public void setServiceProvider(ListElement sp) {
- sp_ = sp;
- }
-
- public ListElement getServiceProvider() {
- return sp_;
- }
-
- public void setSubQueryItemId(int id) {
- subQueryItemId_ = id;
- }
-
- public int getSubQueryItemId() {
- return subQueryItemId_;
- }
-
- public void setStatus(String status) {
- status_ = status;
- }
-
- public String getStatus() {
- return status_;
- }
-
- public void setKeyedRef(KeyedReference keyedRef) {
- keyedReference_ = keyedRef;
- }
-
- public KeyedReference getKeyedRef() {
- return keyedReference_;
- }
-
- public PublisherAssertion getPublisherAssertion() {
- if (fromKey_ == null ||
- toKey_ == null ||
- keyedReference_ == null) {
- return null;
- }
-
- PublisherAssertion pubAssertion = new PublisherAssertion(fromKey_, toKey_, keyedReference_);
- return pubAssertion;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java
deleted file mode 100644
index 046de917b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class QueryElement extends AbstractUDDIElement
-{
- private final void initQueryProperties(int itemType,Object[] results)
- {
- Vector resultsVector = new Vector();
- for (int i=0;i<results.length;i++)
- resultsVector.addElement(results[i]);
- setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_QUERY_RESULTS);
- setPropertyAsObject(UDDIModelConstants.INITIAL_RESULTS,resultsVector);
- setPropertyAsString(UDDIModelConstants.QUERY_TYPE,String.valueOf(itemType));
- }
-
- public QueryElement(BusinessEntity[] spList,String name,Model model)
- {
- super(name,model);
- initQueryProperties(UDDIActionInputs.QUERY_ITEM_BUSINESSES,spList);
- }
-
- public QueryElement(BusinessService[] bsList,String name,Model model)
- {
- super(name,model);
- initQueryProperties(UDDIActionInputs.QUERY_ITEM_SERVICES,bsList);
- }
-
- public QueryElement(TModel[] tModelList,String name,Model model)
- {
- super(name,model);
- initQueryProperties(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,tModelList);
- }
-
- public int getQueryType()
- {
- return Integer.parseInt(getPropertyAsString(UDDIModelConstants.QUERY_TYPE));
- }
-
- public QueryParentElement getQueryParentElement()
- {
- return (QueryParentElement)getParentElement();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java
deleted file mode 100644
index 126f37e1c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-
-public class QueryParentElement extends AbstractUDDIElement
-{
- public QueryParentElement(String name,Model model)
- {
- super(name,model);
- setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_QUERIES);
- }
-
- public Enumeration getQueries()
- {
- return getElements(UDDIModelConstants.REL_QUERIES);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java
deleted file mode 100644
index 7209f2a6e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- * 20060912 141796 gilberta@ca.ibm.com - Gilbert Andrews
- * 20070419 182864 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.model.v10.registry.Registry;
-import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy;
-import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.eclipse.wst.ws.internal.registry.IRegistryManager;
-import org.eclipse.wst.ws.internal.registry.RegistryService;
-import org.eclipse.wst.ws.internal.registry.UDDIRegistryService;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.Description;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.response.AuthToken;
-import org.uddi4j.transport.TransportException;
-
-public class RegistryElement extends AbstractUDDIElement
-{
- private final long AUTH_INFO_TIMEOUT = 3000000;
- private UDDIProxy proxy_;
- private long authTokenTimestamp_;
- private AuthToken authToken_;
- private String id_;
- private String password_;
- private String inquiryURL_;
- private String publishURL_;
- private String cachedPublishURL_;
- private String registrationURL_;
- private Hashtable userDefinedCategories_;
- private boolean checkForUserDefinedCategories_;
- private String categoriesDirectory_;
-
- public RegistryElement(UDDIProxy proxy, String inquiryURL, String name, Model model)
- {
- super(name, model);
- proxy_ = proxy;
- inquiryURL_ = inquiryURL;
- publishURL_ = null;
- authTokenTimestamp_ = -1;
- authToken_ = null;
- id_ = null;
- password_ = null;
- cachedPublishURL_ = null;
- registrationURL_ = null;
- userDefinedCategories_ = null;
- checkForUserDefinedCategories_ = false;
- categoriesDirectory_ = null;
- }
-
- public final UDDIProxy getProxy()
- {
- return proxy_;
- }
-
- public void setDefaults()
- {
-
- authTokenTimestamp_ = -1;
- authToken_ = null;
- cachedPublishURL_ = null;
- }
-
- public final String getInquiryURL()
- {
- return inquiryURL_;
- }
-
- public final QueryParentElement getQueryParentElement()
- {
- return (QueryParentElement) (getElements(UDDIModelConstants.REL_QUERIES_PARENT).nextElement());
- }
-
- public final PublishedItemsElement getPublishedBusinessesElement()
- {
- return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT).nextElement());
- }
-
- public final PublishedItemsElement getPublishedServicesElement()
- {
- return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT).nextElement());
- }
-
- public final PublishedItemsElement getPublishedServiceInterfacesElement()
- {
- return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT).nextElement());
- }
-
- public final void performLogin(String publishURL, String userId, String password) throws TransportException, UDDIException, MalformedURLException
- {
- publishURL_ = publishURL;
- proxy_.setPublishURL(NetUtils.createURL(publishURL));
- authToken_ = proxy_.get_authToken(userId, password);
- authTokenTimestamp_ = System.currentTimeMillis();
- id_ = userId;
- password_ = password;
- }
-
- public final void performLogout() throws TransportException, UDDIException
- {
- proxy_.discard_authToken(authToken_.getAuthInfoString());
- }
-
- public final String getAuthInfoString()
- {
- if (!isLoggedIn())
- return null;
- if ((System.currentTimeMillis() - authTokenTimestamp_) > AUTH_INFO_TIMEOUT)
- {
- try
- {
- authToken_ = proxy_.get_authToken(id_, password_);
- authTokenTimestamp_ = System.currentTimeMillis();
- }
- catch (Throwable t)
- {
- }
- }
- return authToken_.getAuthInfoString();
- }
-
- public final boolean isLoggedIn()
- {
- return authToken_ != null;
- }
-
- public final void setCachedPublishURL(String publishURL)
- {
- cachedPublishURL_ = publishURL;
- }
-
- public final String getPublishURL()
- {
- if (isLoggedIn() && publishURL_ != null)
- return publishURL_;
- return cachedPublishURL_;
- }
-
- public final void setRegistrationURL(String registrationURL)
- {
- registrationURL_ = registrationURL;
- }
-
- public final String getRegistrationURL()
- {
- return registrationURL_;
- }
-
- public final String getUserId()
- {
- return id_;
- }
-
- public final void setUserId(String userId)
- {
- id_ = userId;
- }
-
- public final String getCred()
- {
- return password_;
- }
-
- public final void setCred(String cred)
- {
- password_ = cred;
- }
-
- public final void setUserDefinedCategories(Hashtable userDefinedCategories)
- {
- userDefinedCategories_ = userDefinedCategories;
- }
-
- public final Enumeration getUserDefinedCategories()
- {
- if (userDefinedCategories_ != null)
- return userDefinedCategories_.elements();
- else
- return null;
- }
-
- public final CategoryModel getUserDefinedCategory(String tModelKey)
- {
- return (CategoryModel) userDefinedCategories_.get(tModelKey);
- }
-
- // Special handler to be invoked before sending a message to the registry.
- public final void handlePreInvocation(BusinessService busService)
- {
- // For XMethods, business services must contain a description of the form:
- // IMPLEMENTATION: ibmws
- if (getInquiryURL().equals("http://uddi.xmethods.net/inquire"))
- {
- Vector descriptionVector = busService.getDescriptionVector();
- if (descriptionVector == null)
- descriptionVector = new Vector();
- boolean containsImplementationDescription = false;
- for (int i = 0; i < descriptionVector.size(); i++)
- {
- Description description = (Description) descriptionVector.elementAt(i);
- if (description.getText().startsWith("IMPLEMENTATION: "))
- {
- containsImplementationDescription = true;
- break;
- }
- }
- if (!containsImplementationDescription)
- {
- descriptionVector.addElement(new Description("IMPLEMENTATION: ibmws"));
- busService.setDescriptionVector(descriptionVector);
- }
- }
- }
-
- public final void setCheckForUserDefinedCategories(boolean checkForUserDefinedCategories)
- {
- checkForUserDefinedCategories_ = checkForUserDefinedCategories;
- }
-
- public final boolean getCheckForUserDefinedCategories()
- {
- return checkForUserDefinedCategories_;
- }
-
- public final void setCategoriesDirectory(String directory)
- {
- categoriesDirectory_ = directory;
- }
-
- public final String getCategoriesDirectory()
- {
- return categoriesDirectory_;
- }
-
- public void refreshMeta(){
-
- RegistryService regService = RegistryService.instance();
- IRegistryManager regManager = regService.getDefaultRegistryManager();
-
-
- try
- {
- regManager.refreshManager();
- String[] regURIs = regManager.getRegistryURIs();
- for (int i = 0; i < regURIs.length; i++)
- {
- Registry reg = regManager.loadRegistry(regURIs[i]);
- if (reg instanceof UDDIRegistry)
- {
- UDDIRegistry uddiReg = (UDDIRegistry)reg;
- if(uddiReg.getDiscoveryURL().equals(getInquiryURL())){
-
-
-
- Taxonomy[] taxonomies = regManager.loadTaxonomies(UDDIRegistryService.instance().getTaxonomyURIs(uddiReg));
- if (taxonomies != null)
- {
- Hashtable taxonomyTable = new Hashtable();
- for (int j=0; j<taxonomies.length; j++)
- {
- Taxonomy taxonomy = taxonomies[j];
- String name = taxonomy.getName();
- String tmodelKey = taxonomy.getTmodelKey();
- CategoryModel catModel = new CategoryModel();
- catModel.setDisplayName(name);
- catModel.setCategoryKey(name);
- catModel.setTModelKey(tmodelKey);
- catModel.loadFromTaxonomy(taxonomy);
- taxonomyTable.put(tmodelKey, catModel);
- }
-
- setUserDefinedCategories(taxonomyTable);
- }
- }
-
- }
-
- }
- }catch (CoreException ce)
- {
- // TODO: Better error reporting
- ce.printStackTrace();
- }
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java
deleted file mode 100644
index 4f37cbcb8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.uddi4j.datatype.service.BusinessService;
-
-public class ServiceElement extends AbstractUDDIElement
-{
- private BusinessService bs_;
-
- public ServiceElement(BusinessService bs,Model model)
- {
- super(bs.getDefaultNameString(),model);
- setKey(bs.getServiceKey());
- bs_ = bs;
- }
-
- public final BusinessService getBusinessService()
- {
- return bs_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java
deleted file mode 100644
index b72d881f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class ServiceInterfaceElement extends AbstractUDDIElement
-{
- private TModel tModel_;
-
- public ServiceInterfaceElement(TModel tModel,Model model)
- {
- super(tModel.getNameString(),model);
- tModel_ = tModel;
- setKey(tModel.getTModelKey());
- }
-
- public final TModel getTModel()
- {
- return tModel_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java
deleted file mode 100644
index 2371200d9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-public class UDDIMainElement extends TreeElement
-{
- private Hashtable registryNames_;
-
- public UDDIMainElement(String name,Model model)
- {
- super(name,model);
- registryNames_ = new Hashtable();
- }
-
- public final boolean containsRegistryName(String name)
- {
- return (registryNames_.get(name) != null);
- }
-
- public final void addRegistryName(String name)
- {
- registryNames_.put(name,Boolean.TRUE);
- }
-
- public final void removeRegistryName(String name)
- {
- registryNames_.remove(name);
- }
-
- public final void clearRegistryNames()
- {
- registryNames_.clear();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java
deleted file mode 100644
index 2853a4059..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class AddToFavoritesTool extends ActionTool {
- public AddToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToFavoritesAction.getActionLink(selectedNode.getNodeId());
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java
deleted file mode 100644
index 9e791022a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class BusPublishServiceTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
- private RegFindTool regFindTool_;
-
- public BusPublishServiceTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"uddi/images/publish_service_enabled.gif","uddi/images/publish_service_highlighted.gif",alt);
- regFindTool_ = new RegFindTool(new ToolManager(toolManager.getNode()), "");
- }
-
- protected final void initDefaultProperties()
- {
- toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
- setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-
- setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-
- // RegPublishServiceSimpleAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,"");
-
- // RegPublishServiceAdvancedAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,"");
- }
-
- public final void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- regFindTool_.addAuthenticationProperties(regElement);
- }
-
- public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
- {
- // Empty/Non-existent subquerykey implies publish form. All else implies query form.
- String subQueryKey = (String)subQueryKeyObject;
- if (subQueryKey == null || subQueryKey.length() < 1)
- return this;
- else
- return regFindTool_.getFormToolProperties(subQueryKeyObject);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
- return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
- }
-
- public String getFormLink()
- {
- Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryKey = null;
- if (subQueryKeyObject != null)
- {
- getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
- Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
- if (subQueryGetObject != null)
- {
- boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
- if (isSubQueryGet)
- return "uddi/forms/GetForm.jsp";
- }
- subQueryKey = (String)subQueryKeyObject;
- }
-
- if (subQueryKey == null || subQueryKey.length() < 1)
- return "uddi/forms/BusPublishServiceForm.jsp";
- else
- return regFindTool_.getFormLink();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java
deleted file mode 100644
index 2d1f63c34..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.IdentifierBag;
-
-public class BusinessDetailsTool extends DetailsTool
-{
- public BusinessDetailsTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/BusinessDetailsForm.jsp"));
- }
-
- public final void initDefaultProperties()
- {
- clearPropertyTable();
- BusinessElement busElement = (BusinessElement)(toolManager_.getNode().getTreeElement());
- BusinessEntity be = busElement.getBusinessEntity();
-
- setProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,be.getBusinessKey());
-
- Vector nameVector = new Vector();
- copyIndexVector(be.getNameVector(),nameVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
-
- Vector descriptionVector = new Vector();
- copyIndexVector(be.getDescriptionVector(),descriptionVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,descriptionVector);
-
- IdentifierBag idBag = be.getIdentifierBag();
- if (idBag != null)
- {
- Vector idVector = new Vector();
- copyIndexVector(idBag.getKeyedReferenceVector(),idVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idVector);
- }
-
- CategoryBag catBag = be.getCategoryBag();
- if (catBag != null)
- {
- Vector catVector = new Vector();
- copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catVector);
- }
-
- DiscoveryURLs discoveryURLs = be.getDiscoveryURLs();
- if (discoveryURLs != null)
- {
- Vector discoveryURLVector = new Vector();
- copyIndexVector(discoveryURLs.getDiscoveryURLVector(),discoveryURLVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLVector);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java
deleted file mode 100644
index 756bae8b0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.BusinessGetServicesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class BusinessNode extends UDDINavigatorNode
-{
- private DetailsTool detailsTool_;
- private BusPublishServiceTool publishServiceTool_;
- private ManagePublisherAssertionsTool managePublisherAssertionsTool_;
- private ManageReferencedServicesTool manageReferencedServicesTool_;
- private UnpublishTool unpublishTool_;
-
- public BusinessNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"uddi/images/business_highlighted.gif");
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- detailsTool_ = new BusinessDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_BUSINESS_DETAILS"));
- new GetServicesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICES"),BusinessGetServicesAction.getActionLink(nodeId_));
- publishServiceTool_ = new BusPublishServiceTool(toolManager_,uddiPerspective.getMessage("ALT_PUBLISH_SERVICE"));
- manageReferencedServicesTool_ = new ManageReferencedServicesTool(toolManager_,uddiPerspective.getMessage("ALT_MANAGE_REFERENCED_SERVICES"));
- managePublisherAssertionsTool_ = new ManagePublisherAssertionsTool(toolManager_,uddiPerspective.getMessage("ALT_MANAGE_PUBLISHER_ASSERTIONS"));
- new AddToFavoritesTool(toolManager_, uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
- unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_bus_enabled.gif","uddi/images/unpublish_bus_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_BUSINESS"));
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- detailsTool_.addAuthenticationProperties(regElement);
- publishServiceTool_.addAuthenticationProperties(regElement);
- manageReferencedServicesTool_.addAuthenticationProperties(regElement);
- managePublisherAssertionsTool_.addAuthenticationProperties(regElement);
- unpublishTool_.addAuthenticationProperties(regElement);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java
deleted file mode 100644
index 0c7fecc1e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectCategoryNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleCategoryNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryElement;
-
-public class CategoryNode extends Node
-{
- public CategoryNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"uddi/images/category.gif");
- setVisibilityOfChildren(false);
- }
-
- public final void createChildren()
- {
- Enumeration children = element_.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
- if (children != null)
- {
- while (children.hasMoreElements())
- {
- CategoryElement categoryElement = (CategoryElement)children.nextElement();
- CategoryNode categoryNode = new CategoryNode(categoryElement,nodeManager_,nodeDepth_+1);
- addChild(categoryNode);
- categoryNode.createChildren();
- }
- }
- }
-
- public final String getNodeName()
- {
- CategoryElement categoryElement = (CategoryElement)element_;
- return categoryElement.getNameForTree();
- }
-
- protected final String getToggleNodeActionHref()
- {
- return ToggleCategoryNodeAction.getActionLink(getNodeManager().getController().getSessionId(),nodeId_,isOpen_);
- }
-
- protected final String getLinkActionHref()
- {
- return SelectCategoryNodeAction.getActionLink(getNodeManager().getController().getSessionId(),nodeId_);
- }
-
- protected final String getToggleNodeActionTarget()
- {
- return UDDIFrameNames.CATEGORIES_WORKAREA;
- }
-
- protected final String getLinkActionTarget()
- {
- return UDDIFrameNames.CATEGORIES_WORKAREA;
- }
-
- protected final void initTools()
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java
deleted file mode 100644
index 11d6c5b70..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class DetailsTool extends FormTool
-{
- private String formLink_;
-
- public DetailsTool(ToolManager toolManager,String alt,String formLink)
- {
- super(toolManager,"images/details_enabled.gif","images/details_highlighted.gif",alt);
- formLink_ = formLink;
- }
-
- public void initDefaultProperties()
- {
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getFormLink()
- {
- return formLink_;
- }
-
- protected final void copyIndexVector(Vector source,Vector destination)
- {
- destination.removeAllElements();
- for (int i=0;i<source.size();i++)
- {
- ListElement listElement = new ListElement(source.elementAt(i));
- listElement.setViewId(i);
- // The next item indicates that this element is to be in non-edit state.
- listElement.setTargetViewToolInfo(-1,-1,i);
- destination.addElement(listElement);
- }
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java
deleted file mode 100644
index 808911596..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class GetBusinessesTool extends ActionTool
-{
- private String actionLink_;
- public GetBusinessesTool(ToolManager toolManager,String enabledImagePath,String highlightedImagePath,String alt,String actionLink)
- {
- super(toolManager,enabledImagePath,highlightedImagePath,alt);
- actionLink_ = actionLink;
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getActionLink()
- {
- return actionLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java
deleted file mode 100644
index b71f48a3f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class GetServiceInterfacesTool extends ActionTool
-{
- private String actionLink_;
- public GetServiceInterfacesTool(ToolManager toolManager,String alt,String actionLink)
- {
- super(toolManager,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",alt);
- actionLink_ = actionLink;
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getActionLink()
- {
- return actionLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java
deleted file mode 100644
index 6e568687f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class GetServicesTool extends ActionTool
-{
- private String actionLink_;
- public GetServicesTool(ToolManager toolManager,String alt,String actionLink)
- {
- super(toolManager,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",alt);
- actionLink_ = actionLink;
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getActionLink()
- {
- return actionLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java
deleted file mode 100644
index 1807b8bc8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-
-public class ItemsSummaryTool extends FormTool
-{
- private String formLink_;
-
- public ItemsSummaryTool(ToolManager toolManager,String enabledImage,String highlightedImage,String alt,int queryItem)
- {
- super(toolManager,enabledImage,highlightedImage,alt);
- StringBuffer formLink = new StringBuffer("uddi/forms/ItemsSummaryForm.jsp?");
- formLink.append(UDDIActionInputs.QUERY_ITEM).append('=').append(queryItem);
- String encodedFormLink = URLUtils.encode(formLink.toString());
- formLink_ = ProxyLoadPageAction.getActionLink(encodedFormLink);
- }
-
- public final void initDefaultProperties()
- {
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getFormLink()
- {
- return formLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/LoginTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/LoginTool.java
deleted file mode 100644
index f36b256a1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/LoginTool.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class LoginTool extends FormTool
-{
- private Controller controller_;
- private String formLink = "uddi/forms/LoginUddiForm.jsp";
-
- public LoginTool(ToolManager toolManager, String alt)
- {
- super(toolManager,"uddi/images/open_registry_enabled.gif","uddi/images/open_registry_highlighted.gif",alt);
- }
-
- protected final void initDefaultProperties()
- {
- controller_ = toolManager_.getNode().getNodeManager().getController();
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getFormLink()
- {
- return formLink;
- }
-
- public void setToLogoutLink()
- {
- formLink = "uddi/actions/LogoutAdvancedActionJSP.jsp";
- }
-
- public void setToRegistryLink()
- {
- formLink = "";
- }
-
- public final Enumeration getFavoriteRegistryElements()
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favoritesNodeManager = favPerspective.getNodeManager();
- TreeElement favoritesMainElement = favoritesNodeManager.getRootNode().getTreeElement();
- TreeElement favoriteRegistriesElement = (TreeElement)(favoritesMainElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE).nextElement());
- return favoriteRegistriesElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java
deleted file mode 100644
index 1457d1eae..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ManagePublisherAssertionsTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
- ToolManager invisibleToolManager_;
- private RegFindTool regFindTool_;
-
- public ManagePublisherAssertionsTool(ToolManager toolManager, String alt)
- {
- super(toolManager, "uddi/images/publisher_assertions_enabled.gif", "uddi/images/publisher_assertions_highlighted.gif", alt);
- invisibleToolManager_ = new ToolManager(toolManager.getNode());
- regFindTool_ = new RegFindTool(invisibleToolManager_,"");
- }
-
- protected final void initDefaultProperties()
- {
- setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
- setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
- setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
- }
-
- public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
- {
- // Empty/Non-existent subquerykey implies publish form. All else implies query form.
- String subQueryKey = (String)subQueryKeyObject;
- if (subQueryKey == null || subQueryKey.length() < 1)
- return this;
- else
- return regFindTool_.getFormToolProperties(subQueryKeyObject);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
- return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
- }
-
- public final void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- regFindTool_.addAuthenticationProperties(regElement);
- }
-
- public String getFormLink()
- {
- Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryKey = null;
- if (subQueryKeyObject != null)
- {
- getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
- Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
- if (subQueryGetObject != null)
- {
- boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
- if (isSubQueryGet)
- return "uddi/forms/GetForm.jsp";
- }
- subQueryKey = (String)subQueryKeyObject;
- }
-
- if (subQueryKey == null || subQueryKey.length() < 1)
- return ProxyLoadPageAction.getActionLink("uddi/forms/ManagePublisherAssertionsForm.jsp");
- else
- return regFindTool_.getFormLink();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java
deleted file mode 100644
index 9b789feeb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ManageReferencedServicesTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
- ToolManager invisibleToolManager_;
- private RegFindTool regFindTool_;
-
- public ManageReferencedServicesTool(ToolManager toolManager, String alt)
- {
- super(toolManager, "uddi/images/referenced_services_enabled.gif", "uddi/images/referenced_services_highlighted.gif", alt);
- invisibleToolManager_ = new ToolManager(toolManager.getNode());
- regFindTool_ = new RegFindTool(invisibleToolManager_,"");
- }
-
- protected final void initDefaultProperties()
- {
- setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
- setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
- String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
- setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
- }
-
- public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
- {
- // Empty/Non-existent subquerykey implies publish form. All else implies query form.
- String subQueryKey = (String)subQueryKeyObject;
- if (subQueryKey == null || subQueryKey.length() < 1)
- return this;
- else
- return regFindTool_.getFormToolProperties(subQueryKeyObject);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
- return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
- }
-
- public final void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- regFindTool_.addAuthenticationProperties(regElement);
- }
-
- public String getFormLink()
- {
- Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryKey = null;
- if (subQueryKeyObject != null)
- {
- getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
- Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
- if (subQueryGetObject != null)
- {
- boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
- if (isSubQueryGet)
- return "uddi/forms/GetForm.jsp";
- }
- subQueryKey = (String)subQueryKeyObject;
- }
-
- if (subQueryKey == null || subQueryKey.length() < 1)
- return "uddi/forms/ManageReferencedServicesForm.jsp";
- else
- return regFindTool_.getFormLink();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java
deleted file mode 100644
index c10c88715..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-
-public abstract interface MultipleFormToolPropertiesInterface
-{
- public abstract FormToolPropertiesInterface getFormToolProperties(Object key);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java
deleted file mode 100644
index 8f30c9896..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060224 122752 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-
-public class OpenRegistryTool extends FormTool
-{
- private Controller controller_;
-
- public OpenRegistryTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"uddi/images/open_registry_enabled.gif","uddi/images/open_registry_highlighted.gif",alt);
- }
-
- protected final void initDefaultProperties()
- {
- controller_ = toolManager_.getNode().getNodeManager().getController();
- UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
- setProperty(UDDIActionInputs.REGISTRY_NAME,uddiPerspective.getDefaultUDDIRegistry().getName());
- setProperty(UDDIActionInputs.INQUIRY_URL,uddiPerspective.getDefaultUDDIRegistry().getInquiryURL());
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getFormLink()
- {
- return "uddi/forms/OpenRegistryForm.jsp";
- }
-
- public final Enumeration getFavoriteRegistryElements()
- {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favoritesNodeManager = favPerspective.getNodeManager();
- TreeElement favoritesMainElement = favoritesNodeManager.getRootNode().getTreeElement();
- TreeElement favoriteRegistriesElement = (TreeElement)(favoritesMainElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE).nextElement());
- return favoriteRegistriesElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java
deleted file mode 100644
index 69904ed76..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement;
-
-public class PublishedItemsNode extends UDDINavigatorFolderNode
-{
- public PublishedItemsNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth);
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
- {
- TreeElement treeElement = (TreeElement)event.getParentElement();
- createChildNode(treeElement);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement treeElement = null;
- if (event.getInBoundRelName().equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
- treeElement = (TreeElement)event.getInboundElement();
- else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
- treeElement = (TreeElement)event.getOutBoundElement();
-
- if (treeElement != null)
- removeChildNode(treeElement);
- }
- });
- }
-
- private final void createChildNode(TreeElement element)
- {
- PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
- Node childNode = null;
- switch (publishedItemsElement.getType())
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- childNode = new BusinessNode(element,nodeManager_,nodeDepth_+1);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- childNode = new ServiceNode(element,nodeManager_,nodeDepth_+1);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- childNode = new ServiceInterfaceNode(element,nodeManager_,nodeDepth_+1);
- }
- if (childNode != null)
- addChild(childNode);
- }
-
- protected final void initTools()
- {
- PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
- UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
- int publishedItemsType = publishedItemsElement.getType();
- switch (publishedItemsType)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- new ItemsSummaryTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_BUSINESSES"),publishedItemsType);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- new ItemsSummaryTool(toolManager_,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICES"),publishedItemsType);
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- new ItemsSummaryTool(toolManager_,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICE_INTERFACES"),publishedItemsType);
- }
- }
-
- public String getOpenImagePath()
- {
- PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
- int publishedItemsType = publishedItemsElement.getType();
- switch (publishedItemsType)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- return "uddi/images/businesses_open_highlighted.gif";
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- return "uddi/images/services_open_highlighted.gif";
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- return "uddi/images/service_interfaces_open_highlighted.gif";
- }
- return super.getOpenImagePath();
- }
-
- public String getClosedImagePath()
- {
- PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
- int publishedItemsType = publishedItemsElement.getType();
- switch (publishedItemsType)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- return "uddi/images/businesses_closed_highlighted.gif";
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- return "uddi/images/services_closed_highlighted.gif";
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- return "uddi/images/service_interfaces_closed_highlighted.gif";
- }
- return super.getClosedImagePath();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java
deleted file mode 100644
index a02b8ceed..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.FindAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.BusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class QueryNode extends UDDINavigatorNode
-{
- private FormTool regFindTool_;
- private FindAction findAction_;
- public QueryNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"uddi/images/query.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(UDDIModelConstants.REL_QUERY_RESULTS))
- {
- TreeElement treeElement = (TreeElement)event.getParentElement();
- createChildNode(treeElement);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement treeElement = null;
- if (event.getInBoundRelName().equals(UDDIModelConstants.REL_QUERY_RESULTS))
- treeElement = (TreeElement)event.getInboundElement();
- else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_QUERY_RESULTS))
- treeElement = (TreeElement)event.getOutBoundElement();
-
- if (treeElement != null)
- removeChildNode(treeElement);
- }
- });
- createChildren();
- setVisibilityOfChildren(false);
- findAction_ = null;
- }
-
- private final void createChildren()
- {
- Vector initialResults = (Vector)element_.getPropertyAsObject(UDDIModelConstants.INITIAL_RESULTS);
- for (int i=0;i<initialResults.size();i++)
- {
- Object object = initialResults.elementAt(i);
- TreeElement childElement = null;
- if (object instanceof BusinessEntity)
- childElement = new BusinessElement((BusinessEntity)object,element_.getModel());
- else if (object instanceof BusinessService)
- childElement = new ServiceElement((BusinessService)object,element_.getModel());
- else if (object instanceof TModel)
- childElement = new ServiceInterfaceElement((TModel)object,element_.getModel());
- if (childElement != null)
- element_.connect(childElement,UDDIModelConstants.REL_QUERY_RESULTS,ModelConstants.REL_OWNER);
- }
- }
-
- private final void createChildNode(TreeElement element)
- {
- Node childNode = null;
- if (element instanceof BusinessElement)
- childNode = new BusinessNode(element,nodeManager_,nodeDepth_+1);
- else if (element instanceof ServiceElement)
- childNode = new ServiceNode(element,nodeManager_,nodeDepth_+1);
- else if (element instanceof ServiceInterfaceElement)
- childNode = new ServiceInterfaceNode(element,nodeManager_,nodeDepth_+1);
- if (childNode != null)
- addChild(childNode);
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- new ResultsTool(toolManager_,controller.getMessage("ALT_RESULTS"));
- regFindTool_ = new RegFindTool(toolManager_,uddiPerspective.getMessage("ALT_FIND"));
- }
-
- public final void setFindToolProperties(FindAction findAction)
- {
- findAction_ = findAction;
- regFindTool_.updatePropertyTable(findAction.getPropertyTable());
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- ((RegFindTool)regFindTool_).addAuthenticationProperties(regElement);
- Vector childNodes = getChildNodes();
- for (int i=0;i<childNodes.size();i++)
- {
- UDDINavigatorNode navigatorNode = (UDDINavigatorNode)childNodes.elementAt(i);
- navigatorNode.addAuthenticationProperties(regElement);
- }
- }
-
- public final FindAction getFindAction()
- {
- return findAction_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java
deleted file mode 100644
index b7f42d0bd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class QueryParentNode extends UDDINavigatorFolderNode
-{
- public QueryParentNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth);
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(UDDIModelConstants.REL_QUERIES))
- {
- QueryElement queryElement = (QueryElement)event.getParentElement();
- createChildNode(queryElement);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- QueryElement queryElement = null;
- if (event.getInBoundRelName().equals(UDDIModelConstants.REL_QUERIES))
- queryElement = (QueryElement)event.getInboundElement();
- else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_QUERIES))
- queryElement = (QueryElement)event.getOutBoundElement();
-
- if (queryElement != null)
- removeChildNode(queryElement);
- }
- });
- }
-
- private final void createChildNode(QueryElement element)
- {
- QueryNode queryNode = new QueryNode(element,nodeManager_,nodeDepth_+1);
- // Add registry authentication properties.
- RegistryElement regElement = (RegistryElement)(getParent().getTreeElement());
- queryNode.addAuthenticationProperties(regElement);
- addChild(queryNode);
- }
-
- protected final void initTools()
- {
- UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
- new ItemsSummaryTool(toolManager_,"uddi/images/queries_closed_enabled.gif","uddi/images/queries_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_QUERIES"),UDDIActionInputs.QUERY_ITEM_QUERIES);
- new ItemsSummaryTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_BUSINESSES"),UDDIActionInputs.QUERY_ITEM_BUSINESSES);
- new ItemsSummaryTool(toolManager_,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICES"),UDDIActionInputs.QUERY_ITEM_SERVICES);
- new ItemsSummaryTool(toolManager_,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICE_INTERFACES"),UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
- }
-
- public String getOpenImagePath()
- {
- return "uddi/images/queries_open_highlighted.gif";
- }
-
- public String getClosedImagePath()
- {
- return "uddi/images/queries_closed_highlighted.gif";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java
deleted file mode 100644
index f28a1be58..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RefreshUDDINodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class RefreshTool extends ActionTool
-{
- public RefreshTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"images/refresh_enabled.gif","images/refresh_highlighted.gif",alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getActionLink()
- {
- return RefreshUDDINodeAction.getActionLink(toolManager_.getNode().getNodeId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java
deleted file mode 100644
index 2045169cf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolProperties;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegFindTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
- public RegFindTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"uddi/images/find_enabled.gif","uddi/images/find_highlighted.gif",alt);
- }
-
- protected final void initDefaultProperties()
- {
- initDefaultProperties(this);
- setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
- setProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES,new Hashtable());
- UDDIPerspective uddiPerspective = toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
- setProperty(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("DEFAULT_QUERY_NAME"));
- }
-
- private final void initDefaultProperties(FormToolPropertiesInterface formToolPI)
- {
- toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
- formToolPI.setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
- formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
- formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
- formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-
- String maxSearchSet = String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET);
- String maxResults = String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS);
-
- // RegFindBusinessesSimpleAction inputs
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,"");
-
- // RegFindBusinessesAdvancedAction inputs
- // The authentication inputs must be added later as this method is called before we can get a valid handle
- // to the RegistryElement in the case of a query node.
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,maxSearchSet);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,maxResults);
-
- // RegFindServicesSimpleAction inputs
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
-
- // RegFindServicesAdvancedAction inputs
- // The authentication inputs must be added later as this method is called before we can get a valid handle
- // to the RegistryElement in the case of a query node.
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,maxSearchSet);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,maxResults);
-
- // RegFindServiceInterfacesSimpleAction inputs
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,"");
-
- // RegFindServiceInterfacesAdvancedAction inputs
- // The authentication inputs must be added later as this method is called before we can get a valid handle
- // to the RegistryElement in the case of a query node.
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,"");
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,maxSearchSet);
- formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,maxResults);
- }
-
- public final void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-
- public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
- {
- String subQueryKey = (String)subQueryKeyObject;
- if (subQueryKey == null || subQueryKey.length() < 1)
- return this;
- Hashtable subQueriesProperties = (Hashtable)getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = (FormToolPropertiesInterface)subQueriesProperties.get(subQueryKey);
- if (subQueryProperties == null)
- {
- subQueryProperties = new FormToolProperties();
- initDefaultProperties(subQueryProperties);
- subQueriesProperties.put(subQueryKey,subQueryProperties);
- }
- return subQueryProperties;
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
- return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
- }
-
- public String getFormLink()
- {
- Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
- if (subQueryKeyObject != null)
- {
- getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
- Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
- if (subQueryGetObject != null)
- {
- boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
- if (isSubQueryGet)
- return "uddi/forms/GetForm.jsp";
- }
- }
- return "uddi/forms/RegFindForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java
deleted file mode 100644
index d1b2e7c34..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegPublishTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
- ToolManager invisibleToolManager_;
- private RegFindTool regFindTool_;
- public RegPublishTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"uddi/images/publish_enabled.gif","uddi/images/publish_highlighted.gif",alt);
- invisibleToolManager_ = new ToolManager(toolManager.getNode());
- regFindTool_ = new RegFindTool(invisibleToolManager_,"");
- }
-
- protected final void initDefaultProperties()
- {
- toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
- setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-
- setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
- String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
- setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
- setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-
- // RegPublishBusinessSimpleAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION,"");
-
- // RegPublishServiceSimpleAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,"");
-
- // RegPublishServiceAdvancedAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,"");
-
- // RegPublishServiceInterfaceSimpleAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,"");
-
- // RegPublishServiceInterfaceAdvancedAction inputs
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,"");
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,"");
- }
-
- public final void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- regFindTool_.addAuthenticationProperties(regElement);
- }
-
- public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
- {
- // Empty/Non-existent subquerykey implies publish form. All else implies query form.
- String subQueryKey = (String)subQueryKeyObject;
- if (subQueryKey == null || subQueryKey.length() < 1)
- return this;
- else
- return regFindTool_.getFormToolProperties(subQueryKeyObject);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
- return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
- }
-
- public String getFormLink()
- {
- Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
- String subQueryKey = null;
- if (subQueryKeyObject != null)
- {
- getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
- FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
- Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
- if (subQueryGetObject != null)
- {
- boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
- if (isSubQueryGet)
- return "uddi/forms/GetForm.jsp";
- }
- subQueryKey = (String)subQueryKeyObject;
- }
-
- if (subQueryKey == null || subQueryKey.length() < 1)
- return "uddi/forms/RegPublishForm.jsp";
- else
- return regFindTool_.getFormLink();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java
deleted file mode 100644
index ad9758ee7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegistryDetailsTool extends DetailsTool
-{
- public RegistryDetailsTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/RegDetailsForm.jsp"));
- }
-
- public final void initDefaultProperties()
- {
- clearPropertyTable();
- toolManager_.getNode().getNodeManager().getController();
- RegistryElement regElement = (RegistryElement)(toolManager_.getNode().getTreeElement());
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME,regElement.getName());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java
deleted file mode 100644
index 728784343..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.PublishedItemsElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.QueryParentElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegistryNode extends UDDINavigatorNode
-{
- private RegistryDetailsTool regDetailsTool_;
- private RegPublishTool regPublishTool_;
- private LoginTool loginTool_;
-
- public static final String IMAGE_PATH_STANDARD = "uddi/images/registry.gif";
- public static final String IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES = "uddi/images/regstrycat_obj.gif";
-
- public RegistryNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
- {
- super(element,nodeManager,nodeDepth,imagePath);
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(UDDIModelConstants.REL_QUERIES_PARENT))
- {
- QueryParentElement queryParentElement = (QueryParentElement)event.getParentElement();
- createChildNode(queryParentElement);
- }
- else if (isPublishedItemsRel(rel))
- {
- PublishedItemsElement publishedItemsElement = (PublishedItemsElement)event.getParentElement();
- createChildNode(publishedItemsElement);
- }
- }
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- String inBoundRelName = event.getInBoundRelName();
- String outBoundRelName = event.getOutBoundRelName();
- if (inBoundRelName.equals(UDDIModelConstants.REL_QUERIES_PARENT) || isPublishedItemsRel(inBoundRelName))
- childElement = (TreeElement)event.getInboundElement();
- else if (outBoundRelName.equals(UDDIModelConstants.REL_QUERIES_PARENT) || isPublishedItemsRel(outBoundRelName))
- childElement = (TreeElement)event.getOutBoundElement();
-
- if (childElement != null)
- removeChildNode(childElement);
- }
- });
- UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
- element.connect(new QueryParentElement(uddiPerspective.getMessage("NODE_NAME_QUERIES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_QUERIES_PARENT,ModelConstants.REL_OWNER);
- element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_BUSINESSES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_BUSINESSES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT,ModelConstants.REL_OWNER);
- element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_SERVICES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_SERVICES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT,ModelConstants.REL_OWNER);
- element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_SERVICE_INTERFACES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT,ModelConstants.REL_OWNER);
- setVisibilityOfChildren(false);
- }
-
- private final boolean isPublishedItemsRel(String rel)
- {
- return rel.equals(UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT) || rel.equals(UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT) || rel.equals(UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT);
- }
-
- private final void createChildNode(QueryParentElement queryParentElement)
- {
- QueryParentNode queryParentNode = new QueryParentNode(queryParentElement,nodeManager_,nodeDepth_+1);
- addChild(queryParentNode);
- }
-
- private final void createChildNode(PublishedItemsElement publishedItemsElement)
- {
- PublishedItemsNode publishedItemsNode = new PublishedItemsNode(publishedItemsElement,nodeManager_,nodeDepth_+1);
- addChild(publishedItemsNode);
- }
-
- protected final void initTools()
- {
- nodeManager_.getController();
- UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
- regDetailsTool_ = new RegistryDetailsTool(toolManager_ ,uddiPerspective.getMessage("ALT_REGISTRY_DETAILS"));
- RegFindTool regFindTool = new RegFindTool(toolManager_,uddiPerspective.getMessage("ALT_FIND"));
- regPublishTool_ = new RegPublishTool(toolManager_,uddiPerspective.getMessage("ALT_PUBLISH"));
- loginTool_ = new LoginTool(toolManager_, uddiPerspective.getMessage("ALT_LOGIN"));
- new AddToFavoritesTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
- regFindTool.addAuthenticationProperties((RegistryElement)element_);
- regPublishTool_.addAuthenticationProperties((RegistryElement)element_);
- }
-
- public final RegistryDetailsTool getRegDetailsTool()
- {
- return regDetailsTool_;
- }
-
- public final RegPublishTool getRegPublishTool()
- {
- return regPublishTool_;
- }
-
- public final LoginTool getLoginTool()
- {
- return loginTool_;
- }
-
- private final void addDiscoveredNodes(Vector allNodes,Node queryParentNode,int queryType)
- {
- Vector queryNodes = queryParentNode.getChildNodes();
- for (int i=0;i<queryNodes.size();i++)
- {
- QueryNode queryNode = (QueryNode)queryNodes.elementAt(i);
- QueryElement queryElement = (QueryElement)queryNode.getTreeElement();
- if (queryType == UDDIActionInputs.QUERY_ITEM_QUERIES)
- allNodes.addElement(queryNode);
- else if (queryElement.getQueryType() == queryType)
- {
- Vector discoveredNodes = queryNode.getChildNodes();
- for (int j=0;j<discoveredNodes.size();j++)
- allNodes.addElement(discoveredNodes.elementAt(j));
- }
- }
- }
-
- private final void addPublishedNodes(Vector allNodes,Node publishedItemsNode)
- {
- Vector itemNodes = publishedItemsNode.getChildNodes();
- for (int i=0;i<itemNodes.size();i++)
- allNodes.addElement(itemNodes.elementAt(i));
- }
-
- public final void getAllBusinessNodes(Vector allBusinessNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node queryParentNode = getChildNode(regElement.getQueryParentElement());
- Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
- addDiscoveredNodes(allBusinessNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_BUSINESSES);
- addPublishedNodes(allBusinessNodes,publishedBusinessesNode);
- }
-
- public final void getAllServiceNodes(Vector allServicesNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node queryParentNode = getChildNode(regElement.getQueryParentElement());
- Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
- addDiscoveredNodes(allServicesNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_SERVICES);
- addPublishedNodes(allServicesNodes,publishedServicesNode);
- }
-
- public final void getAllServiceInterfaceNodes(Vector allServiceInterfaceNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node queryParentNode = getChildNode(regElement.getQueryParentElement());
- Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
- addDiscoveredNodes(allServiceInterfaceNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
- addPublishedNodes(allServiceInterfaceNodes,publishedServiceInterfacesNode);
- }
-
- public final void getPublishedBusinessNodes(Vector publishedBusinessNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
- addPublishedNodes(publishedBusinessNodes,publishedBusinessesNode);
- }
-
- public final void getPublishedServiceNodes(Vector publishedServiceNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
- addPublishedNodes(publishedServiceNodes,publishedServicesNode);
- }
-
- public final void getPublishedServiceInterfaceNodes(Vector publishedServiceInterfaceNodes)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
- addPublishedNodes(publishedServiceInterfaceNodes,publishedServiceInterfacesNode);
- }
-
- public final void getDiscoveredNodes(Vector discoveredNodes,int queryItem)
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node queryParentNode = getChildNode(regElement.getQueryParentElement());
- addDiscoveredNodes(discoveredNodes,queryParentNode,queryItem);
- }
-
- private final boolean hasQueryResults(Node queryParentNode,int queryType)
- {
- Vector queries = queryParentNode.getChildNodes();
- for (int i=0;i<queries.size();i++)
- {
- QueryNode queryNode = (QueryNode)queries.elementAt(i);
- if (queryNode.getChildNodes().size() > 0)
- {
- QueryElement queryElement = (QueryElement)queryNode.getTreeElement();
- if (queryElement.getQueryType() == queryType)
- return true;
- }
- }
- return false;
- }
-
- public final boolean hasBusiness()
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
- if (publishedBusinessesNode.getChildNodes().size() > 0)
- return true;
- return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_BUSINESSES);
- }
-
- public final boolean hasService()
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
- if (publishedServicesNode.getChildNodes().size() > 0)
- return true;
- return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_SERVICES);
- }
-
- public final boolean hasServiceInterface()
- {
- RegistryElement regElement = (RegistryElement)element_;
- Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
- if (publishedServiceInterfacesNode.getChildNodes().size() > 0)
- return true;
- return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java
deleted file mode 100644
index e257f6c62..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class ResultsTool extends FormTool
-{
- private String formLink_;
-
- public ResultsTool(ToolManager toolManager,String alt)
- {
- super(toolManager,"images/details_enabled.gif","images/details_highlighted.gif",alt);
- formLink_ = ProxyLoadPageAction.getActionLink("uddi/forms/ResultsForm.jsp");
- }
-
- public final void initDefaultProperties()
- {
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public String getFormLink()
- {
- return formLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java
deleted file mode 100644
index fb1c0ce37..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryElement;
-
-public class RootCategoryNode extends Node
-{
- public RootCategoryNode(TreeElement element,NodeManager nodeManager)
- {
- super(element,nodeManager,1,"images/root_main.gif");
- setVisibilityOfChildren(true);
- }
-
- public final void createChildren()
- {
- Enumeration children = element_.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
- if (children != null)
- {
- while (children.hasMoreElements())
- {
- CategoryElement categoryElement = (CategoryElement)children.nextElement();
- CategoryNode categoryNode = new CategoryNode(categoryElement,nodeManager_,nodeDepth_+1);
- addChild(categoryNode);
- categoryNode.createChildren();
- }
- }
- }
-
- // Root node: no need for toggle action.
- protected final String getToggleNodeActionHref()
- {
- return null;
- }
-
- // Text only node.
- protected final String getLinkActionHref()
- {
- return null;
- }
-
- protected final void initTools()
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java
deleted file mode 100644
index f506bde86..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceElement;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.util.CategoryBag;
-
-public class ServiceDetailsTool extends DetailsTool
-{
- public ServiceDetailsTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/ServiceDetailsForm.jsp"));
- }
-
- public final void initDefaultProperties()
- {
- clearPropertyTable();
- toolManager_.getNode().getNodeManager().getController();
- ServiceElement serviceElement = (ServiceElement)(toolManager_.getNode().getTreeElement());
- BusinessService busService = serviceElement.getBusinessService();
-
- setProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,busService.getServiceKey());
- setProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,busService.getBusinessKey());
-
- Vector nameVector = new Vector();
- copyIndexVector(busService.getNameVector(),nameVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
-
- Vector descriptionVector = new Vector();
- copyIndexVector(busService.getDescriptionVector(),descriptionVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
-
- CategoryBag catBag = busService.getCategoryBag();
- if (catBag != null)
- {
- Vector catVector = new Vector();
- copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catVector);
- }
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java
deleted file mode 100644
index c7c984752..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.ServiceInterfaceElement;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.IdentifierBag;
-
-public class ServiceInterfaceDetailsTool extends DetailsTool
-{
- public ServiceInterfaceDetailsTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/ServiceInterfaceDetailsForm.jsp"));
- }
-
- public final void initDefaultProperties()
- {
- clearPropertyTable();
- toolManager_.getNode().getNodeManager().getController();
- ServiceInterfaceElement siElement = (ServiceInterfaceElement)(toolManager_.getNode().getTreeElement());
- TModel tModel = siElement.getTModel();
-
- setProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,tModel.getTModelKey());
- ListElement nameListElement = new ListElement(tModel.getNameString());
- nameListElement.setTargetViewToolInfo(-1,-1,0);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,nameListElement);
-
- Vector descriptionVector = new Vector();
- copyIndexVector(tModel.getDescriptionVector(),descriptionVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,descriptionVector);
-
- IdentifierBag idBag = tModel.getIdentifierBag();
- if (idBag != null)
- {
- Vector idVector = new Vector();
- copyIndexVector(idBag.getKeyedReferenceVector(),idVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idVector);
- }
-
- CategoryBag catBag = tModel.getCategoryBag();
- if (catBag != null)
- {
- Vector catVector = new Vector();
- copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catVector);
- }
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java
deleted file mode 100644
index c8938f867..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceInterfaceGetBusinessesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceInterfaceGetServicesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ServiceInterfaceNode extends UDDINavigatorNode
-{
- private DetailsTool detailsTool_;
- private UnpublishTool unpublishTool_;
- public ServiceInterfaceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"uddi/images/service_interface_highlighted.gif");
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- detailsTool_ = new ServiceInterfaceDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_SERVICE_INTERFACE_DETAILS"));
- new GetServicesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICES"),ServiceInterfaceGetServicesAction.getActionLink(nodeId_));
- new GetBusinessesTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_GET_BUSINESSES"),ServiceInterfaceGetBusinessesAction.getActionLink(nodeId_));
- new UDDIImportWSDLToWorkbenchTool(toolManager_,controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new UDDIImportWSDLToFileSystemTool(toolManager_,controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new UDDILaunchWebServiceWizardTool(toolManager_,controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new AddToFavoritesTool(toolManager_, uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
- unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_service_interface_enabled.gif","uddi/images/unpublish_service_interface_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_SERVICE_INTERFACE"));
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- detailsTool_.addAuthenticationProperties(regElement);
- unpublishTool_.addAuthenticationProperties(regElement);
- }
-
- public String getWSDLURLFromDetailsTool()
- {
- ListElement wsdlURLListElement = (ListElement)detailsTool_.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
- if (wsdlURLListElement != null)
- return (String)wsdlURLListElement.getObject();
- else
- return "temp.wsdl";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java
deleted file mode 100644
index bbeac5f88..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceGetBusinessAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ServiceGetServiceInterfacesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ServiceNode extends UDDINavigatorNode
-{
- private DetailsTool detailsTool_;
- private UnpublishTool unpublishTool_;
- public ServiceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"uddi/images/service_highlighted.gif");
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- detailsTool_ = new ServiceDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_SERVICE_DETAILS"));
- new GetBusinessesTool(toolManager_,"uddi/images/business_enabled.gif","uddi/images/business_highlighted.gif",uddiPerspective.getMessage("ALT_GET_BUSINESS"),ServiceGetBusinessAction.getActionLink(nodeId_));
- new GetServiceInterfacesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICE_INTERFACES"),ServiceGetServiceInterfacesAction.getActionLink(nodeId_));
- new UDDIImportWSDLToWorkbenchTool(toolManager_,controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new UDDIImportWSDLToFileSystemTool(toolManager_,controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new UDDILaunchWebServiceWizardTool(toolManager_,controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new UDDIAddToWSDLPerspectiveTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_WSDL_PERSPECTIVE"));
- new AddToFavoritesTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
- unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_service_enabled.gif","uddi/images/unpublish_service_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_SERVICE"));
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- detailsTool_.addAuthenticationProperties(regElement);
- unpublishTool_.addAuthenticationProperties(regElement);
- }
-
- public String getWSDLURLFromDetailsTool()
- {
- ListElement wsdlURLListElement = (ListElement)detailsTool_.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
- if (wsdlURLListElement != null)
- return (String)wsdlURLListElement.getObject();
- else
- return "temp.wsdl";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java
deleted file mode 100644
index bca7dd193..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-public class SubQueryKeyProperty
-{
- private String subQueryKey_;
-
- public SubQueryKeyProperty()
- {
- subQueryKey_ = "";
- }
-
- public final void setSubQueryKey(String subQueryKey)
- {
- subQueryKey_ = subQueryKey;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java
deleted file mode 100644
index 819e619cf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-public class SubQueryTransferTarget
-{
- private int nodeId_;
- private int toolId_;
- private int viewId_;
- private int viewToolId_;
- private String subQueryKey_;
- private NodeManager nodeManager_;
- Hashtable parentQueryData_;
-
- public SubQueryTransferTarget(Node node,String subQueryKey,Hashtable parentQueryData)
- {
- nodeId_ = node.getNodeId();
- toolId_ = node.getToolManager().getSelectedToolId();
- viewId_ = node.getViewId();
- viewToolId_ = node.getViewToolId();
- subQueryKey_ = subQueryKey;
- nodeManager_ = node.getNodeManager();
- parentQueryData_ = parentQueryData;
- }
-
- public final int getNodeId()
- {
- return nodeId_;
- }
-
- public final int getToolId()
- {
- return toolId_;
- }
-
- public final int getViewId()
- {
- return viewId_;
- }
-
- public final int getViewToolId()
- {
- return viewToolId_;
- }
-
- public final String getSubQueryKey()
- {
- return subQueryKey_;
- }
-
- public final FormTool getTargetFormTool()
- {
- Node node = nodeManager_.getNode(nodeId_);
- if (node == null)
- return null;
-
- Tool tool = node.getToolManager().getTool(toolId_);
-
- if (viewId_ != ActionInputs.VIEWID_DEFAULT)
- {
- ViewTool viewTool = (ViewTool)tool;
- ToolManager viewToolManager = viewTool.getToolManager(viewId_);
- if (viewToolManager != null)
- tool = viewToolManager.getTool(viewToolId_);
- else
- tool = null;
- }
- return (FormTool)tool;
- }
-
- public final Hashtable getParentQueryData()
- {
- return parentQueryData_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java
deleted file mode 100644
index a9e2b6ecb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.UDDIAddToWSDLPerspectiveAction;
-
-public class UDDIAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
- public UDDIAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return UDDIAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java
deleted file mode 100644
index 7d85a02ce..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.UDDIImportWSDLToFileSystemAction;
-
-public class UDDIImportWSDLToFileSystemTool extends ImportToFileSystemTool
-{
- public UDDIImportWSDLToFileSystemTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt);
- }
-
- public final String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getActionLink()
- {
- Node node = toolManager_.getNode();
- return UDDIImportWSDLToFileSystemAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java
deleted file mode 100644
index 16c36218f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class UDDIImportWSDLToWorkbenchTool extends ImportToWorkbenchTool
-{
- public UDDIImportWSDLToWorkbenchTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getFormLink()
- {
- return "uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java
deleted file mode 100644
index 3d7e36f10..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class UDDILaunchWebServiceWizardTool extends LaunchWebServiceWizardTool
-{
- public UDDILaunchWebServiceWizardTool(ToolManager toolManager,String alt)
- {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getFormLink()
- {
- return "uddi/forms/UDDILaunchWebServiceWizardForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java
deleted file mode 100644
index 6c9000d25..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement;
-
-// Root node for the UDDI Navigator Tree View
-public class UDDIMainNode extends UDDINavigatorNode
-{
- public UDDIMainNode(TreeElement element,NodeManager nodeManager)
- {
- super(element,nodeManager,1,"images/root_main.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(UDDIModelConstants.REL_REGISTRIES))
- {
- RegistryElement registryElement = (RegistryElement)event.getParentElement();
- UDDIMainElement uddiMainElement = (UDDIMainElement)element_;
- uddiMainElement.addRegistryName(registryElement.getName());
- createChildNode(registryElement);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- RegistryElement childElement = null;
- if (event.getInBoundRelName().equals(UDDIModelConstants.REL_REGISTRIES))
- childElement = (RegistryElement)event.getInboundElement();
- else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_REGISTRIES))
- childElement = (RegistryElement)event.getOutBoundElement();
-
- if (childElement != null)
- {
- UDDIMainElement uddiMainElement = (UDDIMainElement)element_;
- uddiMainElement.removeRegistryName(childElement.getName());
- removeChildNode(childElement);
- }
- }
- });
- }
-
- private final void createChildNode(TreeElement element)
- {
- RegistryElement regElement = (RegistryElement)element;
- Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
- String imagePath;
- if (userDefinedCategories != null && userDefinedCategories.hasMoreElements())
- imagePath = RegistryNode.IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES;
- else
- imagePath = RegistryNode.IMAGE_PATH_STANDARD;
-
- RegistryNode regNode = new RegistryNode(element,nodeManager_,nodeDepth_+1,imagePath);
- addChild(regNode);
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- new OpenRegistryTool(toolManager_,uddiPerspective.getMessage("ALT_OPEN_REGISTRY"));
- }
-
- // Given a node under a particular registry node, obtain the registry node.
- public final RegistryNode getRegistryNode(Node currentNode)
- {
- RegistryNode regNode = null;
- if (currentNode instanceof RegistryNode)
- {
- regNode = (RegistryNode)currentNode;
- }
- else if (currentNode instanceof QueryNode)
- {
- // Query -> Query folder -> Registry
- regNode = (RegistryNode)(currentNode.getParent().getParent());
- }
- else if (currentNode instanceof QueryParentNode || currentNode instanceof PublishedItemsNode)
- {
- // Query folder -> Registry
- regNode = (RegistryNode)(currentNode.getParent());
- }
- else if (currentNode instanceof BusinessNode || currentNode instanceof ServiceNode || currentNode instanceof ServiceInterfaceNode)
- {
- // itemNode -> Published Items folder -> Registry
- // OR:
- // itemNode -> QueryNode -> Query folder -> Registry
- Node parentNode = currentNode.getParent();
- if (parentNode instanceof QueryNode)
- regNode = (RegistryNode)(parentNode.getParent().getParent());
- else
- regNode = (RegistryNode)parentNode.getParent();
- }
- return regNode;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java
deleted file mode 100644
index 57c8cd3f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FolderNode;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleNavigatorNodeAction;
-
-public abstract class UDDINavigatorFolderNode extends FolderNode
-{
- public UDDINavigatorFolderNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth);
- }
-
- // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...
- public final String getToggleNodeActionHref()
- {
- return ToggleNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...
- public final String getLinkActionHref()
- {
- return SelectNavigatorNodeAction.getActionLink(nodeId_,false);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java
deleted file mode 100644
index bde07285c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.ToggleNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public abstract class UDDINavigatorNode extends Node
-{
- public UDDINavigatorNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
- {
- super(element,nodeManager,nodeDepth,imagePath);
- }
-
- // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...
- public final String getToggleNodeActionHref()
- {
- return ToggleNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...
- public final String getLinkActionHref()
- {
- return SelectNavigatorNodeAction.getActionLink(nodeId_,false);
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java
deleted file mode 100644
index 67cbdb61b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060224 122752 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeDefault;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddRegistryToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SwitchPerspectiveFromUDDIAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.parser.favorites.IFavoritesUDDIRegistry;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDIPerspective extends Perspective
-{
- private Hashtable knownRegistries_;
- private IFavoritesUDDIRegistry defaultUDDIRegistry_;
- private Model navigatorModel_;
- private NodeManager navigatorManager_;
- private int wsdlType_;
- private Hashtable categoryManagers_;
- String categoryTModelKey_;
-
- // Window sizes
- private String perspectiveContentFramesetCols_;
- private String savedPerspectiveContentFramesetCols_;
- private String actionsContainerFramesetRows_;
- private String savedActionsContainerFramesetRows_;
-
- public UDDIPerspective(Controller controller)
- {
- super("uddi",controller);
- }
-
- public final void initPerspective(ServletContext application)
- {
- String defaultFavorites = controller_.getDefaultFavoritesLocation();
- FavoritesRegistryTypeDefault favRegTypeDefault = new FavoritesRegistryTypeDefault(defaultFavorites);
- IFavoritesUDDIRegistry[] favRegistriesDefault = favRegTypeDefault.getFavoritesUDDIRegistries();
- knownRegistries_ = new Hashtable();
- for (int i=0;i<favRegistriesDefault.length;i++)
- {
- knownRegistries_.put(favRegistriesDefault[i].getInquiryURL(),favRegistriesDefault[i]);
- }
- if (favRegistriesDefault.length > 0)
- defaultUDDIRegistry_ = favRegistriesDefault[0];
-
- navigatorModel_ = new BasicModel("uddiModel");
- UDDIMainElement uddiMainElement = new UDDIMainElement(getMessage("NODE_NAME_UDDI_MAIN"),navigatorModel_);
- navigatorModel_.setRootElement(uddiMainElement);
- navigatorManager_ = new NodeManager(controller_);
- UDDIMainNode uddiMainNode = new UDDIMainNode(uddiMainElement,navigatorManager_);
- navigatorManager_.setRootNode(uddiMainNode);
-
- wsdlType_ = UDDIActionInputs.WSDL_TYPE_SERVICE_INTERFACE;
- categoryManagers_ = new Hashtable();
-
- // Initialize the default category models.
- if (application.getAttribute("commonCategoryModels") == null)
- {
- synchronized (application)
- {
- if (application.getAttribute("commonCategoryModels") == null)
- {
- Hashtable commonCategoryModels = new Hashtable();
-
- CategoryModel naicsModel = new CategoryModel();
- naicsModel.setServletContext(application);
- naicsModel.setDefaultDataFile("/uddi/data/naics-data.txt");
- naicsModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_NAICS"));
- naicsModel.setTModelKey(TModel.NAICS_TMODEL_KEY);
- commonCategoryModels.put(TModel.NAICS_TMODEL_KEY,naicsModel);
-
- CategoryModel unspscModel = new CategoryModel();
- unspscModel.setServletContext(application);
- unspscModel.setDefaultDataFile("/uddi/data/unspsc-data.txt");
- unspscModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_UNSPSC_73"));
- unspscModel.setTModelKey(TModel.UNSPSC_73_TMODEL_KEY);
- commonCategoryModels.put(TModel.UNSPSC_73_TMODEL_KEY,unspscModel);
-
- CategoryModel geoModel = new CategoryModel();
- geoModel.setServletContext(application);
- geoModel.setDefaultDataFile("/uddi/data/geo-data.txt");
- geoModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_GEO"));
- geoModel.setTModelKey(TModel.ISO_CH_TMODEL_KEY);
- commonCategoryModels.put(TModel.ISO_CH_TMODEL_KEY,geoModel);
-
- application.setAttribute("commonCategoryModels",commonCategoryModels);
- }
- }
- }
- categoryTModelKey_ = null;
-
- // Starting frameset sizes.
- if (!DirUtils.isRTL())
- perspectiveContentFramesetCols_ = "30%,*";
- else
- perspectiveContentFramesetCols_ = "*,30%";
- savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
- actionsContainerFramesetRows_ = "75%,*";
- savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
- }
-
- public final Hashtable getKnownRegistries()
- {
- // We must always query the favorites to see if additional registries were added over time. This property cannot be cached.
- FavoritesMainElement favMainElement = (FavoritesMainElement)(controller_.getFavoritesPerspective().getNodeManager().getRootNode().getTreeElement());
- FavoritesUDDIRegistryFolderElement favRegFolderElement = favMainElement.getFavoritesUDDIRegistryFolderElement();
- Enumeration e = favRegFolderElement.getAllFavorites();
- while (e.hasMoreElements())
- {
- FavoritesUDDIRegistryElement favRegElement = (FavoritesUDDIRegistryElement)e.nextElement();
- String inquiryURL = favRegElement.getInquiryURL();
- if (knownRegistries_.get(inquiryURL) == null)
- knownRegistries_.put(inquiryURL,favRegElement.getIFavoritesUDDIRegistryInterface());
- }
- return knownRegistries_;
- }
-
- public final String getKnownRegistryPublishURL(String inquiryURL)
- {
- IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)getKnownRegistries().get(inquiryURL);
- if (knownRegistry != null)
- {
- String publishURL = knownRegistry.getPublishURL();
- if (Validator.validateURL(publishURL))
- return publishURL;
- }
- return null;
- }
-
- public final String getKnownRegistryRegistrationURL(String inquiryURL)
- {
- IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)getKnownRegistries().get(inquiryURL);
- if (knownRegistry != null)
- {
- String registrationURL = knownRegistry.getRegistrationURL();
- if (Validator.validateURL(registrationURL))
- return registrationURL;
- }
- return null;
- }
-
- public final IFavoritesUDDIRegistry getDefaultUDDIRegistry()
- {
- return defaultUDDIRegistry_;
- }
-
- public final void preloadUDDIRegistries(String[] inquiryURLs, String[] publishURLs)
- {
- if (inquiryURLs != null)
- {
- Hashtable knownRegistries = getKnownRegistries();
- StringBuffer directoryBuffer = new StringBuffer();
- for (int i = 0; i < inquiryURLs.length; i++)
- {
- String inquiryURL = URLUtils.decode(inquiryURLs[i]);
- String publishURL = null;
- String regName = null;
- String registrationURL = null;
- // continue to the next registry if inquiryURL does not exist
- if (!Validator.validateURL(inquiryURL))
- continue;
- // populate and run an OpenRegistryAction
- OpenRegistryAction action = new OpenRegistryAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)knownRegistries.get(inquiryURL);
- boolean checkForUserDefinedCategories = false;
- File directoryFile = null;
- if (knownRegistry != null)
- {
- publishURL = knownRegistry.getPublishURL();
- regName = knownRegistry.getName();
- registrationURL = knownRegistry.getRegistrationURL();
- directoryBuffer.setLength(0);
- FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),regName);
- directoryFile = new File(directoryBuffer.toString());
- if (directoryFile.exists() && directoryFile.listFiles().length > 0)
- checkForUserDefinedCategories = true;
- }
- if (regName == null)
- regName = inquiryURL;
- if (publishURL == null && publishURLs != null && i < publishURLs.length && publishURLs[i] != null) {
- publishURL = URLUtils.decode(publishURLs[i]);
- }
- // populate the action
- propertyTable.put(UDDIActionInputs.INQUIRY_URL, inquiryURL);
- propertyTable.put(UDDIActionInputs.REGISTRY_NAME, regName);
- if (Validator.validateURL(publishURL))
- propertyTable.put(UDDIActionInputs.PUBLISH_URL, publishURL);
- if (Validator.validateURL(registrationURL))
- propertyTable.put(UDDIActionInputs.REGISTRATION_URL, registrationURL);
-
- // Check if private registry category information is available for this registry.
- directoryBuffer.setLength(0);
- String encodedInquiryURL = URLUtils.encode(inquiryURL);
- directoryBuffer.append(controller_.getServletEngineStateLocation()).append(encodedInquiryURL).append(".properties");
- directoryFile = new File(directoryBuffer.toString());
- if (directoryFile.exists())
- {
- try
- {
- Properties p = new Properties();
- FileInputStream fin = new FileInputStream(directoryFile);
- p.load(fin);
- fin.close();
- directoryFile.delete();
- String dataDirectory = p.getProperty(UDDIActionInputs.CATEGORIES_DIRECTORY);
- if (dataDirectory != null)
- propertyTable.put(UDDIActionInputs.CATEGORIES_DIRECTORY,dataDirectory);
- checkForUserDefinedCategories = true;
- }
- catch (IOException e)
- {
- checkForUserDefinedCategories = false;
- }
- }
-
- if (checkForUserDefinedCategories)
- propertyTable.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,Boolean.TRUE);
- else
- propertyTable.remove(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
-
- // run the action
- action.run();
-
- RegistryElement regElement = (RegistryElement)(navigatorManager_.getSelectedNode().getTreeElement());
- Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
- if (userDefinedCategories != null && userDefinedCategories.hasMoreElements())
- {
- AddRegistryToUDDIPerspectiveAction action2 = new AddRegistryToUDDIPerspectiveAction(controller_);
- String categoriesDirectory = regElement.getCategoriesDirectory();
- if (categoriesDirectory != null)
- action2.linkCategoryModelsWithSavedData(userDefinedCategories,categoriesDirectory);
- else
- action2.linkCategoryModelsWithSavedData(regElement.getName(),userDefinedCategories);
- }
- }
- if (inquiryURLs.length > 0)
- controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_UDDI);
- }
- }
-
- // Preconditions:
- // serviceNames and serviceKeys have length >= 1.
- // regNode != null
- private final void preloadServicesForRegistry(RegistryNode regNode,String[] serviceNames,String[] serviceKeys)
- {
- int regNodeId = regNode.getNodeId();
- for (int i=0;i<serviceKeys.length;i++)
- {
- navigatorManager_.setSelectedNodeId(regNodeId);
- RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_NAME,serviceNames[i]);
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceKeys[i]);
- action.run();
- navigatorManager_.makeSelectedNodeVisible();
- }
- }
-
- public final void preloadServices(String[] inquiryURLs,String[] serviceNames,String[] serviceKeys)
- {
- // The algorithm will search for each service key in each inquiry URL.
- if (serviceKeys != null && serviceNames != null && serviceNames.length == serviceKeys.length)
- {
- for (int i=0;i<serviceKeys.length;i++)
- {
- if (inquiryURLs != null)
- {
- // Eliminate duplicate inquiry URLs.
- Hashtable inquiryURLsHash = new Hashtable();
- for (int j=0;j<inquiryURLs.length;j++)
- inquiryURLsHash.put(inquiryURLs[j],Boolean.TRUE);
- // Loop through all the available registries and use them if possible.
- Node uddiMainNode = navigatorManager_.getRootNode();
- Vector registryNodes = uddiMainNode.getChildNodes();
- for (int k=0;k<registryNodes.size();k++)
- {
- RegistryNode regNode = (RegistryNode)registryNodes.elementAt(k);
- RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
- String existingRegistryInquiryURL = regElement.getInquiryURL();
- if (inquiryURLsHash.get(existingRegistryInquiryURL) != null)
- {
- preloadServicesForRegistry(regNode,serviceNames,serviceKeys);
- inquiryURLsHash.remove(existingRegistryInquiryURL);
- }
- }
- Enumeration inquiryURLsEnum = inquiryURLsHash.keys();
- while (inquiryURLsEnum.hasMoreElements())
- {
- String inquiryURL = (String)inquiryURLsEnum.nextElement();
- preloadUDDIRegistries(new String[] {inquiryURL},null);
- RegistryNode regNode = (RegistryNode)navigatorManager_.getSelectedNode();
- preloadServicesForRegistry(regNode,serviceNames,serviceKeys);
- }
- }
- }
- }
- }
-
- public final void setCategoryTModelKey(String categoryTModelKey)
- {
- categoryTModelKey_ = categoryTModelKey;
- }
-
- public final String getCategoryTModelKey()
- {
- return categoryTModelKey_;
- }
-
- private final void initCategoryBrowser(CategoryModel categoryModel,NodeManager nodeManager)
- {
- TreeElement categoryRootElement = (TreeElement)categoryModel.getRootElement();
- RootCategoryNode rootCategoryNode = new RootCategoryNode(categoryRootElement,nodeManager);
- nodeManager.setRootNode(rootCategoryNode);
- rootCategoryNode.createChildren();
- }
-
- public final NodeManager getCategoryManager()
- {
- return (NodeManager)categoryManagers_.get(categoryTModelKey_);
- }
-
- public final NodeManager getCategoryManager(CategoryModel categoryModel)
- {
- String tModelKey = categoryModel.getTModelKey();
- NodeManager categoryManager = (NodeManager)categoryManagers_.get(tModelKey);
- if (categoryManager == null)
- {
- categoryManager = new NodeManager(controller_);
- initCategoryBrowser(categoryModel,categoryManager);
- categoryManagers_.put(tModelKey,categoryManager);
- }
- return categoryManager;
- }
-
- public final NodeManager getNavigatorManager()
- {
- return navigatorManager_;
- }
-
- public final NodeManager getNodeManager()
- {
- return getNavigatorManager();
- }
-
- public final void setWSDLType(int wsdlType)
- {
- wsdlType_ = wsdlType;
- }
-
- public final int getWSDLType()
- {
- return wsdlType_;
- }
-
- public final String getPerspectiveContentPage()
- {
- return "uddi/uddi_perspective_content.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_UDDI;
- }
-
- public final String getFramesetsFile()
- {
- return "uddi/scripts/uddiframesets.jsp";
- }
-
- public final String getProcessFramesetsForm()
- {
- return "uddi/forms/ProcessUDDIFramesetsForm.jsp";
- }
-
- public final String getPanesFile()
- {
- return "uddi/scripts/uddipanes.jsp";
- }
-
- public final String getTreeContentVar()
- {
- return "navigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "uddi/navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "propertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "uddi/properties_container.jsp";
- }
-
- public final String getStatusContentVar()
- {
- return "statusContent";
- }
-
- public final String getStatusContentPage()
- {
- return "uddi/status_content.jsp";
- }
-
- public final String getSavePerspectiveActionLink()
- {
- //return SaveUDDIPerspectiveAction.getActionLink();
- return "";
- }
-
- public final String getPerspectiveContentFramesetCols()
- {
- return perspectiveContentFramesetCols_;
- }
-
- public final void setPerspectiveContentFramesetCols(String cols)
- {
- perspectiveContentFramesetCols_ = cols;
- }
-
- public final void setSavedPerspectiveContentFramesetCols(String cols)
- {
- savedPerspectiveContentFramesetCols_ = cols;
- }
-
- public final String getSavedPerspectiveContentFramesetCols()
- {
- return savedPerspectiveContentFramesetCols_;
- }
-
- public final String getActionsContainerFramesetRows()
- {
- return actionsContainerFramesetRows_;
- }
-
- public final void setActionsContainerFramesetRows(String rows)
- {
- actionsContainerFramesetRows_ = rows;
- }
-
- public final void setSavedActionsContainerFramesetRows(String rows)
- {
- savedActionsContainerFramesetRows_ = rows;
- }
-
- public final String getSavedActionsContainerFramesetRows()
- {
- return savedActionsContainerFramesetRows_;
- }
-
- public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- return SwitchPerspectiveFromUDDIAction.getFormActionLink(targetPerspectiveId,forHistory);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java
deleted file mode 100644
index 8722762df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class UnpublishTool extends FormTool
-{
- public UnpublishTool(ToolManager toolManager, String enableImage, String highlightImage, String alt)
- {
- super(toolManager, enableImage, highlightImage, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node node = toolManager_.getNode();
- return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public void addAuthenticationProperties(RegistryElement regElement)
- {
- String publishURL = regElement.getPublishURL();
- String userId = regElement.getUserId();
- String password = regElement.getCred();
-
- if (publishURL == null)
- publishURL = "";
- if (userId == null)
- userId = "";
- if (password == null)
- password = "";
-
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
- setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
- }
-
- public String getFormLink()
- {
- return "uddi/forms/UnpublishForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java
deleted file mode 100644
index 8a7b2fe7f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20061004 148052 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Message;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.OverviewDoc;
-import org.uddi4j.datatype.OverviewURL;
-import org.uddi4j.datatype.binding.AccessPoint;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.binding.BindingTemplates;
-import org.uddi4j.datatype.binding.InstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceInfo;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class Uddi4jHelper
-{
- public final KeyedReference getWSDLKeyedReference()
- {
- KeyedReference keyRef = new KeyedReference("types", "wsdlSpec");
- keyRef.setTModelKey("UUID:C1ACF26D-9672-4404-9D70-39B756E62AB4");
- return keyRef;
- }
-
- public final TModel newTModel(String wsdlUrl) throws WSDLException
- {
- return newTModel(wsdlUrl, getWSDLDefinition(wsdlUrl));
- }
-
- public final TModel newTModel(String wsdlUrl, Definition def) throws WSDLException
- {
- TModel tModel = new TModel();
- tModel.setTModelKey("");
- tModel.setName(def.getTargetNamespace());
- tModel.setDefaultDescriptionString("");
- OverviewDoc overviewDoc = new OverviewDoc();
- overviewDoc.setOverviewURL(wsdlUrl);
- tModel.setOverviewDoc(overviewDoc);
- CategoryBag catBag = new CategoryBag();
- Vector keyRefVector = new Vector();
- keyRefVector.add(getWSDLKeyedReference());
- catBag.setKeyedReferenceVector(keyRefVector);
- tModel.setCategoryBag(catBag);
- return tModel;
- }
-
- public final BusinessService newBusinessService(String wsdlUrl, Hashtable tModelsTable) throws WSDLException
- {
- return newBusinessService(wsdlUrl, getWSDLDefinition(wsdlUrl), tModelsTable);
- }
-
- public final BusinessService newBusinessService(String wsdlUrl, Definition def, Hashtable tModelsTable) throws WSDLException
- {
- BusinessService bs = new BusinessService();
- bs.setServiceKey("");
- BindingTemplates bindingTemplates = new BindingTemplates();
- Vector bindingTemplateVector = new Vector();
- Service[] services = (Service[])def.getServices().values().toArray(new Service[0]);
- if (services.length > 0)
- {
- Port[] ports = (Port[])services[0].getPorts().values().toArray(new Port[0]);
- for (int i = 0; i < ports.length; i++)
- {
- TModelInstanceDetails tModelDetails = new TModelInstanceDetails();
- Vector tModelInfoVector = new Vector();
- TModel tModel = (TModel)tModelsTable.get(ports[i].getBinding().getPortType().getQName().getNamespaceURI());
- tModelInfoVector.add(createTModelInstanceInfo(wsdlUrl, ports[i], tModel.getTModelKey()));
- tModelDetails.setTModelInstanceInfoVector(tModelInfoVector);
- BindingTemplate bindingTemplate = new BindingTemplate();
- bindingTemplate.setDefaultDescriptionString(createDescription(ports[i]));
- bindingTemplate.setAccessPoint(createAccessPoint(ports[i]));
- bindingTemplate.setTModelInstanceDetails(tModelDetails);
- bindingTemplate.setBindingKey("");
- bindingTemplateVector.add(bindingTemplate);
- }
- }
- bindingTemplates.setBindingTemplateVector(bindingTemplateVector);
- bs.setBindingTemplates(bindingTemplates);
- return bs;
- }
-
- public final BusinessService newBusinessService(String wsdlUrl, Definition def, TModel[] tModels) throws WSDLException
- {
- BusinessService bs = new BusinessService();
- bs.setServiceKey("");
- BindingTemplates bindingTemplates = new BindingTemplates();
- Vector bindingTemplateVector = new Vector();
- Service[] services = (Service[])def.getServices().values().toArray(new Service[0]);
- if (services.length > 0)
- {
- Port[] ports = (Port[])services[0].getPorts().values().toArray(new Port[0]);
- for (int i = 0; i < ports.length; i++)
- {
- for (int j = 0; j < tModels.length; j++)
- {
- TModelInstanceDetails tModelDetails = new TModelInstanceDetails();
- Vector tModelInfoVector = new Vector();
- tModelInfoVector.add(createTModelInstanceInfo(wsdlUrl, ports[i], tModels[j].getTModelKey()));
- tModelDetails.setTModelInstanceInfoVector(tModelInfoVector);
- BindingTemplate bindingTemplate = new BindingTemplate();
- bindingTemplate.setDefaultDescriptionString(createDescription(ports[i]));
- bindingTemplate.setAccessPoint(createAccessPoint(ports[i]));
- bindingTemplate.setTModelInstanceDetails(tModelDetails);
- bindingTemplate.setBindingKey("");
- bindingTemplateVector.add(bindingTemplate);
- }
- }
- }
- bindingTemplates.setBindingTemplateVector(bindingTemplateVector);
- bs.setBindingTemplates(bindingTemplates);
- return bs;
- }
-
- public Definition getWSDLDefinition(String wsdlUrl) throws WSDLException
- {
- try
- {
- WebServicesParserExt parser = new WebServicesParserExt();
- String proxySet = System.getProperty("http.proxySet");
- if (proxySet != null && proxySet.equals("true"))
- {
- parser.setHTTPBasicAuthUsername(System.getProperty("http.proxyUserName"));
- parser.setHTTPBasicAuthPassword(System.getProperty("http.proxyPassword"));
- }
- return parser.getWSDLDefinitionVerbose(wsdlUrl);
- }
- catch (Exception e)
- {
- throw new WSDLException(WSDLException.PARSER_ERROR, e.getMessage(), e);
- }
- }
-
- private final String createDescription(Port port)
- {
- String desc = null;
- Element e = port.getDocumentationElement();
- if (e != null)
- {
- Node node = e.getFirstChild();
- StringBuffer sb = new StringBuffer();
- while (node != null)
- {
- switch (node.getNodeType())
- {
- case Node.TEXT_NODE:
- case Node.CDATA_SECTION_NODE:
- sb.append(((CharacterData)node).getData());
- default:
- node = node.getNextSibling();
- break;
- }
- }
- desc = sb.toString();
- }
- return desc;
- }
-
- private final TModelInstanceInfo createTModelInstanceInfo(String wsdlUrl, Port port, String tModelKey)
- {
- InstanceDetails details = new InstanceDetails();
- OverviewDoc overviewDoc = new OverviewDoc();
- TModelInstanceInfo tModelInfo = new TModelInstanceInfo();
- StringBuffer overviewURLString = new StringBuffer(wsdlUrl);
- String portName = port.getName();
- if (portName != null)
- {
- overviewURLString.append("#");
- overviewURLString.append(portName);
- }
- overviewDoc.setOverviewURL(new OverviewURL(overviewURLString.toString()));
- details.setOverviewDoc(overviewDoc);
- tModelInfo.setInstanceDetails(details);
- if (tModelKey != null)
- tModelInfo.setTModelKey(tModelKey);
- return tModelInfo;
- }
-
- private final AccessPoint createAccessPoint(Port port)
- {
- AccessPoint accessPoint = null;
- List list = port.getExtensibilityElements();
- for (int j = 0; j < list.size(); j++)
- {
- ExtensibilityElement extElement = (ExtensibilityElement)list.get(j);
- if (extElement instanceof SOAPAddress)
- {
- String locationURI = ((SOAPAddress)extElement).getLocationURI();
- accessPoint = new AccessPoint(locationURI, getURLType(locationURI));
- break;
- }
- else if (extElement instanceof HTTPAddress)
- {
- String locationURI = ((HTTPAddress)extElement).getLocationURI();
- accessPoint = new AccessPoint(locationURI, getURLType(locationURI));
- break;
- }
- }
- return accessPoint;
- }
-
- private final String URL_TYPE_OTHER = "other";
- private final String URL_TYPES = "http https mail ftp fax phone other";
-
- private final String getURLType(String url)
- {
- int i = url.indexOf(":");
- String type;
- if (i == -1)
- type = URL_TYPE_OTHER;
- else
- {
- type = url.substring(0, i);
- if (type.equals("") || URL_TYPES.indexOf(type) == -1)
- type = URL_TYPE_OTHER;
- }
- return type;
- }
-
- public boolean isMonolithicWSDL(Definition def)
- {
- return hasMessage(def) && hasPortType(def) && hasBinding(def) && hasService(def);
- }
-
- public boolean isServiceImplement(Definition def)
- {
- return hasImport(def) && hasService(def);
- }
-
- public boolean isServiceInterface(Definition def)
- {
- return hasMessage(def) && hasPortType(def) && hasBinding(def);
- }
-
- public boolean isServiceInterfaceWithBindingsOnly(Definition def)
- {
- return !hasService(def) && hasBinding(def);
- }
-
- private boolean hasMessage(Definition def)
- {
- for(Iterator it = def.getMessages().values().iterator(); it.hasNext();)
- if (!((Message)it.next()).isUndefined())
- return true;
- return false;
- }
-
- private boolean hasPortType(Definition def)
- {
- for(Iterator it = def.getPortTypes().values().iterator(); it.hasNext();)
- if (!((PortType)it.next()).isUndefined())
- return true;
- return false;
- }
-
- private boolean hasBinding(Definition def)
- {
- for(Iterator it = def.getBindings().values().iterator(); it.hasNext();)
- if (!((Binding)it.next()).isUndefined())
- return true;
- return false;
- }
-
- private boolean hasService(Definition def)
- {
- return !def.getServices().isEmpty();
- }
-
- private boolean hasImport(Definition def)
- {
- return !def.getImports().isEmpty();
- }
-
- public String[] getImports(Definition def, String wsdlUrl)
- {
-
-
- Map importsMap = def.getImports();
- Collection values = importsMap.values();
- Iterator it = values.iterator();
-
- Vector importsVec = new Vector();
- for(int i =0;it.hasNext();i++){
- ArrayList aList = (ArrayList)it.next();
- Iterator itImports = aList.iterator();
- while(itImports.hasNext()){
- importsVec.add(itImports.next());
- }
- }
- Import imports[] = new Import[importsVec.size()] ;
- Iterator itVec = importsVec.iterator();
- for(int j = 0;itVec.hasNext();j++){
- imports[j] = (Import)itVec.next();
- }
-
-
-
- String[] importStrings = new String[imports.length];
- String s;
- if (wsdlUrl != null && wsdlUrl.indexOf('/') != -1)
- s = wsdlUrl.substring(0, wsdlUrl.lastIndexOf('/')+1);
- else
- s = "";
- for (int i = 0; i < importStrings.length; i++)
- {
- StringBuffer sb = new StringBuffer();
- String locationURI = imports[i].getLocationURI();
- if (locationURI.indexOf(':') != -1)
- sb.append(locationURI);
- else
- sb.append(s).append(locationURI);
- importStrings[i] = sb.toString();
- }
- return importStrings;
- }
-
- public String getWSDL(BusinessService bs, UDDIProxy proxy)
- {
- Vector bindingTemplateVector = bs.getBindingTemplates().getBindingTemplateVector();
- if (bindingTemplateVector.size() > 0)
- {
- BindingTemplate bt = (BindingTemplate)bindingTemplateVector.get(0);
- TModelInstanceDetails tModelDetails = bt.getTModelInstanceDetails();
- if (tModelDetails != null)
- {
- Vector tModelInfoVector = tModelDetails.getTModelInstanceInfoVector();
- if (tModelInfoVector.size() > 0)
- {
- TModelInstanceInfo tModelInfo = (TModelInstanceInfo)tModelInfoVector.get(0);
- InstanceDetails details = tModelInfo.getInstanceDetails();
- if (details != null)
- {
- OverviewDoc overviewDoc = details.getOverviewDoc();
- if (overviewDoc != null)
- return parse(overviewDoc.getOverviewURLString());
- }
- else if (proxy != null)
- {
- String tModelKey = tModelInfo.getTModelKey();
- if (tModelKey != null)
- {
- try
- {
- TModelDetail t = proxy.get_tModelDetail(tModelKey);
- if (t != null)
- {
- Vector tModelVector = t.getTModelVector();
- if (tModelVector != null && tModelVector.size() > 0)
- return getWSDL((TModel)tModelVector.get(0));
- }
- }
- catch (UDDIException uddie)
- {
- }
- catch (TransportException te)
- {
- }
- }
- }
- }
- }
- }
- return null;
- }
-
- public String getWSDL(TModel tModel)
- {
- OverviewDoc overviewDoc = tModel.getOverviewDoc();
- if (overviewDoc != null)
- return parse(overviewDoc.getOverviewURLString());
- else
- return null;
- }
-
- private String parse(String s)
- {
- if (s != null && s.length() > 0)
- {
- int index = s.indexOf('#');
- if (index != -1)
- return s.substring(0, index);
- }
- return s;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/BrowserDetect.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/BrowserDetect.java
deleted file mode 100644
index cc20504c4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/BrowserDetect.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Helper class used to detect the type of browser used.
- */
-public class BrowserDetect {
-
- /**
- * Determine if Microsoft Internet Explorer is used.
- *
- * @param request The HTTP request.
- * @return True if the client is a Microsoft Internet Explorer web browser, false otherwise.
- */
- public static final boolean isMicrosoftInternetExplorer(HttpServletRequest request) {
- String userAgent = request.getHeader("User-Agent");
-
- if (userAgent != null && userAgent.toLowerCase().indexOf("msie") != -1)
- return true;
-
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java
deleted file mode 100644
index 08f085143..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.io.CharArrayWriter;
-import java.io.PrintWriter;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
-public class CharArrayWrapper extends HttpServletResponseWrapper
-{
- private CharArrayWriter charArrayWriter_;
-
- public CharArrayWrapper(HttpServletResponse response)
- {
- super(response);
- charArrayWriter_ = new CharArrayWriter();
- }
-
- public PrintWriter getWriter()
- {
- return new PrintWriter(charArrayWriter_);
- }
-
- public String toString()
- {
- return charArrayWriter_.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java
deleted file mode 100644
index 2ba8bc5d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.util.Locale;
-import org.eclipse.core.runtime.Platform;
-
-public final class DirUtils
-{
- public static boolean isRTL()
- {
- return "rtl".equals(getDir());
- }
-
- public static String getDir()
- {
- String rtl = "rtl";
- String ltr = "ltr";
-
- // from system property
- String orientation = System.getProperty("eclipse.orientation"); //$NON-NLS-1$
- if (rtl.equals(orientation)) //$NON-NLS-1$
- return rtl;
- else if (ltr.equals(orientation)) //$NON-NLS-1$
- return ltr;
-
- // from command line
- String[] args = Platform.getCommandLineArgs();
- for (int i = 0; i < args.length; i++)
- {
- if ("-dir".equalsIgnoreCase(args[i])) //$NON-NLS-1$
- {
- if ((i + 1) < args.length && "rtl".equalsIgnoreCase(args[i + 1])) //$NON-NLS-1$
- {
- return rtl;
- }
- return ltr;
- }
- }
-
- // Check if the user property is set. If not do not
- // rely on the vm.
- if (System.getProperty("osgi.nl.user") == null) //$NON-NLS-1$
- return ltr;
-
- // guess from default locale
- String locale = Platform.getNL();
- if (locale == null)
- {
- locale = Locale.getDefault().toString();
- }
- if (locale.startsWith("ar") || locale.startsWith("fa") //$NON-NLS-1$//$NON-NLS-2$
- || locale.startsWith("he") || locale.startsWith("iw") //$NON-NLS-1$//$NON-NLS-2$
- || locale.startsWith("ur")) //$NON-NLS-1$
- {
- return rtl;
- }
- return ltr;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java
deleted file mode 100644
index 8cf6f77f7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060222 127443 jesper@selskabet.org - Jesper S Moller
- * 20080324 186456 makandre@ca.ibm.com - Andrew Mak
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletResponse;
-
-public final class HTMLUtils
-{
- public static final String UTF8_ENCODING = "UTF-8";
- public static final String LINE_BREAK = "<br>";
- public static final String LINE_SEPARATOR = System.getProperties().getProperty("line.separator");
-
- /**
- * Get the HTML tag for an image.
- * @return String The HTML tag for this image.
- * @param HttpServletResponse To encode the src attribute.
- * @param String src attribute defining the path to the image file. This must include the context path.
- * @param String Optional alt text to be displayed with the image. Set this to null to disable the attribute.
- * @param String Optional width of the rendered image. Set this to null to disable the attribute.
- * @param String Optional height of the rendered imag. Set this to null to disable the attribute.
- * @param Hashtable Optional key-value pairs of additional strings to be added as-is to the tag. Set this to null to disable.
- * @return String The image tag.
- */
- public static final String getHTMLImageTag(HttpServletResponse response,String src,String alt,String width,String height,Hashtable additionalAttributes)
- {
- StringBuffer tag = new StringBuffer("<img src=\"");
- tag.append(response.encodeURL(src)).append('\"');
- if (alt == null)
- alt = "";
- tag.append(" alt=\"").append(alt).append('\"');
- tag.append(" title=\"").append(alt).append('\"');
- if (width != null)
- tag.append(" width=").append(width);
- if (height != null)
- tag.append(" height=").append(height);
- tag.append(" border=0");
- if (additionalAttributes != null)
- {
- Enumeration keys = additionalAttributes.keys();
- while (keys.hasMoreElements())
- {
- String key = (String)keys.nextElement();
- tag.append(' ').append(key).append("=\"").append((String)additionalAttributes.get(key)).append('\"');
- }
- }
- tag.append('>');
- return tag.toString();
- }
-
- /**
- * Get the HTML tag for this link. The complete tag consists of the open tag <a> followed by a subelement and, finally, by an end tag </a>.
- * @return String The HTML tag of the link.
- * @param HttpServletResponse To encode the href attribute.
- * @param String The href attribute of the link. This must include the context path.
- * @param String target Optional target attribute for the link. Set this to null to disable the attribute.
- * @param String Optional name for the link. Set this to null to disable the attribute.
- * @param String The label which acts as the subelement. i.e. <a>label</a>.
- * @param Hashtable Optional key-value pairs of additional string attributes to be added as-is to the open tag. Set this to null to disable.
- */
- public static final String getHTMLLinkTag(HttpServletResponse response,String href,String target,String name,String label,Hashtable additionalAttributes)
- {
- StringBuffer tag = new StringBuffer("<a href=\"");
- tag.append(response.encodeURL(href)).append('\"');
- if (target != null)
- tag.append(" target=\"").append(target).append('\"');
- if (name != null)
- tag.append(" name=\"").append(name).append('\"');
- if (additionalAttributes != null)
- {
- Enumeration keys = additionalAttributes.keys();
- while (keys.hasMoreElements())
- {
- String key = (String)keys.nextElement();
- tag.append(' ').append(key).append("=\"").append((String)additionalAttributes.get(key)).append('\"');
- }
- }
- tag.append('>');
- tag.append(label);
- tag.append("</a>");
- return tag.toString();
- }
-
- /**
- * Get the HTML tag for a red asterist.
- * @return String The HTML tag for the red asterisk.
- */
- public static final String redAsterisk()
- {
- return "<font color=\"#ff0000\">*</font>";
- }
-
- /**
- * Get the Javascript mangled version of a given input String.
- * @return String The Javascript mangled String.
- */
- public static final String JSMangle(String input)
- {
- if (input == null)
- return "";
-
- StringBuffer mangledOutput = new StringBuffer();
- for (int i=0;i<input.length();i++)
- {
- char c = input.charAt(i);
- switch (c)
- {
- case '\n':
- mangledOutput.append("\\n");
- break;
- case '\r':
- mangledOutput.append("\\r");
- break;
- case '\\':
- case '\"':
- case '\'':
- mangledOutput.append('\\');
- default:
- mangledOutput.append(c);
- }
- }
- return mangledOutput.toString();
- }
-
- private static final String LESS_THAN = "<";
- private static final String LESS_THAN_HTML_ENTITY = "&lt;";
- private static final String GREATER_THAN = ">";
- private static final String GREATER_THAN_HTML_ENTITY = "&gt;";
- private static final String SPACE = " ";
- private static final String SPACE_HTML_ENTITY = "&nbsp;";
- private static final String AMPERSAND = "&";
- private static final String AMPERSAND_HTML_ENTITY = "&amp;";
- private static final String QUOTATION = "\"";
- private static final String QUOTATION_HTML_ENTITY = "&quot;";
-
- /**
- * Replace special characters with HTML entities representing these characters.
- * Note that this will also convert normal spaces into non-breaking spaces, which may be good for
- * presentation but not for editing.
- *
- * @return String The converted String. Note: Order is important so that corrected entity references are not re-mangled.
- */
- public static final String charactersToHTMLEntities(String s) {
- s = stringReplace(s, AMPERSAND, AMPERSAND_HTML_ENTITY);
- s = stringReplace(s, LESS_THAN, LESS_THAN_HTML_ENTITY);
- s = stringReplace(s, GREATER_THAN, GREATER_THAN_HTML_ENTITY);
- s = stringReplace(s, SPACE, SPACE_HTML_ENTITY);
- s = stringReplace(s, QUOTATION, QUOTATION_HTML_ENTITY);
- return s;
- }
-
- /**
- * Replace special characters with HTML entities representing these characters
- * @return String The converted String. Note: Order is important so that corrected entity references are not re-mangled.
- */
- public static final String charactersToHTMLEntitiesStrict(String s) {
- s = stringReplace(s, AMPERSAND, AMPERSAND_HTML_ENTITY);
- s = stringReplace(s, LESS_THAN, LESS_THAN_HTML_ENTITY);
- s = stringReplace(s, GREATER_THAN, GREATER_THAN_HTML_ENTITY);
- s = stringReplace(s, QUOTATION, QUOTATION_HTML_ENTITY);
- return s;
- }
-
- /**
- * Replace HTML character entities with their associated characters.
- * @return String The converted String.
- */
- public static final String htmlEntitiesToCharacters(String s) {
- s = stringReplace(s, LESS_THAN_HTML_ENTITY, LESS_THAN);
- s = stringReplace(s, GREATER_THAN_HTML_ENTITY, GREATER_THAN);
- s = stringReplace(s, SPACE_HTML_ENTITY, SPACE);
- s = stringReplace(s, AMPERSAND_HTML_ENTITY, AMPERSAND);
- s = stringReplace(s, QUOTATION_HTML_ENTITY, QUOTATION);
- return s;
- }
-
- private static final String stringReplace(String s, String oldString, String newString) {
- String sCopy = s;
- int fromIndex = 0;
- int oldStringIndex = sCopy.indexOf(oldString, fromIndex);
- StringBuffer sb = new StringBuffer();
- while (oldStringIndex != -1) {
- sb.setLength(0);
- sb.append(sCopy.substring(0, oldStringIndex));
- sb.append(newString);
- sb.append(sCopy.substring(oldStringIndex + oldString.length(), sCopy.length()));
- sCopy = sb.toString();
- fromIndex = oldStringIndex + newString.length();
- oldStringIndex = sCopy.indexOf(oldString, fromIndex);
- }
- return sCopy;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java
deleted file mode 100644
index 35b59584a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-public final class MultipartFormDataException extends Throwable
-{
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3257845472227110961L;
-
-public MultipartFormDataException(String message)
- {
- super(message);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java
deleted file mode 100644
index 308edff81..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-
-public final class MultipartFormDataParser
-{
- private Hashtable paramTable_;
-
- private static final String HEADER_CONTENT_TYPE = "Content-Type";
- private static final String HEADER_MULTIPART = "multipart";
- private static final String HEADER_BOUNDARY = "boundary=";
- private static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition: form-data";
- private static final String HEADER_NAME = "name=\"";
-
- private static final byte PARSER_STATE_INITIAL = 0;
- private static final byte PARSER_STATE_BOUNDARY = 1;
- private static final byte PARSER_STATE_PARAMETER = 2;
- private static final byte PARSER_STATE_BLANK = 3;
- private static final byte PARSER_STATE_DATA = 4;
-
- private static String parserStates[] = {"initial","boundary","parameter name","blank line","data"};
-
- public MultipartFormDataParser()
- {
- }
-
- public MultipartFormDataParser(Hashtable parameters)
- {
- paramTable_ = new Hashtable();
- for (Iterator it = parameters.keySet().iterator(); it.hasNext();)
- {
- Object key = it.next();
- Object value = parameters.get(key);
- if (value instanceof List)
- {
- List list = (List)value;
- for (Iterator it2 = list.iterator(); it2.hasNext();)
- saveData(key.toString(), it2.next().toString());
- }
- else if (value.getClass().isArray())
- {
- Object[] array = (Object[])value;
- for (int i = 0; i < array.length; i++)
- saveData(key.toString(), array[i].toString());
- }
- else
- {
- saveData(key.toString(), value.toString());
- }
- }
- }
-
- /**
- * Parse a multipart/form-data encoded post request with a given encoding.
- * If the encoding is null, use the system default encoding. utf-8 is not a
- * bad choice for the encoding.
- */
- public final void parseRequest(HttpServletRequest request,String encoding) throws MultipartFormDataException
- {
- // Content-Type header should have the form:
- // multipart/form-data; boundary=...
- //
- // RFC2046 5.1.1 page 19, paragraph 2:
- // The Content-Type field for multipart entities requires one parameter, "boundary" (no quotes)
- String contentType = request.getHeader(HEADER_CONTENT_TYPE);
- if (contentType == null || !contentType.startsWith(HEADER_MULTIPART) || contentType.indexOf(HEADER_BOUNDARY) == -1)
- throw new MultipartFormDataException("Content-Type is not multipart/form-data");
-
- // RFC2046 5.1.1 page 19, paragraph 4:
- // The boundary value may be enclosed in double quotes. Strip these if they are present.
- String boundary = contentType.substring(contentType.indexOf(HEADER_BOUNDARY)+HEADER_BOUNDARY.length(),contentType.length());
- if (boundary.charAt(0) == '\"' && boundary.charAt(boundary.length()-1) == '\"')
- boundary = boundary.substring(1,boundary.length()-1);
-
- // RFC2046 5.1.1 page 19, paragraph 2:
- // The boundary delimiter line is then defined as a line consisting entirely
- // of two hyphen characters.
- String delimiter = "--"+boundary;
-
- if (paramTable_ == null)
- paramTable_ = new Hashtable();
- else
- paramTable_.clear();
-
- try
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream(),encoding));
- String line = null;
- String parameterName = null;
- StringBuffer parameterValue = new StringBuffer();
- byte currentParserState = PARSER_STATE_INITIAL;
- while ((line = br.readLine()) != null)
- {
- // Lines appear in the following sequence.
- // 1) boundary indicating the start of a new parameter and end of a data segment.
- // 2) Content-Disposition: form-data; name="..." - the name of a new parameter.
- // 3) a blank line
- // 4) data
- //
- // For each parameter, the sequence is repeated.
- if (line.startsWith(delimiter))
- {
- byte[] expectedParserStates = {PARSER_STATE_INITIAL,PARSER_STATE_DATA};
- if (isValidParserState(currentParserState,expectedParserStates))
- {
- // Save any current data and prepare for a new parameter name.
- if (parameterName != null)
- {
- saveData(parameterName,parameterValue.toString());
- parameterName = null;
- parameterValue.setLength(0);
- }
- currentParserState = PARSER_STATE_BOUNDARY;
- }
- else
- throw new MultipartFormDataException(getParserExceptionMessage(currentParserState,expectedParserStates));
- }
- else if (line.startsWith(HEADER_CONTENT_DISPOSITION))
- {
- byte[] expectedParserStates = {PARSER_STATE_BOUNDARY};
- if (isValidParserState(currentParserState,expectedParserStates))
- {
- // Obtain the parameter name without the surrounding double quotes. Accounts for RFC 1867 too.
- int parameterNameStartingPosition = line.indexOf(HEADER_NAME)+HEADER_NAME.length();
- parameterName = line.substring(parameterNameStartingPosition,+parameterNameStartingPosition+line.substring(parameterNameStartingPosition).indexOf('\"'));
- currentParserState = PARSER_STATE_PARAMETER;
- }
- }
- else if (currentParserState == PARSER_STATE_PARAMETER)
- {
- // A blank line should follow the PARAMETER. Discard the line and move on.
- currentParserState = PARSER_STATE_BLANK;
- }
- else
- {
- // Expect the line to contain data.
- if (parameterValue.length() > 0)
- parameterValue.append('\n');
- parameterValue.append(line);
- currentParserState = PARSER_STATE_DATA;
- }
- }
- }
- catch (Throwable t)
- {
- throw new MultipartFormDataException(t.getMessage());
- }
- //dumpParamTable();
- }
-
- /**
- * Returns the value of a request parameter as a String, or null if the parameter does not exist.
- * If the parameter has multiple values, only the first value is returned. Use getParameterValues()
- * for parameters with multiple values.
- */
- public final String getParameter(String parameter) throws MultipartFormDataException
- {
- if (paramTable_ == null)
- throw new MultipartFormDataException("Parser contains no parsed data");
- Vector values = (Vector)paramTable_.get(parameter);
- return ((values != null)?((String)values.elementAt(0)):null);
- }
-
- public final String[] getParameterValues(String parameter) throws MultipartFormDataException
- {
- if (paramTable_ == null)
- throw new MultipartFormDataException("Parser contains no parsed data");
- Vector valuesVector = (Vector)paramTable_.get(parameter);
- if (valuesVector == null)
- return null;
- String[] valuesArray = new String[valuesVector.size()];
- for (int i=0;i<valuesArray.length;i++)
- valuesArray[i] = (String)valuesVector.elementAt(i);
- return valuesArray;
- }
-
- public final String[] getParameterNames() throws MultipartFormDataException
- {
- if (paramTable_ == null)
- throw new MultipartFormDataException("Parser contains no parsed data");
-
- int size = paramTable_.size();
- if (size == 0)
- return null;
- String[] names = new String[size];
- Enumeration keys = paramTable_.keys();
- for (int i=0;i<size;i++)
- names[i] = (String)keys.nextElement();
- return names;
- }
-
- private final void saveData(String parameterName,String parameterValue)
- {
- Vector values = (Vector)paramTable_.get(parameterName);
- if (values == null)
- values = new Vector();
- values.addElement(parameterValue);
- paramTable_.put(parameterName,values);
- }
-
- private final boolean isValidParserState(byte currentState,byte[] expectedStates)
- {
- boolean validity = false;
- for (int i=0;i<expectedStates.length;i++)
- {
- if (currentState == expectedStates[i])
- {
- validity = true;
- break;
- }
- }
- return validity;
- }
-
- private final String getParserExceptionMessage(byte currentState,byte[] expectedStates)
- {
- StringBuffer msg = new StringBuffer("Parser state inconsistency!");
- msg.append('\n');
- msg.append("Current state : ").append(parserStates[currentState]).append('\n');
- msg.append("Expected state(s): ");
- for (int i=0;i<expectedStates.length;i++)
- {
- msg.append(parserStates[expectedStates[i]]);
- if (i != expectedStates.length-1)
- msg.append(", ");
- }
- msg.append('\n');
- return msg.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java
deleted file mode 100644
index d018ee42c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060217 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.util.Vector;
-import com.ibm.icu.text.Collator;
-
-public class QuickSort
-{
- public static final void sort(Object[] a,int lo,int hi)
- {
- Object tmp;
- int i = lo;
- int j = hi;
- Object x = a[(lo+hi)/2];
- Collator collator = Collator.getInstance();
-
- do
- {
- while (collator.compare(a[i].toString(),x.toString()) < 0) i++;
- while (collator.compare(a[j].toString(),x.toString()) > 0) j--;
- if (i <= j)
- {
- tmp = a[i];
- a[i] = a[j];
- a[j] = tmp;
- i++;
- j--;
- }
- } while (i <= j);
-
- if (lo < j)
- sort(a,lo,j);
- if (i < hi)
- sort(a,i,hi);
- }
-
- /*
- * This method will use the same algorithm as above
- * with the exception that any nulls will be attached
- * at the end
- */
- public static final void sort(Vector v)
- {
- // do not sort if vector contains less than 2 elements
- if (v.size() < 2)
- return;
-
- // pulls out the nulls
- Vector nulls = new Vector();
- for (int i = 0; i < v.size(); i++) {
- Object obj = v.elementAt(i);
- if (obj == null || obj.toString() == null) {
- nulls.add(obj);
- v.remove(i);
- i--;
- }
- }
-
- // sort the not null objects
- Object[] objs = v.toArray();
- // do not sort if array contains less than 2 objects
- if (objs.length >= 2)
- sort(objs, 0, objs.length-1);
-
- // re-construct the vector from the sorted objects, then the nulls
- v.clear();
- for (int j = 0; j < objs.length; j++) {
- v.add(objs[j]);
- }
- v.addAll(nulls);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java
deleted file mode 100644
index 6b84f9e34..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-
-public class TrimFilter implements Filter
-{
-
- /* (non-Javadoc)
- * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
- */
- public void init(FilterConfig arg0) throws ServletException
- {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
- */
- public void doFilter(ServletRequest req, ServletResponse resp, FilterChain fc) throws IOException, ServletException
- {
- // TODO Auto-generated method stub
- CharArrayWrapper responseWrapper = new CharArrayWrapper((HttpServletResponse)resp);
- // Hack for Tomcat performance problem with filters.
- OutputStreamWriter osw = new OutputStreamWriter(resp.getOutputStream(),HTMLUtils.UTF8_ENCODING);
- fc.doFilter(req,responseWrapper);
- String responseString = responseWrapper.toString();
- osw.write(responseString.trim());
- osw.close();
- }
-
- /* (non-Javadoc)
- * @see javax.servlet.Filter#destroy()
- */
- public void destroy()
- {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java
deleted file mode 100644
index b7070b348..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-
-/**
- * This class contains utility methods for managing URLs
- * as used by the Web Services Explorer Web application.
- * @author cbrealey@ca.ibm.com
- */
-public final class URLUtils
-{
- /**
- * Objects of this class should not be constructed.
- */
- private URLUtils ()
- {
- }
-
- /**
- * UTF-8
- */
- public static final String UTF8 = "UTF-8";
-
- /**
- * Equivalent to {@link #encode(String,String)}
- * with second parameter set to the "UTF-8" encoding.
- * @param s The string to encode.
- * @return The encoded string.
- */
- public static String encode(String s)
- {
- return encode(s,UTF8);
- }
-
- /**
- * Equivalent to {@link URLEncoder#encode(String,String)},
- * only throws an unchecked {@link RuntimeException} wrapped
- * around an {@link UnsupportedEncodingException} instead of
- * an {@link UnsupportedEncodingException}.
- * @param s The string to encode.
- * @param enc The encoding to use.
- * @return The encoded string.
- */
- public static String encode(String s, String enc)
- {
- try
- {
- return URLEncoder.encode(s,enc);
- }
- catch (UnsupportedEncodingException e)
- {
- // TODO: MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8
- throw new RuntimeException("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8",e);
- }
- }
-
- /**
- * Equivalent to {@link #decode(String,String)}
- * with second parameter set to the "UTF-8" encoding.
- * @param s The string to decode.
- * @return The decoded string.
- */
- public static String decode(String s)
- {
- return decode(s,UTF8);
- }
-
- /**
- * Equivalent to {@link URLEncoder#decode(String,String)},
- * only throws an unchecked {@link RuntimeException} wrapped
- * around an {@link UnsupportedEncodingException} instead of
- * an {@link UnsupportedEncodingException}.
- * @param s The string to decode.
- * @param enc The encoding to use.
- * @return The decoded string.
- */
- public static String decode(String s, String enc)
- {
- try
- {
- return URLDecoder.decode(s,enc);
- }
- catch (UnsupportedEncodingException e)
- {
- // TODO: MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8
- throw new RuntimeException("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8",e);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java
deleted file mode 100644
index 2638ea2cf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060612 142290 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-public class Validator
-{
- public static final boolean validateString(String input)
- {
- return ((input != null) && (input.trim().length() > 0));
- }
-
- public static final boolean validateURL(String input)
- {
- return (input != null && input.matches("[a-zA-Z\\+\\-\\.]++:.*"));
- }
-
- public static final boolean validateInteger(String input)
- {
- try
- {
- Integer.parseInt(input);
- return true;
- }
- catch (NumberFormatException e)
- {
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java
deleted file mode 100644
index 5bd563948..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-public final class XMLUtils
-{
- public static final String UTF8_ENCODING = "UTF-8";
-
- /**
- * Serialize an XML Element into a String.
- * @param e Element to be serialized.
- * @param omitXMLDeclaration boolean representing whether or not to omit the XML declaration.
- * @return String representation of the XML document fragment.
- */
- public static final String serialize(Element e,boolean omitXMLDeclaration)
- {
- if (e != null)
- {
- try
- {
- DOMSource domSource = new DOMSource(e);
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- serializer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, ((omitXMLDeclaration) ? "yes" : "no"));
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty(OutputKeys.ENCODING, UTF8_ENCODING);
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.transform(domSource, new StreamResult(baos));
- baos.close();
- return new String(baos.toByteArray(), UTF8_ENCODING);
- }
- catch (Throwable t)
- {
- }
- }
- return null;
- }
-
- /**
- * Serialize an XML Element into a String.
- * @param df DocumentFragment to be serialized.
- * @param omitXMLDeclaration boolean representing whether or not to omit the XML declaration.
- * @return String representation of the XML document fragment.
- */
- public static final String serialize(DocumentFragment df,boolean omitXMLDeclaration)
- {
- if (df != null)
- {
- try
- {
- DOMSource domSource = new DOMSource(df);
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- serializer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, ((omitXMLDeclaration) ? "yes" : "no"));
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty(OutputKeys.ENCODING, UTF8_ENCODING);
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- serializer.transform(domSource, new StreamResult(baos));
- baos.close();
- return new String(baos.toByteArray(), UTF8_ENCODING);
- }
- catch (Throwable t)
- {
- }
- }
- return null;
- }
-
- /**
- * Create a new XML Document.
- * @param docBuilder DocumentBuilder. Setting this to null will create a new DocumentBuilder.
- * @return Document
- */
- public static final Document createNewDocument(DocumentBuilder docBuilder) throws ParserConfigurationException
- {
- if (docBuilder == null)
- {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(false);
- factory.setValidating(false);
- docBuilder = factory.newDocumentBuilder();
- }
- Document doc = docBuilder.newDocument();
- return doc;
- }
-
- /**
- * Convert the String representation of an Element into an Element
- * @param String representation of an Element.
- * @return Element
- */
- public static Element stringToElement(String s) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException {
- return stringToElement(s, false);
- }
-
- /**
- * Convert the String representation of an Element into an Element
- * @param String representation of an Element.
- * @param boolean set whether the return Element should be namespace aware.
- * @return Element
- */
- public static Element stringToElement(String s, boolean namespaceAware) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException
- {
- return byteArrayToElement(s.getBytes(UTF8_ENCODING), namespaceAware);
- }
-
- /**
- * Convert the byte array representation of an Element into an Element
- * @param byte[] representation of an Element.
- * @param boolean set whether the return Element should be namespace aware.
- * @return Element
- */
- public static Element byteArrayToElement(byte[] b, boolean namespaceAware) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException
- {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
- docBuilderFactory.setNamespaceAware(namespaceAware);
- docBuilderFactory.setValidating(false);
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- Document doc = docBuilder.parse(new ByteArrayInputStream(b));
- return doc.getDocumentElement();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java
deleted file mode 100644
index 34814b4d7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLNode;
-
-public class ClearWSDLAction extends ClearNodeAction {
-
- public ClearWSDLAction(Controller controller) {
- super(controller, controller.getWSDLPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID) {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/ClearWSDLActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- return actionLink.toString();
- }
-
- protected boolean processLinkParameters(HttpServletRequest request) {
- String nodeIDString = request.getParameter(ActionInputs.NODEID);
- int nodeID;
- try {
- nodeID = Integer.parseInt(nodeIDString);
- }
- catch (NumberFormatException nfe) {
- nodeID = nodeManager_.getSelectedNodeId();
- }
- boolean paramValid = false;
- Node node = nodeManager_.getNode(nodeID);
- if (node instanceof WSDLMainNode)
- paramValid = true;
- else if (node instanceof WSDLNode)
- paramValid = true;
- else {
- while (node != null && !(node instanceof WSDLMainNode)) {
- node = node.getParent();
- if (node instanceof WSDLNode) {
- nodeID = node.getNodeId();
- paramValid = true;
- break;
- }
- }
- }
- propertyTable_.put(ActionInputs.NODEID, String.valueOf(nodeID));
- return paramValid;
- }
-
- public boolean run() {
- if (super.run()) {
- nodeManager_.setSelectedNodeId(nodeManager_.getRootNode().getNodeId());
- return true;
- }
- else
- return false;
- }
-
- public String getTreeContentVar() {
- return "wsdlNavigatorContent";
- }
-
- public String getTreeContentPage() {
- return "wsdl/wsdl_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar() {
- return "wsdlPropertiesContainer";
- }
-
- public String getPropertiesContainerPage() {
- return "wsdl/wsdl_properties_container.jsp";
- }
-
- public String getStatusContentVar() {
- return "wsdlStatusContent";
- }
-
- public String getStatusContentPage() {
- return "wsdl/wsdl_status_content.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java
deleted file mode 100644
index 05a0770bd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import javax.wsdl.Part;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDMapFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class CreateInstanceAction extends WSDLPropertiesFormAction
-{
- public CreateInstanceAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- super.processParsedResults(parser);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
- Iterator it = operElement.getOrderedBodyParts().iterator();
- boolean resultsValid = true;
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = operElement.getFragment(part);
- if (!frag.processParameterValues(parser))
- resultsValid = false;
- }
- String fragmentID = parser.getParameter(FragmentConstants.FRAGMENT_ID);
- if (fragmentID != null && fragmentID.length() > 0)
- propertyTable_.put(FragmentConstants.FRAGMENT_ID, fragmentID);
- else
- {
- propertyTable_.remove(FragmentConstants.FRAGMENT_ID);
- resultsValid = false;
- }
- String nameAnchorID = parser.getParameter(FragmentConstants.NAME_ANCHOR_ID);
- invokeWSDLOperationTool.setFragmentNameAnchorID(nameAnchorID);
- return resultsValid;
- }
-
- public FormTool getSelectedFormTool()
- {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public boolean run()
- {
- String fragmentID = (String)propertyTable_.get(FragmentConstants.FRAGMENT_ID);
- if (fragmentID != null && fragmentID.length() > 0)
- {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
- IXSDFragment frag = operElement.getFragmentByID(fragmentID);
- if ((frag instanceof IXSDMapFragment) && ((IXSDMapFragment)frag).createInstance() != null)
- return true;
- else
- return false;
- }
- else
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java
deleted file mode 100644
index f579f2800..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.IOException;
-import java.net.URLConnection;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-
-public class InvokeWSDLHttpGetOperationFormAction extends InvokeWSDLHttpOperationFormAction
-{
- public InvokeWSDLHttpGetOperationFormAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean run()
- {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- StringBuffer endPoint = new StringBuffer(getEndPoint());
- endPoint.append('?');
- addParameters(endPoint);
- String endPointString = endPoint.toString();
- boolean result = false;
- try
- {
- URLConnection conn = NetUtils.getURLConnection(endPointString);
- if (conn != null)
- {
- recordHttpResponse(conn,messageQueue);
- wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
- result = true;
- }
- else
- throw new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",endPointString));
- }
- catch (IOException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
- }
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java
deleted file mode 100644
index 1b41854c5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URLConnection;
-import java.util.Iterator;
-import javax.wsdl.Part;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.HTTPUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-
-public abstract class InvokeWSDLHttpOperationFormAction extends WSDLPropertiesFormAction
-{
- private static final String CONTENT_TYPE_CHARSETEQ = "charset=";
-
- public InvokeWSDLHttpOperationFormAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- super.processParsedResults(parser);
- String endPoint = parser.getParameter(WSDLActionInputs.END_POINT);
- Node selectedNode = getSelectedNavigatorNode();
- InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- invokeWSDLOperationTool.setEndPoint(endPoint);
- WSDLOperationElement operElement = (WSDLOperationElement)(selectedNode.getTreeElement());
- propertyTable_.put(WSDLActionInputs.OPERATION_ELEMENT,operElement);
- Iterator it = operElement.getOrderedBodyParts().iterator();
- boolean resultsValid = true;
- while (it.hasNext()) {
- Part part = (Part)it.next();
- IFragment frag = operElement.getFragment(part);
- if (!frag.processParameterValues(parser))
- resultsValid = false;
- }
- return resultsValid;
- }
-
- protected String getEndPoint()
- {
- StringBuffer endPoint = new StringBuffer((String)propertyTable_.get(WSDLActionInputs.END_POINT));
- WSDLOperationElement operElement = (WSDLOperationElement)propertyTable_.get(WSDLActionInputs.OPERATION_ELEMENT);
- if (endPoint.charAt(endPoint.length()-1) != '/')
- endPoint.append('/');
- endPoint.append(operElement.getName());
- return endPoint.toString();
- }
-
- protected void addParameters(StringBuffer buffer)
- {
- WSDLOperationElement operElement = (WSDLOperationElement)propertyTable_.get(WSDLActionInputs.OPERATION_ELEMENT);
- Iterator it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = operElement.getFragment(part);
- buffer.append(HTTPUtil.genURLEncodedParameters(frag));
- if (it.hasNext())
- buffer.append('&');
- }
- }
-
- protected void recordHttpResponse(URLConnection conn,MessageQueue messageQueue) throws IOException
- {
- BufferedReader br = null;
- try
- {
- InputStreamReader in = null;
- String contentType = conn.getContentType();
- if (contentType != null)
- {
- int charsetEqPos = contentType.indexOf(CONTENT_TYPE_CHARSETEQ);
- if (charsetEqPos != -1)
- in = new InputStreamReader(conn.getInputStream(),contentType.substring(charsetEqPos+CONTENT_TYPE_CHARSETEQ.length()));
- }
- if (in == null)
- in = new InputStreamReader(conn.getInputStream());
- br = new BufferedReader(in);
- String s;
- while ((s = br.readLine()) != null)
- messageQueue.addMessage(s);
- br.close();
- br = null;
- }
- catch (IOException e)
- {
- if (br != null)
- br.close();
- throw e;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java
deleted file mode 100644
index e7113f7d1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URLConnection;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-
-public class InvokeWSDLHttpPostOperationFormAction extends InvokeWSDLHttpOperationFormAction
-{
-
- public InvokeWSDLHttpPostOperationFormAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean run()
- {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- boolean result = false;
- String endPointString = getEndPoint();
- URLConnection conn = NetUtils.getURLConnection(endPointString);
- if (conn != null)
- {
- StringBuffer parameters = new StringBuffer();
- addParameters(parameters);
- conn.setDoOutput(true);
- PrintWriter out = null;
- try
- {
- out = new PrintWriter(conn.getOutputStream());
- out.print(parameters);
- out.close();
- out = null;
- recordHttpResponse(conn,messageQueue);
- wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
- result = true;
- }
- catch (IOException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
- }
- finally
- {
- if (out != null)
- out.close();
- }
- }
- else
- handleUnexpectedException(wsdlPerspective,messageQueue,"Exception",new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",endPointString)));
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java
deleted file mode 100644
index 64ad3b989..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20070510 186375 makandre@ca.ibm.com - Andrew Mak, Compile errors in wst.ws.explorer
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.IOException;
-import java.util.Hashtable;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.Endpoint;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.SOAPMessageUtils;
-import org.eclipse.wst.ws.internal.explorer.transport.HTTPTransportException;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider;
-import org.eclipse.wst.ws.internal.explorer.transport.TransportException;
-
-public abstract class InvokeWSDLSOAPOperationAction extends WSDLPropertiesFormAction
-{
- public InvokeWSDLSOAPOperationAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- super.processParsedResults(parser);
- String endPoint = parser.getParameter(WSDLActionInputs.END_POINT);
- InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
- invokeWSDLOperationTool.setEndPoint(endPoint);
- return true;
- }
-
- /**
- * Returns an ISOAPMessage to use for the current SOAP operation invocation.
- *
- * @param operElement The operation element from the WSDL model.
- *
- * @return An ISOAPMessage, or null if a message cannot be constructed.
- */
- protected ISOAPMessage getSOAPRequestMessage(WSDLOperationElement operElement) {
- ISOAPTransportProvider provider = operElement.getSOAPTransportProvider();
- if (provider == null)
- return null;
- return provider.newTransport().newMessage(operElement.getMessageContext());
- }
-
- /**
- * Populate the given ISOAPMessage's header using the inputs from WSE
- *
- * @param soapEnvelopeNamespaceTable Hashtable containing a map of the namespace URIs to prefixes.
- * @param operElement WSDLOperationElement encapsulating the WSDL operation.
- * @param soapMessage The ISOAPMessage to populate
- */
- protected void setHeaderContent(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws ParserConfigurationException {
- SOAPMessageUtils.setHeaderContentFromModel(soapEnvelopeNamespaceTable, operElement, soapMessage);
- }
-
- /**
- * Populate the given ISOAPMessage's body using the inputs from WSE
- *
- * @param soapEnvelopeNamespaceTable Hashtable containing a map of the namespace URIs to prefixes.
- * @param operElement WSDLOperationElement encapsulating the WSDL operation.
- * @param soapMessage The ISOAPMessage to populate
- */
- protected void setBodyContent(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws ParserConfigurationException {
- SOAPMessageUtils.setBodyContentFromModel(soapEnvelopeNamespaceTable, operElement, soapMessage);
- }
-
- public boolean run()
- {
- String soapAddressLocation = (String)propertyTable_.get(WSDLActionInputs.END_POINT);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- WSDLOperationElement operElement = (WSDLOperationElement)getSelectedNavigatorNode().getTreeElement();
- WSDLBindingElement bindingElement = (WSDLBindingElement)operElement.getParentElement();
- operElement.setPropertyAsObject(WSDLActionInputs.SOAP_RESPONSE_CACHED, new Boolean(false));
- try
- {
- // Generate the SOAP envelope and its children. We need to create a DOM element version to display and the object version to execute.
- // <SOAP-ENV:Envelope
- // xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
- // xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- // xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- // ...
-
- ISOAPMessage soapMessage = getSOAPRequestMessage(operElement);
- if (soapMessage == null)
- throw new TransportException(wsdlPerspective.getMessage("MSG_ERROR_NO_SUITABLE_TRANSPORT"));
-
- Hashtable namespaceTable = new Hashtable(soapMessage.getNamespaceTable());
- setHeaderContent(namespaceTable, operElement, soapMessage);
- setBodyContent(namespaceTable, operElement, soapMessage);
- soapMessage.setNamespaceTable(namespaceTable);
-
- // store the request
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOAP_REQUEST, soapMessage);
-
- // Execute the SOAP operation.
- if (soapAddressLocation != null)
- {
- soapMessage.setProperty(ISOAPMessage.PROP_SOAP_ACTION, operElement.getSoapAction());
- String[] authParams = retrieveAuthParams(bindingElement, soapAddressLocation);
-
- // invoke!
- ISOAPMessage soapResponse = operElement.getSOAPTransportProvider().newTransport()
- .send(soapAddressLocation, authParams[0], authParams[1], soapMessage);
-
- // store the response
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOAP_RESPONSE, soapResponse);
-
- wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
- return true;
- }
- throw new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",soapAddressLocation));
- }
- catch (HTTPTransportException e) {
- throwHTTPTransportException(bindingElement, soapAddressLocation, e);
- }
- catch (Exception e) {
- Throwable t = e;
- if (e instanceof TransportException && e.getCause() != null)
- t = e.getCause();
- handleUnexpectedException(wsdlPerspective, messageQueue, t.getClass().getName(), t);
- }
- return false;
- }
-
- private void throwHTTPTransportException(WSDLBindingElement bindingElement, String endpointString, HTTPTransportException httpTransportException) throws HTTPTransportException
- {
- if (httpTransportException.getStatusCode() == HttpServletResponse.SC_UNAUTHORIZED)
- {
- Endpoint endpoint = bindingElement.getEndpoint(endpointString);
- if (endpoint != null)
- {
- endpoint.setRequireHTTPBasicAuth(true);
- endpoint.setHttpBasicAuthUsername(null);
- endpoint.setHttpBasicAuthPassword(null);
- }
- }
- throw httpTransportException;
- }
-
- private String[] retrieveAuthParams(WSDLBindingElement bindingElement, String endpointString)
- {
- String[] authParams = new String[] { null, null };
- Endpoint endpoint = bindingElement.getEndpoint(endpointString);
- if (endpoint != null)
- {
- if (endpoint.isRequireHTTPBasicAuth())
- {
- String httpBasicAuthUsername = endpoint.getHttpBasicAuthUsername();
- String httpBasicAuthPassword = endpoint.getHttpBasicAuthPassword();
- if (httpBasicAuthUsername == null || httpBasicAuthPassword == null)
- {
- httpBasicAuthUsername = (String)propertyTable_.get(WSDLActionInputs.HTTP_BASIC_AUTH_USERNAME);
- httpBasicAuthPassword = (String)propertyTable_.get(WSDLActionInputs.HTTP_BASIC_AUTH_PASSWORD);
- endpoint.setHttpBasicAuthUsername(httpBasicAuthUsername);
- endpoint.setHttpBasicAuthPassword(httpBasicAuthPassword);
- }
- if (httpBasicAuthUsername != null && httpBasicAuthPassword != null)
- {
- authParams[0] = httpBasicAuthUsername;
- authParams[1] = httpBasicAuthPassword;
- }
- }
- }
- return authParams;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java
deleted file mode 100644
index e6bb6d08b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transformer.FragmentTransformer;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-
-public class InvokeWSDLSOAPOperationFormAction extends InvokeWSDLSOAPOperationAction
-{
- public InvokeWSDLSOAPOperationFormAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- boolean resultsValid = true;
- super.processParsedResults(parser);
- String sourceContent = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
- if (sourceContent == null)
- {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- WSDLOperationElement operElement = (WSDLOperationElement) getSelectedNavigatorNode().getTreeElement();
-
- // validate headers
- Iterator it = operElement.getSOAPHeaders().iterator();
- while (it.hasNext())
- {
- SOAPHeader soapHeader = (SOAPHeader) it.next();
- IFragment frag = operElement.getHeaderFragment(soapHeader);
- if (!frag.processParameterValues(parser))
- {
- Message message = soapHeader.getEMessage();
- Part part = soapHeader.getEPart();
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_VALIDATING_PARAMETER", message.getQName() + " " + part.getName()));
- resultsValid = false;
- }
- }
-
- // validate body
- it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext())
- {
- Part part = (Part) it.next();
- IFragment frag = operElement.getFragment(part);
- if (!frag.processParameterValues(parser))
- {
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_VALIDATING_PARAMETER", part.getName()));
- resultsValid = false;
- }
- }
- }
- return resultsValid;
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length - 1] = new FragmentTransformer(controller_);
- return transformers;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java
deleted file mode 100644
index 58670a858..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Hashtable;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-
-public class InvokeWSDLSOAPOperationSourceAction extends InvokeWSDLSOAPOperationAction
-{
- private boolean newFileSelected_;
- private boolean saveAsSelected_;
- private boolean isHeader_;
-
- public InvokeWSDLSOAPOperationSourceAction(Controller controller)
- {
- super(controller);
- newFileSelected_ = false;
- saveAsSelected_ = false;
- isHeader_ = false;
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- super.processParsedResults(parser);
- WSDLOperationElement operElement = (WSDLOperationElement)getSelectedNavigatorNode().getTreeElement();
- newFileSelected_ = false;
- saveAsSelected_ = false;
- isHeader_ = false;
- /* try and catch is needed if we are doing fragmentization.
- try
- {
- */
- String submissionAction = parser.getParameter(WSDLActionInputs.SUBMISSION_ACTION);
- String sourceContents = parser.getParameter(FragmentConstants.SOURCE_CONTENT_HEADER);
- if (sourceContents != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER,sourceContents);
- sourceContents = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
- if (sourceContents != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,sourceContents);
- if (WSDLActionInputs.SUBMISSION_ACTION_BROWSE_FILE_HEADER.equals(submissionAction))
- {
- newFileSelected_ = true;
- String fileContents = parser.getParameter(WSDLActionInputs.SELECTED_FILE_HEADER);
- if (fileContents != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER,fileContents);
- }
- else if (WSDLActionInputs.SUBMISSION_ACTION_BROWSE_FILE.equals(submissionAction))
- {
- newFileSelected_ = true;
- String fileContents = parser.getParameter(WSDLActionInputs.SELECTED_FILE);
- if (fileContents != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,fileContents);
- }
- else if (WSDLActionInputs.SUBMISSION_ACTION_SAVE_AS_HEADER.equals(submissionAction))
- {
- saveAsSelected_ = true;
- isHeader_ = true;
- return true;
- }
- else if (WSDLActionInputs.SUBMISSION_ACTION_SAVE_AS.equals(submissionAction))
- {
- // Save As... action
- saveAsSelected_ = true;
- return true;
- }
-
- String[] nsDeclarations = parser.getParameterValues(FragmentConstants.SOURCE_CONTENT_NAMESPACE);
- if (nsDeclarations != null)
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE,nsDeclarations);
-
- return true;
- /*
- }
- catch (ParserConfigurationException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"ParserConfigurationException",e);
- }
- catch (SAXException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"SAXException",e);
- }
- catch (UnsupportedEncodingException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"UnsupportedEncodingException",e);
- }
- catch (IOException e)
- {
- handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
- }
- return false;
- */
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.InvokeWSDLSOAPOperationAction#getSOAPRequestMessage(org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement)
- */
- protected ISOAPMessage getSOAPRequestMessage(WSDLOperationElement operElement) {
- return (ISOAPMessage) operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOAP_REQUEST_TMP);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.InvokeWSDLSOAPOperationAction#setHeaderContent(java.util.Hashtable, org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement, org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage)
- */
- protected void setHeaderContent(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage) {
- String headerContent = operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER);
- operElement.getSOAPTransportProvider().newTransport().newDeserializer()
- .deserialize(ISOAPMessage.HEADER_CONTENT, headerContent, soapMessage);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.InvokeWSDLSOAPOperationAction#setBodyContent(java.util.Hashtable, org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement, org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage)
- */
- protected void setBodyContent(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage) {
- String bodyContent = operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT);
- operElement.getSOAPTransportProvider().newTransport().newDeserializer()
- .deserialize(ISOAPMessage.BODY_CONTENT, bodyContent, soapMessage);
- }
-
- public final boolean wasNewFileSelected()
- {
- return newFileSelected_;
- }
-
- public final boolean wasSaveAsSelected()
- {
- return saveAsSelected_;
- }
-
- public final String getDefaultSaveAsFileName()
- {
- WSDLOperationElement operElement = (WSDLOperationElement)(getSelectedNavigatorNode().getTreeElement());
- return (new StringBuffer(operElement.getOperation().getName())).append(".txt").toString();
- }
-
- public final void writeSourceContent(OutputStream os)
- {
- WSDLOperationElement operElement = (WSDLOperationElement)(getSelectedNavigatorNode().getTreeElement());
- PrintWriter pw = new PrintWriter(os);
- if (isHeader_)
- pw.println(operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER));
- else
- pw.println(operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT));
- pw.close();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java
deleted file mode 100644
index 19422e2b7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Vector;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class OpenWSDLAction extends WSDLPropertiesFormAction {
-
- public OpenWSDLAction(Controller controller) {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException {
- String wsdlUrl = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
- FormTool formTool = getSelectedFormTool();
- propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
- formTool.updatePropertyTable(propertyTable_);
- return true;
- }
-
- public boolean run() {
- String wsdlUrl = (String)propertyTable_.get(ActionInputs.QUERY_INPUT_WSDL_URL);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- TreeElement rootElement = rootNode.getTreeElement();
-
- // create a WSDLElement representing the WSDL
- WSDLElement wsdlElement = new WSDLElement(wsdlUrl, rootElement.getModel(), wsdlUrl);
- try
- {
- // open WSDL
- Vector errorMessages = wsdlElement.loadWSDL();
- if (errorMessages.size() > 0)
- {
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_XSD_VALIDATION"));
- for (int i=0;i<errorMessages.size();i++)
- messageQueue.addMessage((String)errorMessages.elementAt(i));
- }
- }
- catch (WSDLException e)
- {
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_OPEN_WSDL",wsdlUrl));
- handleUnexpectedException(wsdlPerspective,messageQueue,"WSDLException",e);
- return false;
- }
- rootElement.connect(wsdlElement,WSDLModelConstants.REL_WSDL, ModelConstants.REL_OWNER);
-
- // build the datamodel for this WSDLElement
- wsdlElement.buildModel();
-
- // If there is more than 1 service node, select the WSDL node. If there is more than 1 binding node, select the service node.
- // If there is just the one service and binding node, select the binding node.
- // select the new WSDL node
- Node wsdlNode = rootNode.getChildNode(wsdlElement);
- Vector serviceNodes = wsdlNode.getChildNodes();
- int newSelectedNodeId = wsdlNode.getNodeId();
- if (serviceNodes.size() == 1)
- {
- Node serviceNode = (Node)serviceNodes.elementAt(0);
- Vector bindingNodes = serviceNode.getChildNodes();
- if (bindingNodes.size() == 1)
- {
- Node bindingNode = (Node)bindingNodes.elementAt(0);
- newSelectedNodeId = bindingNode.getNodeId();
- }
- else
- newSelectedNodeId = serviceNode.getNodeId();
- }
- nodeManager.setSelectedNodeId(newSelectedNodeId);
- nodeManager.makeNodeVisible(nodeManager.getNode(newSelectedNodeId));
- addToHistory(ActionInputs.PERSPECTIVE_WSDL,SelectWSDLPropertiesToolAction.getActionLink(newSelectedNodeId, 0, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, true));
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_OPEN_WSDL_SUCCESSFUL", wsdlUrl));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java
deleted file mode 100644
index 5bdd84130..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-
-public class OpenXSDInfoDialogAction extends Action
-{
- public OpenXSDInfoDialogAction()
- {
- }
-
- public static final String getActionLink(String sessionId,int nodeId,String fragId)
- {
- StringBuffer actionLink = new StringBuffer("wsdl/fragment/XSDInfoDialog.jsp?");
- actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(WSDLActionInputs.FRAGMENT_ID).append('=').append(fragId);
- return actionLink.toString();
- }
-
- public final boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public final boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java
deleted file mode 100644
index e828d8c6d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class RefreshWSDLAction extends LinkAction {
-
- public RefreshWSDLAction(Controller controller) {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID) {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/WSDLRefreshActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- protected boolean processLinkParameters(HttpServletRequest request) {
- NodeManager nodeManager = controller_.getWSDLPerspective().getNodeManager();
- String nodeIDString = request.getParameter(ActionInputs.NODEID);
- int nodeID;
- try {
- nodeID = Integer.parseInt(nodeIDString);
- }
- catch (NumberFormatException nfe) {
- nodeID = nodeManager.getSelectedNodeId();
- }
- Node node = nodeManager.getNode(nodeID);
- while (node != null && !(node instanceof WSDLMainNode)) {
- if (node instanceof WSDLNode) {
- propertyTable_.put(ActionInputs.NODEID, String.valueOf(node.getNodeId()));
- return true;
- }
- node = node.getParent();
- }
- return false;
- }
-
- public boolean run() {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node wsdlNode = nodeManager.getNode(nodeID);
- WSDLElement wsdlElement = (WSDLElement)wsdlNode.getTreeElement();
- Definition definitionCopy = wsdlElement.getDefinition();
- Vector schemaListCopy = wsdlElement.getSchemaList();
- wsdlElement.setDefinition(null);
- wsdlElement.setSchemaList(new Vector());
- int selectedNodeID = nodeManager.getSelectedNode().getNodeId();
-
- try {
- // open WSDL
- Vector errorMessages = wsdlElement.loadWSDL();
- if (errorMessages.size() > 0) {
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_XSD_VALIDATION"));
- for (int i=0;i<errorMessages.size();i++)
- messageQueue.addMessage((String)errorMessages.elementAt(i));
- }
- }
- catch (WSDLException e)
- {
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_OPEN_WSDL",wsdlElement.getWsdlUrl()));
- handleUnexpectedException(wsdlPerspective,messageQueue,"WSDLException",e);
- wsdlElement.setDefinition(definitionCopy);
- wsdlElement.setSchemaList(schemaListCopy);
- return false;
- }
-
- // build the datamodel for this WSDLElement
- wsdlElement.buildModel();
-
- // Select a new node if the previous selected node no longer exists
- // If there is more than 1 service node, select the WSDL node. If there is more than 1 binding node, select the service node.
- // If there is just the one service and binding node, select the binding node.
- Node node = nodeManager.getNode(selectedNodeID);
- if (node == null) {
- selectedNodeID = wsdlNode.getNodeId();
- Vector serviceNodes = wsdlNode.getChildNodes();
- if (serviceNodes.size() == 1)
- {
- Node serviceNode = (Node)serviceNodes.elementAt(0);
- Vector bindingNodes = serviceNode.getChildNodes();
- if (bindingNodes.size() == 1)
- {
- Node bindingNode = (Node)bindingNodes.elementAt(0);
- selectedNodeID = bindingNode.getNodeId();
- }
- else
- selectedNodeID = serviceNode.getNodeId();
- }
- nodeManager.setSelectedNodeId(selectedNodeID);
- nodeManager.makeNodeVisible(nodeManager.getNode(selectedNodeID));
- }
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_REFRESH_WSDL_SUCCESSFUL", wsdlElement.getWsdlUrl()));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java
deleted file mode 100644
index c4ca1540e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class ResizeWSDLFramesAction extends ResizeFramesAction
-{
- public ResizeWSDLFramesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- // Save the current frameset sizes.
- String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
- String perspectiveContentFramesetCols = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-
- // Set the new frameset sizes.
- if (frameName.equals(WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER))
- {
- wsdlPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- if (perspectiveContentFramesetCols.startsWith("100%"))
- {
- // Restore.
- wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
- }
- else
- {
- // Maximize.
- wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsdlPerspective.setPerspectiveContentFramesetCols("100%,0%");
- }
- }
- else if (frameName.equals(WSDLFrameNames.WSDL_PROPERTIES_CONTAINER))
- {
- if (actionsContainerFramesetRows.startsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
- wsdlPerspective.setActionsContainerFramesetRows(wsdlPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsdlPerspective.setActionsContainerFramesetRows("100%,0%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- else if (frameName.equals(WSDLFrameNames.WSDL_STATUS_CONTAINER))
- {
- if (actionsContainerFramesetRows.endsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
- wsdlPerspective.setActionsContainerFramesetRows(wsdlPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsdlPerspective.setActionsContainerFramesetRows("0%,100%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java
deleted file mode 100644
index c875f1592..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class SelectWSDLNavigatorNodeAction extends SelectNodeAction
-{
-
- public SelectWSDLNavigatorNodeAction(Controller controller)
- {
- super(controller,controller.getWSDLPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID, boolean forHistory)
- {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeID);
- if (forHistory)
- actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- ToolManager toolManager = selectedNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = selectedNode_.getNodeId();
-
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return selectedTool.getSelectToolActionHref(true);
- else
- return getActionLink(nodeId,true);
- }
-
- public final String getTreeContentVar() {
- return "wsdlNavigatorContent";
- }
-
- public final String getTreeContentPage() {
- return "wsdl/wsdl_navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar() {
- return "wsdlPropertiesContainer";
- }
-
- public final String getPropertiesContainerPage() {
- return "wsdl/wsdl_properties_container.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSDL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java
deleted file mode 100644
index 1156089ba..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class SelectWSDLPropertiesToolAction extends SelectNodeToolAction
-{
-
- public SelectWSDLPropertiesToolAction(Controller controller)
- {
- super(controller, controller.getWSDLPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- if (viewID != ActionInputs.VIEWID_DEFAULT) {
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- }
- if (keepHistory) {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- int nodeId = selectedNode_.getNodeId();
- int toolId = selectedTool_.getToolId();
- int viewId = selectedNode_.getViewId();
- int viewToolId = selectedNode_.getViewToolId();
- return getActionLink(nodeId,toolId,viewId,viewToolId,true);
- }
-
- public final String getTreeContentVar() {
- return "wsdlNavigatorContent";
- }
-
- public final String getTreeContentPage() {
- return "wsdl/wsdl_navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar() {
- return "wsdlPropertiesContainer";
- }
-
- public final String getPropertiesContainerPage() {
- return "wsdl/wsdl_properties_container.jsp";
- }
-
- public final String getPropertiesContentVar() {
- return "wsdlPropertiesContent";
- }
-
- public final String getPropertiesContentPage() {
- return "wsdl/wsdl_properties_content.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSDL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java
deleted file mode 100644
index 9e5bc3b9c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public final class SwitchPerspectiveFromWSDLAction extends ShowPerspectiveAction
-{
- public SwitchPerspectiveFromWSDLAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- String perspectiveContentFramesetCols = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-
- // Save the frameset sizes iff no frame is maximized.
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
- wsdlPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-
- if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
- wsdlPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-
- return super.run();
- }
-
- public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- StringBuffer formLink = new StringBuffer("wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp?");
- formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
- if (forHistory)
- formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return formLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java
deleted file mode 100644
index 8d33e9156..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Part;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPHeaderWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.SOAPMessageUtils;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.w3c.dom.Element;
-
-public class SynchronizeFragmentViewsAction extends WSDLPropertiesFormAction
-{
- public SynchronizeFragmentViewsAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- super.processParsedResults(parser);
- Node selectedNode = getSelectedNavigatorNode();
- WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-
- InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
- String viewID = parser.getParameter(FragmentConstants.FRAGMENT_VIEW_ID);
- propertyTable_.put(FragmentConstants.FRAGMENT_VIEW_ID, viewID);
- if (viewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
- {
- invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE);
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE, null);
-
- return processFormViewParsedResultsHeader(parser, operElement) & // need to process both header and body
- processFormViewParsedResults(parser, operElement);
- }
- else
- {
- invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM);
- String[] nsDeclarations = parser.getParameterValues(FragmentConstants.SOURCE_CONTENT_NAMESPACE);
- if (nsDeclarations != null)
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE,nsDeclarations);
-
- ISOAPMessage soapMessage = (ISOAPMessage) operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOAP_REQUEST_TMP);
- boolean rc = processSourceViewParsedResultsHeader(parser, operElement, soapMessage) & // need to process both header and body
- processSourceViewParsedResults(parser, operElement, soapMessage);
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOAP_REQUEST_TMP, null);
-
- return rc;
- }
- }
-
- private boolean processFormViewParsedResultsHeader(MultipartFormDataParser parser, WSDLOperationElement operElement) throws MultipartFormDataException
- {
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER, null);
- boolean resultsValid = true;
-
- Iterator it = operElement.getSOAPHeaders().iterator();
- while (it.hasNext())
- {
- SOAPHeader soapHeader = (SOAPHeader) it.next();
- IXSDFragment frag = operElement.getHeaderFragment(soapHeader);
- if (!frag.processParameterValues(parser))
- resultsValid = false;
- }
- if (resultsValid)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER,null);
- return resultsValid;
- }
-
- private boolean processFormViewParsedResults(MultipartFormDataParser parser, WSDLOperationElement operElement) throws MultipartFormDataException
- {
- operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT, null);
- boolean resultsValid = true;
-
- Iterator it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = operElement.getFragment(part);
- if (!frag.processParameterValues(parser))
- resultsValid = false;
- }
- if (resultsValid)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,null);
- return resultsValid;
- }
-
- private boolean processSourceViewParsedResultsHeader(MultipartFormDataParser parser, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws MultipartFormDataException {
-
- String sourceContent = parser.getParameter(FragmentConstants.SOURCE_CONTENT_HEADER);
- if (sourceContent != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT_HEADER, sourceContent);
-
- Iterator it = operElement.getSOAPHeaders().iterator();
- if (!it.hasNext())
- return true;
-
- try
- {
- operElement.getSOAPTransportProvider().newTransport().newDeserializer()
- .deserialize(ISOAPMessage.HEADER_CONTENT, sourceContent, soapMessage);
-
- Element[] instanceDocuments = soapMessage.getHeaderContent();
- Map namespaceTable = soapMessage.getNamespaceTable();
-
- boolean sourceElementsValid = true;
- int start = 0;
- while (it.hasNext() && start < instanceDocuments.length)
- {
- SOAPHeader soapHeader = (SOAPHeader)it.next();
- SOAPHeaderWrapperFragment frag = (SOAPHeaderWrapperFragment) operElement.getHeaderFragment(soapHeader);
-
- int pos = SOAPMessageUtils.findFirstMatchingElement(
- soapHeader.getEPart(),
- instanceDocuments,
- namespaceTable,
- frag.getName(),
- start);
-
- if (pos == -1)
- continue;
-
- Element element = instanceDocuments[pos];
- start = pos + 1;
-
- if (!frag.setParameterValuesFromInstanceDocument(element, namespaceTable))
- sourceElementsValid = false;
- }
- return sourceElementsValid;
- }
- catch (Throwable t)
- {
- return false;
- }
- }
-
- private boolean processSourceViewParsedResults(MultipartFormDataParser parser, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws MultipartFormDataException {
-
- String sourceContent = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
- if (sourceContent != null)
- operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT, sourceContent);
-
- Iterator it = operElement.getOrderedBodyParts().iterator();
-
- try
- {
- operElement.getSOAPTransportProvider().newTransport().newDeserializer()
- .deserialize(ISOAPMessage.BODY_CONTENT, sourceContent, soapMessage);
-
- Element[] instanceDocuments = soapMessage.getBodyContent();
-
- boolean sourceElementsValid = true;
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = operElement.getFragment(part);
- if (!frag.setParameterValuesFromInstanceDocuments(instanceDocuments))
- sourceElementsValid = false;
- }
- return sourceElementsValid;
- }
- catch (Throwable t)
- {
- return false;
- }
- }
-
- public boolean run() {
- return true;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java
deleted file mode 100644
index 748cd9216..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ToggleWSDLNavigatorNodeAction extends ToggleNodeAction
-{
- public ToggleWSDLNavigatorNodeAction(Controller controller)
- {
- super(controller,controller.getWSDLPerspective().getNodeManager());
- }
-
- // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...&open=...
- public static String getActionLink(int nodeId,boolean open)
- {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
- actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
- return actionLink.toString();
- }
-
- // This should be called only to select the toggled node when, at the time of
- // the collapse event, a descendant node was selected.
- public final String getActionLinkForHistory()
- {
- ToolManager toolManager = toggledNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = toggledNode_.getNodeId();
- int toolId = selectedTool.getToolId();
- int viewId = toggledNode_.getViewId();
- int viewToolId = toggledNode_.getViewToolId();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectWSDLPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
- else
- return SelectWSDLNavigatorNodeAction.getActionLink(nodeId,true);
- }
-
- public final String getTreeContentVar()
- {
- return "wsdlNavigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "wsdl/wsdl_navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "wsdlPropertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "wsdl/wsdl_properties_container.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSDL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java
deleted file mode 100644
index 8ee6656d3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLBindingNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class UpdateWSDLBindingAction extends WSDLPropertiesFormAction
-{
- public UpdateWSDLBindingAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] nodeIds = parser.getParameterValues(ActionInputs.NODEID);
- if (nodeIds == null)
- nodeIds = new String[0];
- propertyTable_.put(ActionInputs.NODEID, nodeIds);
- String[] endpoints = parser.getParameterValues(WSDLActionInputs.END_POINT);
- if (endpoints == null)
- endpoints = new String[0];
- propertyTable_.put(WSDLActionInputs.END_POINT, endpoints);
- return true;
- }
-
- public boolean run()
- {
- String[] nodeIds = getPropertyAsStringArray(ActionInputs.NODEID);
- String[] endpoints = getPropertyAsStringArray(WSDLActionInputs.END_POINT);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- for (int i = 0; i < nodeIds.length; i++)
- {
- try
- {
- Node bindingNode = nodeManager.getNode(Integer.parseInt(nodeIds[i]));
- if (bindingNode instanceof WSDLBindingNode)
- {
- WSDLBindingElement bindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
- String[] endpointsCopy = endpoints;
- bindingElement.setEndPoints(endpointsCopy);
- if (endpointsCopy.length <= 0)
- endpointsCopy = bindingElement.getEndPoints();
- if (endpointsCopy.length > 0)
- {
- Vector operationNodes = bindingNode.getChildNodes();
- for (Iterator it = operationNodes.iterator(); it.hasNext();)
- {
- Node operationNode = (Node)it.next();
- List tools = operationNode.getCurrentToolManager().getTools();
- for (Iterator toolsIterator = tools.iterator(); toolsIterator.hasNext();)
- {
- Tool tool = (Tool)toolsIterator.next();
- if (tool instanceof InvokeWSDLOperationTool)
- ((InvokeWSDLOperationTool)tool).setEndPoint(endpointsCopy[0]);
- }
- }
- }
- }
- }
- catch (NumberFormatException nfe)
- {
- }
- }
- MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
- messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_UPDATE_WSDL_BINDING_SUCCESSFUL"));
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java
deleted file mode 100644
index 022cbafa8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLAddToFavoritesAction extends LinkAction {
- public WSDLAddToFavoritesAction(Controller controller) {
- super(controller);
- }
-
- protected boolean processLinkParameters(HttpServletRequest request) {
- String nodeID = request.getParameter(ActionInputs.NODEID);
- try {
- Integer.parseInt(nodeID);
- propertyTable_.put(ActionInputs.NODEID, nodeID);
- return true;
- }
- catch (Throwable t) {
- return false;
- }
- }
-
- public static String getActionLink(int nodeID) {
- StringBuffer actionLink = new StringBuffer("wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- return actionLink.toString();
- }
-
- public boolean favoriteExists() {
- String wsdlUrl = getWsdlUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlUrl);
- FavoritesFolderElement favFolderElement = getFavWSDLFolderElement();
- return favFolderElement.favoriteExists(table);
- }
-
- public boolean run() {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- String wsdlUrl = getWsdlUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlUrl);
- FavoritesFolderElement favFolderElement = getFavWSDLFolderElement();
- if (favFolderElement.addFavorite(table)) {
- wsdlPerspective.getMessageQueue().addMessage(wsdlPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsdlUrl));
- return true;
- }
- else {
- wsdlPerspective.getMessageQueue().addMessage(wsdlPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsdlUrl));
- return false;
- }
- }
-
- private String getWsdlUrl() {
- String nodeID = (String)propertyTable_.get(ActionInputs.NODEID);
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager wsdlNodeManager = wsdlPerspective.getNodeManager();
- WSDLElement selectedElement = (WSDLElement)wsdlNodeManager.getNode(Integer.parseInt(nodeID)).getTreeElement();
- return selectedElement.getWsdlUrl();
- }
-
- private FavoritesFolderElement getFavWSDLFolderElement() {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favNodeManager = favPerspective.getNodeManager();
- TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
- Enumeration e = favRootElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
- return (FavoritesFolderElement)e.nextElement();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java
deleted file mode 100644
index 6f7ce38a5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLImportWSDLToFileSystemAction extends ImportToFileSystemAction {
- private Definition definition_;
- private String defaultWSDLFileName_;
-
- public WSDLImportWSDLToFileSystemAction(Controller controller) {
- super(controller);
- definition_ = null;
- defaultWSDLFileName_ = "temp.wsdl";
- }
-
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId) {
- return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp");
- }
-
- public final boolean write(OutputStream os) {
- return writeWSDLDefinition(os, definition_);
- }
-
- public final String getDefaultFileName() {
- return defaultWSDLFileName_;
- }
-
- public final boolean run() {
- int nodeID;
- try {
- nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- }
- catch (NumberFormatException nfe) {
- return false;
- }
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node node = nodeManager.getNode(nodeID);
- WSDLElement wsdlElement = (WSDLElement)node.getTreeElement();
- definition_ = wsdlElement.getDefinition();
- defaultWSDLFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlElement.getWsdlUrl());
- return (definition_ != null);
- }
-
- public final String getStatusContentVar() {
- return controller_.getWSDLPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage() {
- return controller_.getWSDLPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java
deleted file mode 100644
index 2652c46ea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLImportWSDLToWorkbenchAction extends ImportToWorkbenchAction {
- public WSDLImportWSDLToWorkbenchAction(Controller controller) {
- super(controller);
- }
-
- public FormTool getSelectedFormTool() {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
- }
-
- public ImportToFileSystemAction newImportToFileSystemAction() {
- WSDLImportWSDLToFileSystemAction action = new WSDLImportWSDLToFileSystemAction(controller_);
- Hashtable table = action.getPropertyTable();
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
- return action;
- }
-
- public final String getStatusContentVar() {
- return controller_.getWSDLPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage() {
- return controller_.getWSDLPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java
deleted file mode 100644
index 5a95eeec1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
-
- public WSDLLaunchWebServiceWizardAction(Controller controller) {
- super(controller);
- }
-
- public FormTool getSelectedFormTool() {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
- }
-
- public boolean run() {
- WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
- NodeManager nodeManager = wsdlPerspective.getNodeManager();
- Node node = nodeManager.getSelectedNode();
- WSDLElement element = (WSDLElement)node.getTreeElement();
- return launchWizard(element.getWsdlUrl());
- }
-
- public final String getStatusContentVar() {
- return controller_.getWSDLPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage() {
- return controller_.getWSDLPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java
deleted file mode 100644
index 648081d5d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class WSDLPropertiesFormAction extends FormAction
-{
- protected NodeManager navigatorManager_;
- public WSDLPropertiesFormAction(Controller controller)
- {
- super(controller);
- navigatorManager_ = controller.getWSDLPerspective().getNodeManager();
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String[] keys = parser.getParameterNames();
- for (int i = 0; i < keys.length; i++)
- {
- String[] values = parser.getParameterValues(keys[i]);
- if (values != null)
- {
- if (values.length == 1)
- propertyTable_.put(keys[i], values[0]);
- else if (values.length > 1)
- propertyTable_.put(keys[i], values);
- }
- }
- return true;
- }
-
- public Node getSelectedNavigatorNode()
- {
- return navigatorManager_.getSelectedNode();
- }
-
- public FormTool getSelectedFormTool()
- {
- return (FormTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java
deleted file mode 100644
index f9dda3f95..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class BindingTypes
-{
- public static final int UNSUPPORTED = -1;
- public static final int SOAP = 0;
- public static final int HTTP_GET = 1;
- public static final int HTTP_POST = 2;
-
- public static final String HTTP_VERB_GET = "GET";
- public static final String HTTP_VERB_POST = "POST";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java
deleted file mode 100644
index 802c20a2a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class FragmentConstants
-{
- // XSD minOccurs and maxOccurs
- public static final int DEFAULT_MIN_OCCURS = 1;
- public static final int DEFAULT_MAX_OCCURS = 1;
- public static final int UNBOUNDED = -1;
-
- // WSDL style
- public static final int STYLE_DOCUMENT = 0;
- public static final int STYLE_RPC = 1;
-
- // WSDL Encoding styles
- public static final int ENCODING_LITERAL = 0;
- public static final int ENCODING_SOAP = 1;
- public static final int ENCODING_URL = 2; // HTTP Get/Post
-
- // IDs used by the fragment model
- public static final String ID_SEPERATOR = "::";
- public static final String INPUT_ID = "::input";
- public static final String OUTPUT_ID = "::output";
- public static final String TABLE_ID = "::tableID";
- public static final String FRAGMENT_ID = "::fragmentID";
- public static final String NAME_ANCHOR_ID = "::nameAnchorID";
- public static final String FRAGMENT_VIEW_ID = "::fragmentViewID";
- public static final String XSD_ATOMIC_ENUM_ID = "::xsdAtomicEnumID";
- public static final String XSD_ALL_GROUP_ID = "::xsdAllGroupID";
- public static final String PART_TOKEN = "^";
-
- // Fragment view IDs
- public static final String FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE = "::fragmentViewSwitchFormToSource";
- public static final String FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM = "::fragmentViewSwitchSourceToForm";
- public static final String SOURCE_CONTENT_HEADER = "::sourceContentHeader";
- public static final String SOURCE_CONTENT = "::sourceContent";
- public static final String SOURCE_CONTENT_NAMESPACE = "::sourceContentNS";
-
- // Action input constants
- public static final String NAME_ANCHOR = "nameAnchor";
-
- // Namespaces contants
- public static final String URI_XSD = "http://www.w3.org/2001/XMLSchema";
- public static final String URI_SOAP = "http://schemas.xmlsoap.org/soap/encoding/";
- public static final String URI_SOAP_ENV = "http://schemas.xmlsoap.org/soap/envelope/";
- public static final String URI_WSDL = "http://schemas.xmlsoap.org/wsdl/";
- public static final String URI_XSI = "http://www.w3.org/2001/XMLSchema-instance";
- public static final String SOAP_ENC_ARRAY_TYPE = "arrayType";
- public static final String XSI_TYPE = "type";
- public static final String QNAME_PREFIX = "q";
- public static final String QNAME_LOCAL_NAME_ARRAY_TYPE = "arrayType";
- public static final String QNAME_LOCAL_NAME_ARRAY = "Array";
- public static final String COLON = ":";
- public static final String QNAME_LOCAL_NAME_HEADER = "Header";
- public static final String QNAME_LOCAL_NAME_BODY = "Body";
- public static final String QNAME_LOCAL_NAME_FAULT = "Fault";
-
- // List
- public static final String LIST_SEPERATOR = " ";
-
- // SOAP-ENC:Array
- public static final String LEFT_SQUARE_BRACKET = "[";
- public static final String RIGHT_SQUARE_BRACKET = "]";
-
- // XSDDefaultFragment
- public static final String ROOT_ELEMENT_START_TAG = "<root>";
- public static final String ROOT_ELEMENT_END_TAG = "</root>";
-
- // Namespace URIs.
- public static final String NS_URI_XMLNS = "http://www.w3.org/2000/xmlns/";
- public static final String NS_URI_SOAP_ENV = "http://schemas.xmlsoap.org/soap/envelope/";
- public static final String NS_URI_SOAP_ENC = "http://schemas.xmlsoap.org/soap/encoding/";
- public static final String NS_URI_1999_SCHEMA_XSI = "http://www.w3.org/1999/XMLSchema-instance";
- public static final String NS_URI_1999_SCHEMA_XSD = "http://www.w3.org/1999/XMLSchema";
- public static final String NS_URI_2000_SCHEMA_XSI = "http://www.w3.org/2000/10/XMLSchema-instance";
- public static final String NS_URI_2000_SCHEMA_XSD = "http://www.w3.org/2000/10/XMLSchema";
- public static final String NS_URI_2001_SCHEMA_XSI = "http://www.w3.org/2001/XMLSchema-instance";
- public static final String NS_URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
- public static final String NS_URI_CURRENT_SCHEMA_XSI = NS_URI_2001_SCHEMA_XSI;
- public static final String NS_URI_CURRENT_SCHEMA_XSD = NS_URI_2001_SCHEMA_XSD;
- public static final String NS_URI_XML_SOAP = "http://xml.apache.org/xml-soap";
- public static final String NS_URI_XML_SOAP_DEPLOYMENT = "http://xml.apache.org/xml-soap/deployment";
- public static final String NS_URI_LITERAL_XML = "http://xml.apache.org/xml-soap/literalxml";
- public static final String NS_URI_XMI_ENC = "http://www.ibm.com/namespaces/xmi";
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java
deleted file mode 100644
index d354b8d93..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLActionInputs
-{
- public static final String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
- public static final String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-
- public static final String SESSION_ID = "sessionID";
- public static final String FRAGMENT_ID = "fragmentID";
-
- public static final String SOAP_ENVELOPE_TYPE = "soapEnvelopeType";
- public static final int SOAP_ENVELOPE_TYPE_REQUEST = 0;
- public static final int SOAP_ENVELOPE_TYPE_RESPONSE = 1;
- public static final String SOAP_RESPONSE_CACHED = "soapResponseCached";
-
- public static final String SUBMISSION_ACTION = "submissionAction";
- public static final String SUBMISSION_ACTION_FORM = "submissionActionForm";
- public static final String SUBMISSION_ACTION_BROWSE_FILE_HEADER = "submissionActionBrowseFileHeader";
- public static final String SUBMISSION_ACTION_BROWSE_FILE = "submissionActionBrowseFile";
- public static final String SUBMISSION_ACTION_SAVE_AS_HEADER = "submissionActionSaveAsHeader";
- public static final String SUBMISSION_ACTION_SAVE_AS = "submissionActionSaveAs";
- public static final String SELECTED_FILE_HEADER = "selectedFileHeader";
- public static final String SELECTED_FILE = "selectedFile";
- public static final String OPERATION_ELEMENT = "operationElement";
-
- public static final String END_POINT = "::endPoint";
- public static final String HTTP_BASIC_AUTH_USERNAME = "httpBasicAuthUsername";
- public static final String HTTP_BASIC_AUTH_PASSWORD = "httpBasicAuthPassword";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java
deleted file mode 100644
index cc960c794..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLFrameNames
-{
- public final static String WSDL_NAVIGATOR_CONTAINER = "wsdl_navigator_container";
- public final static String WSDL_NAVIGATOR_TOOLBAR = "wsdl_navigator_toolbar";
- public final static String WSDL_NAVIGATOR_CONTENT = "wsdl_navigator_content";
- public final static String WSDL_ACTIONS_CONTAINER = "wsdl_actions_container";
- public final static String WSDL_PROPERTIES_CONTAINER = "wsdl_properties_container";
- public final static String WSDL_PROPERTIES_TOOLBAR = "wsdl_properties_toolbar";
- public final static String WSDL_PROPERTIES_CONTENT = "wsdl_properties_content";
- public final static String WSDL_STATUS_CONTAINER = "wsdl_status_container";
- public final static String WSDL_STATUS_TOOLBAR = "wsdl_status_toolbar";
- public final static String WSDL_STATUS_CONTENT = "wsdl_status_content";
-
- // XSD Info Dialog
- public final static String XSD_INFO_TOOLBAR = "xsd_info_toolbar";
- public final static String XSD_INFO_CONTENT = "xsd_info_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java
deleted file mode 100644
index 39b9fba45..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLModelConstants
-{
- // Relation
- public final static String REL_WSDL = "relWSDL";
- public final static String REL_WSDL_SERVICE = "relWSDLService";
- public final static String REL_WSDL_BINDING = "relWSDLBinding";
- public final static String REL_WSDL_OPERATION = "relWSDLOperation";
-
- // Documentation
- public final static String PROP_DOCUMENTATION = "propDocumentation";
-
- // Source Content
- public final static String PROP_SOURCE_CONTENT_HEADER = "propSourceContentHeader";
- public final static String PROP_SOURCE_CONTENT = "propSourceContent";
- public final static String PROP_SOURCE_CONTENT_NAMESPACE = "propSourceContentNS";
-
- // Transport
- public final static String PROP_SOAP_REQUEST_TMP = "propSOAPRequestTmp";
- public final static String PROP_SOAP_REQUEST = "propSOAPRequest";
- public final static String PROP_SOAP_RESPONSE = "propSOAPResponse";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java
deleted file mode 100644
index 8ed7d150e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-public class Endpoint
-{
- private String endpoint;
- private boolean requireHTTPBasicAuth;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
-
- public Endpoint()
- {
- endpoint = null;
- requireHTTPBasicAuth = false;
- httpBasicAuthUsername = null;
- httpBasicAuthPassword = null;
- }
-
- public String getEndpoint()
- {
- return endpoint;
- }
-
- public void setEndpoint(String endpoint)
- {
- this.endpoint = endpoint;
- }
-
- public boolean isRequireHTTPBasicAuth()
- {
- return requireHTTPBasicAuth;
- }
-
- public void setRequireHTTPBasicAuth(boolean requireHTTPBasicAuth)
- {
- this.requireHTTPBasicAuth = requireHTTPBasicAuth;
- }
-
- public String getHttpBasicAuthUsername()
- {
- return httpBasicAuthUsername;
- }
-
- public void setHttpBasicAuthUsername(String httpBasicAuthUsername)
- {
- this.httpBasicAuthUsername = httpBasicAuthUsername;
- }
-
- public String getHttpBasicAuthPassword()
- {
- return httpBasicAuthPassword;
- }
-
- public void setHttpBasicAuthPassword(String httpBasicAuthPassword)
- {
- this.httpBasicAuthPassword = httpBasicAuthPassword;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java
deleted file mode 100644
index 0597888ca..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import javax.wsdl.Binding;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.PortType;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPBinding;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-public class WSDLBindingElement extends WSDLCommonElement
-{
- private int bindingType_;
- private Binding binding_;
- private ExtensibilityElement bindingExtensibilityElement_;
- private Vector endPoints_;
-
- private final void setBindingExtensibilityElement()
- {
- bindingExtensibilityElement_ = null;
- bindingType_ = BindingTypes.UNSUPPORTED;
- List extensibilityElements = binding_.getExtensibilityElements();
- for (Iterator i = extensibilityElements.iterator();i.hasNext();)
- {
- ExtensibilityElement e = (ExtensibilityElement)i.next();
- if (e instanceof HTTPBinding)
- {
- HTTPBinding binding = (HTTPBinding)e;
- String verb = binding.getVerb();
- if (BindingTypes.HTTP_VERB_GET.equals(verb))
- bindingType_ = BindingTypes.HTTP_GET;
- else if (BindingTypes.HTTP_VERB_POST.equals(verb))
- bindingType_ = BindingTypes.HTTP_POST;
- }
- else if (e instanceof SOAPBinding)
- bindingType_ = BindingTypes.SOAP;
- if (bindingType_ != BindingTypes.UNSUPPORTED)
- {
- bindingExtensibilityElement_ = e;
- break;
- }
- }
- }
-
- public WSDLBindingElement(String name, Model model, Binding binding)
- {
- super(name, model);
- setBinding(binding);
- endPoints_ = new Vector();
- }
-
- public void setBinding(Binding binding) {
- binding_ = binding;
- setDocumentation(binding.getDocumentationElement());
- setBindingExtensibilityElement();
- }
-
- public Binding getBinding() {
- return binding_;
- }
-
- public ExtensibilityElement getBindingExtensibilityElement()
- {
- return bindingExtensibilityElement_;
- }
-
- public int getBindingType()
- {
- return bindingType_;
- }
-
- private void resetEndPoints()
- {
- WSDLServiceElement serviceElement = (WSDLServiceElement)getParentElement();
- String fixedEndpointString = serviceElement.getAddressLocation(binding_);
- Endpoint fixedEndpoint = getEndpoint(fixedEndpointString);
- if (fixedEndpoint == null)
- {
- fixedEndpoint = new Endpoint();
- fixedEndpoint.setEndpoint(fixedEndpointString);
- }
- endPoints_.clear();
- endPoints_.add(fixedEndpoint);
- }
-
- public String[] getEndPoints()
- {
- String[] endPoints = new String[endPoints_.size()];
- for (int i = 0; i < endPoints.length; i++)
- endPoints[i] = ((Endpoint)endPoints_.get(i)).getEndpoint();
- return endPoints;
- }
-
- public Endpoint getEndpoint(String endpointString)
- {
- if (endpointString != null && endpointString.length() > 0)
- {
- for (Iterator it = endPoints_.iterator(); it.hasNext();)
- {
- Endpoint endpoint = (Endpoint)it.next();
- if (endpointString.equals(endpoint.getEndpoint()))
- return endpoint;
- }
- }
- return null;
- }
-
- public void setEndPoints(String[] endpoints)
- {
- Vector endpointVector = new Vector();
- for (int i = 0; i < endpoints.length; i++)
- {
- Endpoint endpoint = getEndpoint(endpoints[i]);
- if (endpoint == null)
- {
- endpoint = new Endpoint();
- endpoint.setEndpoint(endpoints[i]);
- }
- endpointVector.add(endpoint);
- }
- resetEndPoints();
- endPoints_.addAll(endpointVector);
- }
-
- public void addEndPoint(String endpointString)
- {
- if (endpointString != null && endpointString.length() > 0)
- {
- Endpoint endpoint = new Endpoint();
- endpoint.setEndpoint(endpointString);
- endPoints_.add(endpoint);
- }
- }
-
- public void removeEndPoint(String endpointString)
- {
- if (endpointString != null && endpointString.length() > 0)
- {
- WSDLServiceElement serviceElement = (WSDLServiceElement)getParentElement();
- String fixedEndpointString = serviceElement.getAddressLocation(binding_);
- if (fixedEndpointString == null || !fixedEndpointString.equals(endpointString))
- {
- for (int i = 0; i < endPoints_.size(); i++)
- {
- if (endpointString.equals(((Endpoint)endPoints_.get(i)).getEndpoint()))
- {
- endPoints_.remove(i);
- break;
- }
- }
- }
- }
- }
-
- public void buildModel() {
- resetEndPoints();
- if (binding_ != null) {
- PortType pt = binding_.getPortType();
- if (pt != null) {
- List operations = pt.getOperations();
- HashMap operationsMap = new HashMap();
- for (Iterator it = operations.iterator();it.hasNext();) {
- Operation operation = (Operation)it.next();
- operationsMap.put(createOperationUniqueName(operation), operation);
- }
- WSDLOperationElement[] wsdlOperationElements = new WSDLOperationElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_OPERATION)];
- Enumeration e = getElements(WSDLModelConstants.REL_WSDL_OPERATION);
- for (int i = 0; i < wsdlOperationElements.length; i++) {
- wsdlOperationElements[i] = (WSDLOperationElement)e.nextElement();
- }
- for (int j = 0; j < wsdlOperationElements.length; j++) {
- String operationName = createOperationUniqueName(wsdlOperationElements[j].getOperation());
- Operation operation = (Operation)operationsMap.get(operationName);
- if (operation != null) {
- operationsMap.remove(operationName);
- wsdlOperationElements[j].setOperation(this, operation);
- }
- else
- disconnect(wsdlOperationElements[j], WSDLModelConstants.REL_WSDL_OPERATION);
- }
- for (Iterator it = operationsMap.values().iterator();it.hasNext();) {
- Operation oper = (Operation)it.next();
- WSDLOperationElement wsdlOperationElement = new WSDLOperationElement(oper.getName(), this, oper);
- connect(wsdlOperationElement,WSDLModelConstants.REL_WSDL_OPERATION,ModelConstants.REL_OWNER);
- }
- }
- }
- }
-
- private String createOperationUniqueName(Operation operation)
- {
- StringBuffer name = new StringBuffer();
- name.append(operation.getName());
- Input inputMsg = operation.getInput();
- if (inputMsg != null)
- {
- QName qname = inputMsg.getMessage().getQName();
- name.append(qname.getNamespaceURI());
- name.append(":");
- name.append(qname.getLocalPart());
- }
- Output outputMsg = operation.getOutput();
- if (outputMsg != null)
- {
- QName qname = outputMsg.getMessage().getQName();
- name.append(qname.getNamespaceURI());
- name.append(":");
- name.append(qname.getLocalPart());
- }
- return name.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java
deleted file mode 100644
index e58ca3bfe..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class WSDLCommonElement extends TreeElement
-{
-
- public WSDLCommonElement(String name, Model model) {
- super(name, model);
- }
-
- public final TreeElement getParentElement() {
- return (TreeElement)getElements(ModelConstants.REL_OWNER).nextElement();
- }
-
- protected final void setDocumentation(Node documentationElement)
- {
- String documentation = "";
- try
- {
- if (documentationElement != null)
- {
- Document doc = XMLUtils.createNewDocument(null);
- DocumentFragment df = doc.createDocumentFragment();
- NodeList documentationNodes = documentationElement.getChildNodes();
- for (int i=0;i<documentationNodes.getLength();i++)
- df.appendChild(doc.importNode(documentationNodes.item(i),true));
- documentation = XMLUtils.serialize(df,true);
- }
- }
- catch (ParserConfigurationException e)
- {
- }
- setPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION,documentation);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java
deleted file mode 100644
index a27ea8080..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060717 146707 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070124 167487 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080115 214955 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.ws.internal.common.HTTPUtility;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.xsd.XSDDiagnostic;
-import org.eclipse.xsd.XSDDiagnosticSeverity;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDParser;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-public class WSDLElement extends WSDLCommonElement
-{
-
- private String wsdlUrl_;
- private Definition definition_;
- private Vector schemaList_;
- private Vector schemaURI_;
-
- private static Vector w3SchemaQNameList_;
- private static Vector constantSchemaList_;
-
- //A ResourceSet for all schemas in this WSDL
- private ResourceSet resourceSet;
-
- static
- {
- // w3 schema URI list:
- // http://www.w3.org/2001/XMLSchema
- // http://www.w3.org/2000/10/XMLSchema
- // http://www.w3.org/1999/XMLSchema
- w3SchemaQNameList_ = new Vector();
- w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_CURRENT_SCHEMA_XSD,"schema"));
- w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_2000_SCHEMA_XSD,"schema"));
- w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_1999_SCHEMA_XSD,"schema"));
-
- // Constant schema URI list:
- // http://www.w3.org/2001/XMLSchema
- // http://www.w3.org/2000/10/XMLSchema
- // http://www.w3.org/1999/XMLSchema
- // http://schemas.xmlsoap.org/soap/encoding/
- // http://schemas.xmlsoap.org/wsdl/
- constantSchemaList_ = new Vector();
- constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_CURRENT_SCHEMA_XSD));
- constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_2000_SCHEMA_XSD));
- constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_1999_SCHEMA_XSD));
- constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_SOAP_ENC));
- constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.URI_WSDL));
- }
-
- public WSDLElement(String name, Model model, String wsdlUrl)
- {
- super(name, model);
- setWsdlUrl(wsdlUrl);
- definition_ = null;
- schemaList_ = new Vector();
- schemaURI_ = new Vector();
- }
-
- public void setWsdlUrl(String wsdlUrl) {
- HTTPUtility http = new HTTPUtility();
- wsdlUrl_ = http.handleRedirect(wsdlUrl);
- }
-
- public String getWsdlUrl() {
- return wsdlUrl_;
- }
-
- public void setSchemaList(Vector schemaList)
- {
- schemaList_ = schemaList;
- }
-
- public Vector getSchemaList()
- {
- return schemaList_;
- }
-
- private final Definition loadWSDL(String wsdlURL) throws WSDLException
- {
- WebServicesParser parser = new WebServicesParserExt();
- try
- {
- return parser.getWSDLDefinitionVerbose(wsdlURL);
- }
- catch (WSDLException wsdle)
- {
- throw wsdle;
- }
- catch (Throwable t)
- {
- throw new WSDLException(WSDLException.OTHER_ERROR , t.getMessage(), t);
- }
- }
-
- public Vector loadWSDL() throws WSDLException
- {
-
- // Register the appropriate resource factory to handle all file extentions.
- resourceSet = new ResourceSetImpl();
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION,new XSDResourceFactoryImpl());
- //Register the package to ensure it is available during loading.
- resourceSet.getPackageRegistry().put(XSDPackage.eNS_URI,XSDPackage.eINSTANCE);
-
-
- Vector errorMessages = new Vector();
- definition_ = loadWSDL(wsdlUrl_);
-
-
- if (definition_ != null)
- {
- setDocumentation(definition_.getDocumentationElement());
- gatherSchemas(definition_, wsdlUrl_);
- // Validate the schemas.
- for (int i=0;i<schemaList_.size();i++)
- {
- XSDSchema xsdSchema = (XSDSchema)schemaList_.elementAt(i);
- xsdSchema.validate();
- EList errors = xsdSchema.getAllDiagnostics();
- if (!errors.isEmpty())
- {
- for (ListIterator li = errors.listIterator();li.hasNext();)
- {
- XSDDiagnostic xd = (XSDDiagnostic)li.next();
- String msg = xd.getMessage();
- // do not report low severity diagnostics or erroneous array reference errors.
- if (xd.getSeverity().getValue() == XSDDiagnosticSeverity.FATAL_LITERAL.getValue() || (msg != null && msg.length() > 0 && msg.toLowerCase().indexOf("#array") != -1))
- li.remove();
- else
- {
- if (msg != null && msg.length() > 0)
- errorMessages.addElement(xd.getMessage());
- }
- }
- }
- }
-
- for (int i=0;i<constantSchemaList_.size();i++)
- schemaList_.addElement(constantSchemaList_.elementAt(i));
-
- }
- return errorMessages;
- }
-
- private final void gatherSchemas(Definition definition, String definitionURL)
- {
- Types types = definition.getTypes();
- if (types != null)
- {
- List extTypes = types.getExtensibilityElements();
- if (extTypes != null)
- {
- for (int i=0;i<extTypes.size();i++)
- {
- XSDSchema xsdSchema = null;
- Object obj = extTypes.get(i);
- if (obj instanceof UnknownExtensibilityElement)
- {
- UnknownExtensibilityElement schemaElement = (UnknownExtensibilityElement)obj;
- if (isW3SchemaElementType(schemaElement.getElementType()))
- {
- xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
- if(!checkSchemaURI(definitionURL)){
- schemaList_.addElement(xsdSchema);
- gatherSchemaDirective(xsdSchema, definitionURL);
- }
- //We need to add the schema to a Resource in a Resource set for proper validation
- org.eclipse.emf.common.util.URI uri = org.eclipse.emf.common.util.URI.createURI(definitionURL);
- Resource resource = resourceSet.createResource(uri);
- //Add the Schema to the resource
- resource.getContents().add(xsdSchema);
- }
- }
- else if (obj instanceof XSDSchemaExtensibilityElementImpl)
- {
- XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)obj;
- xsdSchema = schemaElement.getSchema();
- if(!schemaList_.contains(xsdSchema)){
- schemaList_.addElement(xsdSchema);
- gatherSchemaDirective(xsdSchema, definitionURL);
- }
- }
- }
- }
- }
- Map imports = definition.getImports();
- if (imports != null)
- gatherImportedSchemas(definition,imports);
- }
-
- private final void gatherSchemaDirective(XSDSchema xsdSchema, String xsdSchemaURL)
- {
- if (xsdSchema != null)
- {
- EList xsdSchemaContents = xsdSchema.getContents();
- for (Iterator it = xsdSchemaContents.iterator(); it.hasNext();)
- {
- Object content = it.next();
- if (content instanceof XSDSchemaDirective)
- {
- XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)content;
- StringBuffer xsdSchemaDirectiveURL = new StringBuffer();
- String xsdSchemaDirectiveLocation = xsdSchemaDirective.getSchemaLocation();
- if (xsdSchemaDirectiveLocation != null && xsdSchemaDirectiveLocation.indexOf(':') == -1 && xsdSchemaURL != null && xsdSchemaURL.indexOf(':') != -1)
- {
- // relative URL
- int index = xsdSchemaURL.lastIndexOf('/');
- if (index != -1)
- xsdSchemaDirectiveURL.append(xsdSchemaURL.substring(0, index+1));
- else
- {
- xsdSchemaDirectiveURL.append(xsdSchemaURL);
- xsdSchemaDirectiveURL.append('/');
- }
- }
- xsdSchemaDirectiveURL.append(xsdSchemaDirectiveLocation);
- // resolve schema directive
- XSDSchema resolvedSchema = xsdSchemaDirective.getResolvedSchema();
- if (resolvedSchema == null && xsdSchemaDirectiveURL.length() > 0)
- resolvedSchema = getSchema(xsdSchemaDirectiveURL.toString());
- if (resolvedSchema != null)
- {
- if(!checkSchemaURI(xsdSchemaDirectiveURL.toString())){
- schemaList_.addElement(resolvedSchema);
- gatherSchemaDirective(resolvedSchema, xsdSchemaDirectiveURL.toString());
- }
- }
- }
- }
- }
- }
-
- private boolean checkSchemaURI(String schemaURI){
- boolean found = false;
-
-
- schemaURI = normalize(schemaURI);
- if(schemaURI.equals(normalize(wsdlUrl_)))return false;
- Enumeration e = schemaURI_.elements();
- while(e.hasMoreElements()){
- String uri = (String)e.nextElement();
- if(schemaURI.equals(uri)){
- found = true;
- break;
- }
- }
-
- if (!found){
- schemaURI_.addElement(schemaURI);
- }
- return found;
-
- }
-
- private String normalize(String uri )
- {
- try {
- String encodedURI = URIEncoder.encode(uri,"UTF-8");
- URI normalizedURI = new URI(encodedURI);
- normalizedURI = normalizedURI.normalize();
- return normalizedURI.toString();
- } catch (URISyntaxException e) {
- return uri;
- } catch (UnsupportedEncodingException e) {
- return uri;
- }
- }
-
- private final boolean isW3SchemaElementType(QName qname)
- {
- for (int i=0;i<w3SchemaQNameList_.size();i++)
- {
- QName w3SchemaQName = (QName)w3SchemaQNameList_.elementAt(i);
- if (w3SchemaQName.equals(qname))
- return true;
- }
- return false;
- }
-
- private final void gatherImportedSchemas(Definition definition,Map imports)
- {
- for (Iterator iterator = imports.keySet().iterator();iterator.hasNext();)
- {
- List importList = (List)imports.get(iterator.next());
- for (int i=0;i<importList.size();i++)
- {
- Import imp = (Import)importList.get(i);
- StringBuffer locURI = new StringBuffer(imp.getLocationURI());
- if (!Validator.validateURL(locURI.toString()))
- {
- String base = definition.getDocumentBaseURI();
- locURI.insert(0,base.substring(0,base.lastIndexOf('/')+1));
- }
- try
- {
- Definition importDef = loadWSDL(locURI.toString());
- gatherSchemas(importDef, locURI.toString());
- }
- catch (WSDLException e)
- {
- // May be an XSD file.
- gatherSchema(locURI.toString());
- }
- }
- }
- }
-
- private final void gatherSchema(String locURI)
- {
- XSDSchema xsdSchema = getSchema(locURI);
- if (xsdSchema != null)
- {
- schemaList_.addElement(xsdSchema);
- gatherSchemaDirective(xsdSchema, locURI);
- }
- }
-
- private final XSDSchema getSchema(String locURI)
- {
- XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(locURI);
- if (xsdSchema == null)
- {
- XSDParser p = new XSDParser();
- InputStream is = NetUtils.getURLInputStream(locURI);
- if (is != null)
- {
- p.parse(is);
- xsdSchema = p.getSchema();
- }
- }
- return xsdSchema;
- }
-
- public void setDefinition(Definition definition)
- {
- definition_ = definition;
- }
-
- public Definition getDefinition()
- {
- return definition_;
- }
-
- public void buildModel() {
- if (definition_ != null) {
- Map services = new HashMap(definition_.getServices());
- WSDLServiceElement[] wsdlServiceElements = new WSDLServiceElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_SERVICE)];
- Enumeration e = getElements(WSDLModelConstants.REL_WSDL_SERVICE);
- for (int i = 0; i < wsdlServiceElements.length; i++) {
- wsdlServiceElements[i] = (WSDLServiceElement)e.nextElement();
- }
- for (int j = 0; j < wsdlServiceElements.length; j++) {
- QName qname = wsdlServiceElements[j].getService().getQName();
- Service service = (Service)services.get(qname);
- if (service != null) {
- services.remove(qname);
- wsdlServiceElements[j].setService(service);
- wsdlServiceElements[j].buildModel();
- }
- else
- disconnect(wsdlServiceElements[j], WSDLModelConstants.REL_WSDL_SERVICE);
- }
- for (Iterator it = services.values().iterator();it.hasNext();) {
- Service service = (Service)it.next();
- WSDLServiceElement wsdlServiceElement = new WSDLServiceElement(service.getQName().getLocalPart(), getModel(), service);
- connect(wsdlServiceElement,WSDLModelConstants.REL_WSDL_SERVICE,ModelConstants.REL_OWNER);
- wsdlServiceElement.buildModel();
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
deleted file mode 100644
index 147334da0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20071024 206556 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.TransportProviderRegistry;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPHeaderWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider;
-import org.eclipse.wst.ws.internal.explorer.transport.MessageContext;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.xsd.XSDNamedComponent;
-
-public class WSDLOperationElement extends WSDLCommonElement
-{
- public static final int OPERATION_TYPE_SOAP = 0;
- public static final int OPERATION_TYPE_HTTP_GET = 1;
- public static final int OPERATION_TYPE_HTTP_POST = 2;
-
- private int operationType_;
- private Operation operation_;
- private WSDLPartsToXSDTypeMapper wsdlPartsToXsdTypeMapper_;
- private XSDToFragmentController fragController_;
- private boolean isDocumentStyle_;
- private boolean isUseLiteral_;
- private String soapAction_;
- private String encodingStyle_;
- private String encodingNamespace_;
-
- private Map headerCache;
-
- private MessageContext messageContext = null;
- private ISOAPTransportProvider soapTransportProvider = null;
-
- private final void gatherSoapInformation(WSDLBindingElement bindingElement,SOAPBinding soapBinding)
- {
- // Initialize defaults.
- isDocumentStyle_ = true;
- soapAction_ = "";
- isUseLiteral_ = true;
- encodingStyle_ = null;
- encodingNamespace_ = null;
-
- if (soapBinding != null)
- isDocumentStyle_ = "document".equals(soapBinding.getStyle());
- BindingOperation bindingOperation = getBindingOperation(bindingElement);
- SOAPOperation soapOperation = null;
-
- for (Iterator i = bindingOperation.getExtensibilityElements().iterator();i.hasNext();)
- {
- ExtensibilityElement e = (ExtensibilityElement)i.next();
- if (e instanceof SOAPOperation)
- {
- soapOperation = (SOAPOperation)e;
- soapAction_ = soapOperation.getSoapActionURI();
- if(soapAction_ == null) soapAction_ = "";
-
- String style = soapOperation.getStyle();
- if (style != null)
- isDocumentStyle_ = style.equals("document");
- break;
- }
- }
-
- BindingInput bindingInput = bindingOperation.getBindingInput();
- SOAPBody soapBody = null;
- for (Iterator i = bindingInput.getExtensibilityElements().iterator();i.hasNext();)
- {
- ExtensibilityElement e = (ExtensibilityElement)i.next();
- if (e instanceof SOAPBody)
- {
- soapBody = (SOAPBody)e;
- isUseLiteral_ = "literal".equals(soapBody.getUse());
- if (!isUseLiteral_)
- {
- // Encoded.
- for (Iterator j = soapBody.getEncodingStyles().iterator();j.hasNext();)
- {
- encodingStyle_ = (String)j.next();
- encodingNamespace_ = soapBody.getNamespaceURI();
- break;
- }
- }
- break;
- }
- }
- }
-
- public WSDLOperationElement(String name,WSDLBindingElement bindingElement,Operation operation)
- {
- super(name, bindingElement.getModel());
- // Set the default operation type to be SOAP.
- setOperation(bindingElement,operation);
- }
-
- private Definition getDefinition(WSDLBindingElement bindingElement) {
- WSDLServiceElement serviceElement = (WSDLServiceElement) bindingElement.getParentElement();
- WSDLElement wsdlElement = (WSDLElement) serviceElement.getParentElement();
- return wsdlElement.getDefinition();
- }
-
- private void setMessageContext(WSDLBindingElement bindingElement) {
- messageContext = new MessageContext();
- messageContext.setDefinition(getDefinition(bindingElement));
- messageContext.setBindingOperation(getBindingOperation(bindingElement));
- messageContext.setBindingProtocol(bindingElement.getBindingExtensibilityElement());
- messageContext.setDocumentStyle(isDocumentStyle_);
- }
-
- public MessageContext getMessageContext() {
- return messageContext;
- }
-
- private void setSOAPTransportProvider(SOAPBinding soapBinding) {
-
- String namespaceURI = soapBinding.getElementType().getNamespaceURI();
- String transportURI = soapBinding.getTransportURI();
-
- soapTransportProvider = TransportProviderRegistry.getInstance()
- .getSOAPTransportProvider(namespaceURI, transportURI);
- }
-
- public ISOAPTransportProvider getSOAPTransportProvider() {
- return soapTransportProvider;
- }
-
- public void setOperation(WSDLBindingElement bindingElement,Operation operation) {
- operation_ = operation;
- setDocumentation(operation.getDocumentationElement());
- fragController_ = null;
- wsdlPartsToXsdTypeMapper_ = null;
- operationType_ = bindingElement.getBindingType();
- ExtensibilityElement bindingExtensibilityElement = bindingElement.getBindingExtensibilityElement();
- switch (operationType_)
- {
- case BindingTypes.SOAP:
- gatherSoapInformation(bindingElement,(SOAPBinding)bindingExtensibilityElement);
- setMessageContext(bindingElement);
- setSOAPTransportProvider((SOAPBinding) bindingExtensibilityElement);
- headerCache = new Hashtable();
- case BindingTypes.HTTP_GET:
- case BindingTypes.HTTP_POST:
- default:
- break;
- }
- }
-
- public Operation getOperation() {
- return operation_;
- }
-
- public BindingOperation getBindingOperation()
- {
- return getBindingOperation((WSDLBindingElement)getParentElement());
- }
-
- private BindingOperation getBindingOperation(WSDLBindingElement bindingElement)
- {
- Binding binding = bindingElement.getBinding();
- String operationInputName = null;
- String operationOutputName = null;
- Input operationInput = operation_.getInput();
- Output operationOutput = operation_.getOutput();
- if (operationInput != null)
- operationInputName = operationInput.getName();
- if (operationOutput != null)
- operationOutputName = operationOutput.getName();
- BindingOperation bindingOperation = binding.getBindingOperation(operation_.getName(),operationInputName,operationOutputName);
- if (bindingOperation == null)
- bindingOperation = binding.getBindingOperation(operation_.getName(),null,null);
- return bindingOperation;
- }
-
- /**
- * Return a list of input headers.
- *
- * @return A List
- */
- public List getSOAPHeaders() {
- return getSOAPHeaders(true);
- }
-
- /**
- * Return a list of headers.
- *
- * @param isInput If true, returns the input headers. If false, returns the output headers.
- * @return A List
- */
- public List getSOAPHeaders(boolean isInput) {
- List headers = new Vector();
-
- BindingOperation bindingOperation = getBindingOperation();
- List extensibilityElements = isInput ?
- bindingOperation.getBindingInput().getExtensibilityElements() :
- bindingOperation.getBindingOutput().getExtensibilityElements();
-
- for (Iterator it = extensibilityElements.iterator(); it.hasNext();) {
-
- ExtensibilityElement e = (ExtensibilityElement) it.next();
-
- if (e instanceof SOAPHeader && !headers.contains(e))
- headers.add(e);
- }
-
- return headers;
- }
-
- public List getOrderedBodyParts()
- {
- List parts = new Vector(operation_.getInput().getMessage().getOrderedParts(operation_.getParameterOrdering()));
- BindingOperation bindingOperation = getBindingOperation();
- BindingInput bindingInput = bindingOperation.getBindingInput();
- for (Iterator it = bindingInput.getExtensibilityElements().iterator(); it.hasNext();)
- {
- ExtensibilityElement e = (ExtensibilityElement)it.next();
- if (e instanceof SOAPBody)
- {
- SOAPBody soapBody = (SOAPBody)e;
- List bodyParts = soapBody.getParts();
- if (bodyParts != null)
- {
- for (int i = 0; i < parts.size(); i++)
- {
- Part part = (Part)parts.get(i);
- if (!bodyParts.contains(part) && !bodyParts.contains(part.getName()))
- {
- parts.remove(i);
- i--;
- }
- }
- }
- break;
- }
- }
- return parts;
- }
-
- private XSDToFragmentController getXSDToFragmentController() {
- if (fragController_ == null) {
- fragController_ = new XSDToFragmentController();
- fragController_.setWSDLPartsToXSDTypeMapper(wsdlPartsToXsdTypeMapper_);
- }
- return fragController_;
- }
-
- private XSDNamedComponent getSchema(Part part, String id) {
- if (wsdlPartsToXsdTypeMapper_ == null) {
- wsdlPartsToXsdTypeMapper_ = new WSDLPartsToXSDTypeMapper();
- WSDLBindingElement bindingElement = (WSDLBindingElement)getParentElement();
- WSDLServiceElement serviceElement = (WSDLServiceElement)bindingElement.getParentElement();
- WSDLElement wsdlElement = (WSDLElement)serviceElement.getParentElement();
- wsdlPartsToXsdTypeMapper_.addSchemas(wsdlElement.getSchemaList());
- }
- return wsdlPartsToXsdTypeMapper_.getXSDType(part, id);
- }
-
- public IXSDFragment getHeaderFragment(SOAPHeader soapHeader) {
- return getHeaderFragment(soapHeader, true);
- }
-
- public IXSDFragment getHeaderFragment(SOAPHeader soapHeader, boolean isInput) {
- StringBuffer id = new StringBuffer();
- Part part = soapHeader.getEPart();
- if (isInput)
- id.append(FragmentConstants.INPUT_ID).append(soapHeader.getMessage()).append(FragmentConstants.PART_TOKEN);
- else
- id.append(FragmentConstants.OUTPUT_ID).append(soapHeader.getMessage()).append(FragmentConstants.PART_TOKEN);
-
- return getFragment(part, id, true, isInput); // only wrap input header fragments
- }
-
- public IXSDFragment getFragment(Part part) {
- return getFragment(part, true);
- }
-
- public IXSDFragment getFragment(Part part, boolean isInput) {
- StringBuffer id = new StringBuffer();
- if (isInput)
- id.append(FragmentConstants.INPUT_ID);
- else
- id.append(FragmentConstants.OUTPUT_ID);
-
- return getFragment(part, id, false, false);
- }
-
- private IXSDFragment getFragment(Part part, StringBuffer id, boolean isHeader, boolean useSOAPHeaderWrapper) {
- String partName = part.getName();
- id.append(partName);
- XSDToFragmentConfiguration config = new XSDToFragmentConfiguration();
- config.setIsWSDLPart(true);
- config.setWSDLPartName(partName);
- config.setXSDComponent(getSchema(part, id.toString()));
- if (isDocumentStyle() || isHeader)
- config.setStyle(FragmentConstants.STYLE_DOCUMENT);
- else
- config.setStyle(FragmentConstants.STYLE_RPC);
- if (operationType_ == BindingTypes.SOAP)
- {
- if (!isUseLiteral_)
- config.setPartEncoding(FragmentConstants.ENCODING_SOAP);
- }
- else
- config.setPartEncoding(FragmentConstants.ENCODING_URL);
- IXSDFragment fragment = getXSDToFragmentController().getFragment(config, id.toString(), part.getName());
-
- // let's see if there's a corresponding wrapper for this fragment
- if (useSOAPHeaderWrapper && !(fragment instanceof SOAPHeaderWrapperFragment)) {
- SOAPHeaderWrapperFragment wrapper = (SOAPHeaderWrapperFragment) headerCache.get(fragment.getID());
-
- // no wrapper, let's wrap it
- if (wrapper == null) {
- wrapper = new SOAPHeaderWrapperFragment(fragment);
- headerCache.put(fragment.getID(), wrapper);
-
- // also put this wrapper fragment in the master cache
- getXSDToFragmentController().addToCache(wrapper.getID(), wrapper);
- }
-
- return wrapper;
- }
-
- return fragment;
- }
-
- public IXSDFragment getFragmentByID(String id) {
- return getXSDToFragmentController().getCachedFragment(id);
- }
-
- public void removeAllFragment() {
- getXSDToFragmentController().emptyCache();
- }
-
- public boolean isDocumentStyle()
- {
- return isDocumentStyle_;
- }
-
- public String getSoapAction()
- {
- return soapAction_;
- }
-
- public boolean isUseLiteral()
- {
- return isUseLiteral_;
- }
-
- public String getEncodingStyle()
- {
- return encodingStyle_;
- }
-
- public String getEncodingNamespace()
- {
- return encodingNamespace_;
- }
-
- public int getOperationType()
- {
- return operationType_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java
deleted file mode 100644
index 1b9ad8ab8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.wsdl.Binding;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-public class WSDLServiceElement extends WSDLCommonElement
-{
-
- private Service service_;
-
- public WSDLServiceElement(String name, Model model, Service service)
- {
- super(name, model);
- setService(service);
- }
-
- public void setService(Service service) {
- service_ = service;
- setDocumentation(service.getDocumentationElement());
- }
-
- public Service getService() {
- return service_;
- }
-
- public String getAddressLocation(Binding binding)
- {
- Map ports = service_.getPorts();
- for (Iterator i = ports.values().iterator();i.hasNext();)
- {
- Port port = (Port)i.next();
- if (port.getBinding().getQName().equals(binding.getQName()))
- {
- List extensibilityElements = port.getExtensibilityElements();
- for (Iterator j = extensibilityElements.iterator();j.hasNext();)
- {
- ExtensibilityElement element = (ExtensibilityElement)j.next();
- if (element instanceof SOAPAddress)
- {
- SOAPAddress soapAddress = (SOAPAddress)element;
- return soapAddress.getLocationURI();
- }
- else if (element instanceof HTTPAddress)
- {
- HTTPAddress httpAddress = (HTTPAddress)element;
- return httpAddress.getLocationURI();
- }
- }
- }
- }
- return null;
- }
-
- public void buildModel() {
- if (service_ != null) {
- Map ports = service_.getPorts();
- Map bindings = new HashMap();
- for (Iterator it = ports.values().iterator();it.hasNext();) {
- Port port = (Port)it.next();
- Binding binding = port.getBinding();
- if (binding.getPortType() == null)
- continue;
- else
- bindings.put(binding.getQName(), binding);
- }
- WSDLBindingElement[] wsdlBindingElements = new WSDLBindingElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_BINDING)];
- Enumeration e = getElements(WSDLModelConstants.REL_WSDL_BINDING);
- for (int i = 0; i < wsdlBindingElements.length; i++) {
- wsdlBindingElements[i] = (WSDLBindingElement)e.nextElement();
- }
- for (int j = 0; j < wsdlBindingElements.length; j++) {
- QName qname = wsdlBindingElements[j].getBinding().getQName();
- Binding binding = (Binding)bindings.get(qname);
- if (binding != null) {
- bindings.remove(qname);
- wsdlBindingElements[j].setBinding(binding);
- wsdlBindingElements[j].buildModel();
- }
- else
- disconnect(wsdlBindingElements[j], WSDLModelConstants.REL_WSDL_BINDING);
- }
- for (Iterator it = bindings.values().iterator();it.hasNext();) {
- Binding binding = (Binding)it.next();
- WSDLBindingElement wsdlBindingElement = new WSDLBindingElement(binding.getQName().getLocalPart(), getModel(), binding);
- connect(wsdlBindingElement,WSDLModelConstants.REL_WSDL_BINDING,ModelConstants.REL_OWNER);
- wsdlBindingElement.buildModel();
- }
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java
deleted file mode 100644
index ede280c73..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public interface IFragment {
- public void setID(String id);
- public String getID();
-
- public void setName(String name);
- public String getName();
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException;
-
- public void setParameterValues(String paramKey, String[] params);
- public void setParameterValues(String paramKey, Vector params);
- public String[] getParameterValues(String paramKey);
- public String getParameterValue(String paramKey, int paramIndex);
-
- public boolean validateAllParameterValues();
- public boolean validateParameterValues(String paramKey);
- public boolean validateParameterValue(String paramKey, int paramIndex);
-
- public String getInformationFragment();
- public String getWriteFragment();
- public String getReadFragment();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java
deleted file mode 100644
index 1efa6dfcf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface ISOAPEncArrayFragment extends IXSDGroupSeqFragment {
- public String createSOAPEncArrayInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java
deleted file mode 100644
index 58650cee6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Hashtable;
-
-public interface ISOAPEncodingWrapperFragment extends IXSDDelegationFragment
-{
- public void setURIReferences(Hashtable uriReferences);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDAttributeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDAttributeFragment.java
deleted file mode 100644
index 88f23ce07..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDAttributeFragment.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/src/com/ibm/etools/webservice/explorer/wsdl/fragment/IXSDElementFragment.java, wsa.etools.ws.explorer, lunar-5.1.2, 20031231a 1
-* Version 1.1 03/02/28 15:26:05
-*/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDAttributeFragment extends IXSDDelegationFragment {
-
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java
deleted file mode 100644
index 261ffc34a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDComplexFragment extends IXSDMapFragment {
- public String createComplexInstance();
- public IXSDAttributeFragment[] getAllAttributeFragments();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java
deleted file mode 100644
index 635535525..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDDelegationFragment extends IXSDFragment {
- public void setXSDDelegationFragment(IXSDFragment xsdFragment);
- public IXSDFragment getXSDDelegationFragment();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java
deleted file mode 100644
index e8cae7f79..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDElementFragment extends IXSDDelegationFragment {
- public static String NIL = "nilValue";
- public static String NIL_VALUE = "nil";
-
- public int getMinOccurs();
- public int getMaxOccurs();
- public boolean isNillable();
- public String getNilID();
- public boolean isNil();
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java
deleted file mode 100644
index e8a55534a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Hashtable;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-
-
-public interface IXSDFragment extends IFragment {
- public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config);
- public XSDToFragmentConfiguration getXSDToFragmentConfiguration();
-
- public void setXSDTypeDefinition(XSDTypeDefinition typeDef);
- public XSDTypeDefinition getXSDTypeDefinition();
- public Element setAttributesOnInstanceDocuments(Element instanceDocument,String name);
- public boolean setAttributeParamsFromInstanceDocuments (Node attribute);
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments);
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc);
-
- public String genID();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java
deleted file mode 100644
index f2aee58e4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDGroupAllFragment extends IXSDGroupFragment {
- public String getGroupAllInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java
deleted file mode 100644
index e410929ae..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDParticle;
-
-public interface IXSDGroupChoiceFragment extends IXSDGroupFragment {
- public XSDParticle[] getChoices();
- public String createGroupChoiceInstance(int choiceIndex);
- public int getChoiceIndex(String groupID);
- public void setChoiceIndex(String groupID, int choiceIndex);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java
deleted file mode 100644
index 444483841..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDModelGroup;
-
-public interface IXSDGroupFragment extends IXSDMapFragment {
- public void setXSDModelGroup(XSDModelGroup xsdModelGroup);
- public XSDModelGroup getXSDModelGroup();
-
- public String[] getGroupIDs();
- public String[] getGroupMemberIDs(String groupID);
- public IXSDFragment[] getGroupMemberFragments(String groupID);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java
deleted file mode 100644
index df58faad0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDGroupSeqFragment extends IXSDGroupFragment {
- public String createGroupSeqInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java
deleted file mode 100644
index 551e40146..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDMapFragment extends IXSDFragment {
- public void setXSDToFragmentController(XSDToFragmentController controller);
- public XSDToFragmentController getXSDToFragmentController();
-
- public String createInstance();
-
- public String[] getFragmentsOrder();
- public IXSDFragment getFragment(String id);
- public IXSDFragment[] getFragments(String[] ids);
- public IXSDFragment[] getAllFragments();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java
deleted file mode 100644
index c658d5d3d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDSimpleAtomicFragment extends IXSDFragment {
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java
deleted file mode 100644
index 2ab380895..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDSimpleListFragment extends IXSDMapFragment {
- public String createListInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java
deleted file mode 100644
index c7dcad92f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public interface IXSDSimpleUnionFragment extends IXSDMapFragment {
- public XSDSimpleTypeDefinition[] getMemberTypeDefinitions();
- public String createUnionInstance(int memberTypeIndex);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDAttributeUseToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDAttributeUseToFragmentMapper.java
deleted file mode 100644
index abe10ed1f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDAttributeUseToFragmentMapper.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/src/com/ibm/etools/webservice/explorer/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java, wsa.etools.ws.explorer, lunar-5.1.2, 20031231a 2
-* Version 1.2 03/06/05 14:17:44
-*/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class XSDAttributeUseToFragmentMapper extends XSDToFragmentMapper {
- public XSDAttributeUseToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- XSDAttributeUse attribute = (XSDAttributeUse)config.getXSDComponent();
- if (attribute != null && attribute.getAttributeDeclaration() != null) {
- XSDAttributeDeclaration resolvedAttribute = resolveXSDAttributeDeclaration(attribute.getAttributeDeclaration());
- XSDTypeDefinition typeDef = getXSDTypeDefinition(resolvedAttribute);
- IXSDAttributeFragment attributeFrag = new XSDAttributeFragment(id, resolvedAttribute.getName(), config);
- attributeFrag.setXSDTypeDefinition(typeDef);
- XSDToFragmentConfiguration attributeTypeConfig = new XSDToFragmentConfiguration();
- attributeTypeConfig.setXSDComponent(typeDef);
- attributeTypeConfig.setStyle(config.getStyle());
- attributeTypeConfig.setPartEncoding(config.getPartEncoding());
- attributeTypeConfig.setWSDLPartName(config.getWSDLPartName());
- IXSDFragment xsdFragment = getController().getFragment(attributeTypeConfig, attributeFrag.genID(), resolvedAttribute.getName());
- attributeFrag.setXSDDelegationFragment(xsdFragment);
- return attributeFrag;
- }
- return getXSDDefaultFragment(config, id, name);
- }
-
- private XSDAttributeDeclaration resolveXSDAttributeDeclaration(XSDAttributeDeclaration attribute) {
- // port to org.eclipse.xsd
- if (attribute.getResolvedAttributeDeclaration() != null)
- {
- XSDAttributeDeclaration resolvedAttribute = attribute.getResolvedAttributeDeclaration();
- if (!isComponentResolvable(resolvedAttribute))
- {
- XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent(resolvedAttribute);
- if (resolvedComponent != null && (resolvedComponent instanceof XSDAttributeDeclaration))
- resolvedAttribute = (XSDAttributeDeclaration)resolvedComponent;
- }
- return resolvedAttribute;
- }
- else
- return attribute;
- }
-
- private XSDTypeDefinition getXSDTypeDefinition(XSDAttributeDeclaration attribute) {
- // port to org.eclipse.xsd
- if (attribute.getTypeDefinition() != null)
- return attribute.getTypeDefinition();
- // port to org.eclipse.xsd
- else if (attribute.getAnonymousTypeDefinition() != null)
- return attribute.getAnonymousTypeDefinition();
- else
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java
deleted file mode 100644
index 4d89a285f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexSimpleContentFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDComplexSimpleContentRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDContentTypeCategory;
-
-public class XSDComplexTypeToFragmentMapper extends XSDToFragmentMapper {
- public XSDComplexTypeToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)config.getXSDComponent();
- int category = complexType.getContentTypeCategory().getValue();
- if (complexType != null && complexType.isMixed())
- return getXSDDefaultFragment(config, id, name);
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent != null)
- return getXSDComplexFragment(category,config, id, name);
- else
- return getXSDEmptyFragment(config, id, name);
- }
-
- private IXSDFragment getXSDComplexFragment(int category,XSDToFragmentConfiguration config, String id, String name) {
- int minOccurs = config.getMinOccurs();
- int maxOccurs = config.getMaxOccurs();
- if (minOccurs == maxOccurs)
- if(category == XSDContentTypeCategory.SIMPLE){
- return new XSDComplexSimpleContentFixFragment(id, name, config, getController());
-
- }
- else
- return new XSDComplexFixFragment(id, name, config, getController());
- else
- if(category == XSDContentTypeCategory.SIMPLE)
- return new XSDComplexSimpleContentRangeFragment(id, name, config, getController());
- else
- return new XSDComplexRangeFragment(id, name, config, getController());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java
deleted file mode 100644
index 7f4d6a0d1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070404 181065 makandre@ca.ibm.com - Andrew Mak, WSE does not handle types referenced across inline schemas
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDElementFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-
-public class XSDElementDeclarationToFragmentMapper extends XSDToFragmentMapper {
- public XSDElementDeclarationToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- XSDElementDeclaration element = (XSDElementDeclaration)config.getXSDComponent();
- if (element != null) {
- XSDElementDeclaration resolvedElement = resolveXSDElementDeclaration(element);
- XSDTypeDefinition typeDef = resolveXSDTypeDefinition(getXSDTypeDefinition(resolvedElement));
- if (typeDef != null) {
- int minOccurs = FragmentConstants.DEFAULT_MIN_OCCURS;
- int maxOccurs = FragmentConstants.DEFAULT_MAX_OCCURS;
- XSDConcreteComponent concreteComponent = element.getContainer();
- if (concreteComponent != null && concreteComponent instanceof XSDParticle) {
- XSDParticle particle = (XSDParticle)concreteComponent;
- if (particle.isSetMinOccurs())
- minOccurs = particle.getMinOccurs();
- if (particle.isSetMaxOccurs())
- maxOccurs = particle.getMaxOccurs();
- }
- config.setMinOccurs(minOccurs);
- config.setMaxOccurs(maxOccurs);
- IXSDElementFragment elementFrag = new XSDElementFragment(id, resolvedElement.getName(), config);
- elementFrag.setXSDTypeDefinition(typeDef);
- XSDToFragmentConfiguration elementTypeConfig = new XSDToFragmentConfiguration();
- elementTypeConfig.setXSDComponent(typeDef);
- elementTypeConfig.setMinOccurs(minOccurs);
- elementTypeConfig.setMaxOccurs(maxOccurs);
- elementTypeConfig.setStyle(config.getStyle());
- elementTypeConfig.setPartEncoding(config.getPartEncoding());
- elementTypeConfig.setWSDLPartName(config.getWSDLPartName());
- IXSDFragment xsdFragment = getController().getFragment(elementTypeConfig, elementFrag.genID(), resolvedElement.getName());
- elementFrag.setXSDDelegationFragment(xsdFragment);
- return elementFrag;
- }
- }
- return getXSDDefaultFragment(config, id, name);
- }
-
- private XSDElementDeclaration resolveXSDElementDeclaration(XSDElementDeclaration element) {
- // port to org.eclipse.xsd
- if (element.getResolvedElementDeclaration() != null)
- {
- XSDElementDeclaration resolvedElement = element.getResolvedElementDeclaration();
- if (!isComponentResolvable(resolvedElement))
- {
- XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent(resolvedElement);
- if (resolvedComponent != null && (resolvedComponent instanceof XSDElementDeclaration))
- resolvedElement = (XSDElementDeclaration)resolvedComponent;
- }
- return resolvedElement;
- }
- else
- return element;
- }
-
- private XSDTypeDefinition resolveXSDTypeDefinition(XSDTypeDefinition typeDef) {
-
- if (!isComponentResolvable(typeDef)) {
- XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent(typeDef);
- if (resolvedComponent instanceof XSDTypeDefinition)
- return (XSDTypeDefinition) resolvedComponent;
- }
-
- return typeDef;
- }
-
- private XSDTypeDefinition getXSDTypeDefinition(XSDElementDeclaration element) {
- // port to org.eclipse.xsd
- if (element.getTypeDefinition() != null)
- return element.getTypeDefinition();
- // port to org.eclipse.xsd
- else if (element.getAnonymousTypeDefinition() != null)
- return element.getAnonymousTypeDefinition();
- else
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java
deleted file mode 100644
index 6402d9ce8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class XSDLiteralXMLEncodingToFragmentMapper extends XSDToFragmentMapper {
- private XSDSimpleTypeToFragmentMapper xsdSimpleMapper_;
- private XSDComplexTypeToFragmentMapper xsdComplexMapper_;
- private XSDElementDeclarationToFragmentMapper xsdElementMapper_;
- private XSDAttributeUseToFragmentMapper xsdAttributeMapper_;
- private XSDParticleToFragmentMapper xsdParticleMapper_;
-
- public XSDLiteralXMLEncodingToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- xsdSimpleMapper_ = null;
- xsdComplexMapper_ = null;
- xsdElementMapper_ = null;
- xsdAttributeMapper_ = null;
- xsdParticleMapper_= null;
- }
-
- private XSDSimpleTypeToFragmentMapper getXSDSimpleMapper() {
- if (xsdSimpleMapper_ == null)
- xsdSimpleMapper_ = new XSDSimpleTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdSimpleMapper_;
- }
-
- private XSDComplexTypeToFragmentMapper getXSDComplexMapper() {
- if (xsdComplexMapper_ == null)
- xsdComplexMapper_ = new XSDComplexTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdComplexMapper_;
- }
-
- private XSDElementDeclarationToFragmentMapper getXSDElementMapper() {
- if (xsdElementMapper_ == null)
- xsdElementMapper_ = new XSDElementDeclarationToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdElementMapper_;
- }
-
- private XSDAttributeUseToFragmentMapper getXSDAttributeMapper() {
- if (xsdAttributeMapper_ == null)
- xsdAttributeMapper_ = new XSDAttributeUseToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdAttributeMapper_;
- }
-
- private XSDParticleToFragmentMapper getXSDParticleMapper() {
- if (xsdParticleMapper_ == null)
- xsdParticleMapper_ = new XSDParticleToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdParticleMapper_;
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- config = resolveXSDComponent(config);
- XSDComponent component = config.getXSDComponent();
- if (!isComponentResolvable(component))
- return getXSDDefaultFragment(config, id, name);
- else if (component instanceof XSDElementDeclaration)
- return getXSDElementMapper().getFragment(config, id, name);
- else if (component instanceof XSDSimpleTypeDefinition)
- return getXSDSimpleMapper().getFragment(config, id, name);
- else if (component instanceof XSDComplexTypeDefinition)
- return getXSDComplexMapper().getFragment(config, id, name);
- else if (component instanceof XSDParticle)
- return getXSDParticleMapper().getFragment(config, id, name);
- else if (component instanceof XSDParticleContent)
- return getXSDParticleMapper().getFragment(config, id, name);
- else if (component instanceof XSDAttributeUse)
- return getXSDAttributeMapper().getFragment(config, id, name);
- else
- return getXSDDefaultFragment(config, id, name);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java
deleted file mode 100644
index 64c67940e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupAllFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupChoiceFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupChoiceRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupSeqFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDGroupSeqRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDWildcard;
-
-
-public class XSDParticleToFragmentMapper extends XSDToFragmentMapper {
- public XSDParticleToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- XSDComponent component = config.getXSDComponent();
- XSDParticleContent xsdParticleContent;
- if (component instanceof XSDParticle)
- xsdParticleContent = ((XSDParticle)component).getContent();
- else if (component instanceof XSDParticleContent)
- xsdParticleContent = (XSDParticleContent)component;
- else
- xsdParticleContent = null;
- if (xsdParticleContent != null) {
- if (xsdParticleContent instanceof XSDModelGroupDefinition)
- return getXSDModelGroupDefFragment(config, id, name, (XSDModelGroupDefinition)xsdParticleContent);
- else if (xsdParticleContent instanceof XSDModelGroup)
- return getXSDModelGroupFragment(config, id, name, (XSDModelGroup)xsdParticleContent);
- else if (xsdParticleContent instanceof XSDWildcard)
- return getXSDWildcardFragment(config, id, name, (XSDWildcard)xsdParticleContent);
- else
- return getXSDDefaultFragment(config, id, name);
- }
- else
- return getXSDDefaultFragment(config, id, name);
- }
-
- private IXSDFragment getXSDModelGroupDefFragment(XSDToFragmentConfiguration config, String id, String name, XSDModelGroupDefinition xsdModelGroupDef) {
- XSDModelGroupDefinition resolvedXSDModelGroupDef = xsdModelGroupDef;
- if (xsdModelGroupDef.isModelGroupDefinitionReference())
- resolvedXSDModelGroupDef = xsdModelGroupDef.getResolvedModelGroupDefinition();
- XSDModelGroup xsdModelGroup = resolvedXSDModelGroupDef.getModelGroup();
- if (xsdModelGroup == null)
- return getXSDDefaultFragment(config, id, name);
- else
- return getXSDModelGroupFragment(config, id, name, xsdModelGroup);
- }
-
- private IXSDFragment getXSDModelGroupFragment(XSDToFragmentConfiguration config, String id, String name, XSDModelGroup xsdModelGroup) {
- int minOccurs = FragmentConstants.DEFAULT_MIN_OCCURS;
- int maxOccurs = FragmentConstants.DEFAULT_MAX_OCCURS;
- XSDConcreteComponent concreteComponent = xsdModelGroup.getContainer();
- if (concreteComponent != null && concreteComponent instanceof XSDParticle) {
- XSDParticle particle = (XSDParticle)concreteComponent;
- if (particle.isSetMinOccurs())
- minOccurs = particle.getMinOccurs();
- if (particle.isSetMaxOccurs())
- maxOccurs = particle.getMaxOccurs();
- }
- config.setMinOccurs(minOccurs);
- config.setMaxOccurs(maxOccurs);
-
- switch (xsdModelGroup.getCompositor().getValue()) {
- case XSDCompositor.SEQUENCE:
- if (minOccurs == maxOccurs)
- return new XSDGroupSeqFixFragment(id, name, config, getController(), xsdModelGroup);
- else
- return new XSDGroupSeqRangeFragment(id, name, config, getController(), xsdModelGroup);
- case XSDCompositor.CHOICE:
- if (minOccurs == maxOccurs)
- return new XSDGroupChoiceFixFragment(id, name, config, getController(), xsdModelGroup);
- else
- return new XSDGroupChoiceRangeFragment(id, name, config, getController(), xsdModelGroup);
- case XSDCompositor.ALL:
- return new XSDGroupAllFragment(id, name, config, getController(), xsdModelGroup);
- default:
- return getXSDDefaultFragment(config, id, name);
- }
- }
-
- private IXSDFragment getXSDWildcardFragment(XSDToFragmentConfiguration config, String id, String name, XSDWildcard xsdParticleContent) {
- return getXSDDefaultFragment(config, id, name);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java
deleted file mode 100644
index e91d19427..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncArrayFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncArrayRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.SOAPEncodingWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDAttributeGroupContent;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-
-public class XSDSOAPEncodingToFragmentMapper extends XSDToFragmentMapper {
- private XSDLiteralXMLEncodingToFragmentMapper xsdLiteralMapper_;
- private XSDComplexTypeToFragmentMapper xsdComplexMapper_;
-
- public XSDSOAPEncodingToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- xsdLiteralMapper_ = null;
- xsdComplexMapper_ = null;
- }
-
- private XSDLiteralXMLEncodingToFragmentMapper getXSDLiteralMapper() {
- if (xsdLiteralMapper_ == null)
- xsdLiteralMapper_ = new XSDLiteralXMLEncodingToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdLiteralMapper_;
- }
-
- private XSDComplexTypeToFragmentMapper getXSDComplexMapper() {
- if (xsdComplexMapper_ == null)
- xsdComplexMapper_ = new XSDComplexTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
- return xsdComplexMapper_;
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- if (config.getIsWSDLPart()) {
- ISOAPEncodingWrapperFragment wrapperFragment = new SOAPEncodingWrapperFragment(id, name, null);
- String delegationFragId = wrapperFragment.genID();
- IXSDFragment delegationFragment = getFragmentDelegate(config, delegationFragId, name);
- wrapperFragment.setXSDDelegationFragment(delegationFragment);
- getController().addToCache(delegationFragId, delegationFragment);
- return wrapperFragment;
- }
- else
- return getFragmentDelegate(config, id, name);
- }
-
- public IXSDFragment getFragmentDelegate(XSDToFragmentConfiguration config, String id, String name) {
- config = resolveXSDComponent(config);
- XSDComponent component = config.getXSDComponent();
- if (!isComponentResolvable(component))
- return getXSDDefaultFragment(config, id, name);
- else if (component instanceof XSDComplexTypeDefinition) {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)component;
- if (XSDTypeDefinitionUtil.isSoapEncArray(complexType))
- return getSOAPEncArrayFragment(config, id, name, complexType);
- else
- return getXSDComplexMapper().getFragment(config, id, name);
- }
- else
- return getXSDLiteralMapper().getFragment(config, id, name);
- }
-
- private IXSDFragment getSOAPEncArrayFragment(XSDToFragmentConfiguration config, String id, String name, XSDComplexTypeDefinition complexType) {
- EList xsdAttrContents = complexType.getAttributeContents();
- for (int i = 0; i < xsdAttrContents.size(); i++) {
- String soapEncArrayTypeNamespaceURI = null;
- String soapEncArrayTypeLocalName = null;
- int soapEncArrayDimension = 0;
- XSDAttributeGroupContent xsdAttrContent = (XSDAttributeGroupContent)xsdAttrContents.get(i);
- Element element = xsdAttrContent.getElement();
- String arrayTypeAttr = element.getAttributeNS(FragmentConstants.URI_WSDL, FragmentConstants.QNAME_LOCAL_NAME_ARRAY_TYPE);
- if (arrayTypeAttr != null && arrayTypeAttr.length() > 0) {
- int colon = arrayTypeAttr.indexOf(FragmentConstants.COLON);
- String nsPrefix = (colon > 0) ? arrayTypeAttr.substring(0, colon) : null;
- soapEncArrayTypeNamespaceURI = (String)xsdAttrContent.getSchema().getQNamePrefixToNamespaceMap().get(nsPrefix);
- int dimensionIndex = arrayTypeAttr.indexOf(FragmentConstants.LEFT_SQUARE_BRACKET);
- soapEncArrayTypeLocalName = arrayTypeAttr.substring(colon + 1, dimensionIndex);
- String dimensionString = arrayTypeAttr.substring(dimensionIndex, arrayTypeAttr.length());
- for (int j = 0; j < dimensionString.length() - 1; j++) {
- if (dimensionString.charAt(j) == FragmentConstants.LEFT_SQUARE_BRACKET.charAt(0) && dimensionString.charAt(j + 1) == FragmentConstants.RIGHT_SQUARE_BRACKET.charAt(0)) {
- soapEncArrayDimension++;
- j++;
- }
- else {
- soapEncArrayDimension = 0;
- break;
- }
- }
- }
- if (soapEncArrayTypeNamespaceURI != null && soapEncArrayTypeLocalName != null && soapEncArrayDimension == 1) {
- XSDComponent soapEncArrayType = getWSDLPartsToXSDTypeMapper().getXSDTypeFromSchema(soapEncArrayTypeNamespaceURI, soapEncArrayTypeLocalName, false);
- if (soapEncArrayType != null && soapEncArrayType instanceof XSDTypeDefinition) {
- XSDModelGroup sequence = null;
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent != null && (complexTypeContent instanceof XSDParticle)) {
- XSDParticleContent xsdParticleContent = ((XSDParticle)complexTypeContent).getContent();
- if (xsdParticleContent instanceof XSDModelGroup)
- sequence = (XSDModelGroup)xsdParticleContent;
- }
- ISOAPEncArrayFragment frag;
- if (config.getMinOccurs() == config.getMaxOccurs())
- frag = new SOAPEncArrayFixFragment(id, name, config, getController(), sequence);
- else
- frag = new SOAPEncArrayRangeFragment(id, name, config, getController(), sequence);
- frag.setXSDTypeDefinition((XSDTypeDefinition)soapEncArrayType);
- return frag;
- }
- }
- }
- return getXSDComplexMapper().getFragment(config, id, name);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java
deleted file mode 100644
index ea97f2444..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicDateTimeFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicDateTimeRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicEnumFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicEnumRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleAtomicRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleListFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleListRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleUnionFixFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDSimpleUnionRangeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDVariety;
-
-public class XSDSimpleTypeToFragmentMapper extends XSDToFragmentMapper {
- public XSDSimpleTypeToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- super(controller, wsdlToXSDMapper);
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)config.getXSDComponent();
- if (simpleType != null && simpleType.getVariety() != null) {
- switch (simpleType.getVariety().getValue()) {
- case XSDVariety.ATOMIC:
- return getXSDSimpleAtomicFragment(config, id, name);
- case XSDVariety.LIST:
- return getXSDSimpleListFragment(config, id, name);
- case XSDVariety.UNION:
- return getXSDSimpleUnionFragment(config, id, name);
- default:
- return getXSDDefaultFragment(config, id, name);
- }
- }
- else
- return getXSDDefaultFragment(config, id, name);
- }
-
- private IXSDFragment getXSDSimpleAtomicFragment(XSDToFragmentConfiguration config, String id, String name) {
- boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
- XSDSimpleTypeDefinition xsdSimpleTypeDef = (XSDSimpleTypeDefinition)config.getXSDComponent();
- XSDSimpleTypeDefinition xsdBaseSimpleTypeDef = (XSDSimpleTypeDefinition)XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(xsdSimpleTypeDef);
- String baseSimpleTypeDefNS = null;
- String baseSimpleTypeDefName = null;
- if (xsdBaseSimpleTypeDef != null)
- {
- baseSimpleTypeDefNS = xsdBaseSimpleTypeDef.getTargetNamespace();
- baseSimpleTypeDefName = xsdBaseSimpleTypeDef.getName();
- }
- boolean isEnum = isSimpleTypeEnumeration(xsdSimpleTypeDef);
- if (FragmentConstants.URI_XSD.equals(baseSimpleTypeDefNS))
- {
- if (baseSimpleTypeDefName.equals("date"))
- return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_DATE,xsdSimpleTypeDef,isEnum,isFixed);
- else if (baseSimpleTypeDefName.equals("dateTime"))
- return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_DATETIME,xsdSimpleTypeDef,isEnum,isFixed);
- else if (baseSimpleTypeDefName.equals("gYearMonth"))
- return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_GYEARMONTH,xsdSimpleTypeDef,isEnum,isFixed);
- else if (baseSimpleTypeDefName.equals("gMonthDay"))
- return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_GMONTHDAY,xsdSimpleTypeDef,isEnum,isFixed);
- else if (baseSimpleTypeDefName.equals("gDay"))
- return getXSDSimpleGDayFragment(id, name, config, xsdSimpleTypeDef,isEnum,isFixed);
- else if (baseSimpleTypeDefName.equals("boolean"))
- return getXSDSimpleBooleanFragment(id, name, config, xsdSimpleTypeDef,isEnum,isFixed);
- }
-
- if (isEnum)
- {
- if (isFixed)
- return new XSDSimpleAtomicEnumFixFragment(id, name, config, xsdSimpleTypeDef.getEnumerationFacets());
- else
- return new XSDSimpleAtomicEnumRangeFragment(id, name, config, xsdSimpleTypeDef.getEnumerationFacets());
- }
- else
- {
- if (isFixed)
- return new XSDSimpleAtomicFixFragment(id, name, config);
- else
- return new XSDSimpleAtomicRangeFragment(id, name, config);
- }
- }
-
- private XSDSimpleAtomicFragment getXSDSimpleDateTimeFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType,XSDSimpleTypeDefinition xsdDateTimeType,boolean isEnum,boolean isFixed)
- {
- if (isEnum)
- {
- if (isFixed)
- return new XSDSimpleAtomicEnumFixFragment(id, name, config, xsdDateTimeType.getEnumerationFacets());
- else
- return new XSDSimpleAtomicEnumRangeFragment(id, name, config, xsdDateTimeType.getEnumerationFacets());
- }
- else
- {
- if (isFixed)
- return new XSDSimpleAtomicDateTimeFixFragment(id, name, config, calendarType);
- else
- return new XSDSimpleAtomicDateTimeRangeFragment(id, name, config, calendarType);
- }
- }
-
- private XSDSimpleAtomicFragment getXSDSimpleGDayFragment(String id, String name, XSDToFragmentConfiguration config, XSDSimpleTypeDefinition xsdDateTimeType,boolean isEnum,boolean isFixed)
- {
- if (isEnum)
- return null;
- OptionVector optionVector = new OptionVector();
- StringBuffer value = new StringBuffer();
- for (int i=1;i<=31;i++)
- {
- value.setLength(0);
- value.append("---");
- if (i<10)
- value.append(0);
- value.append(i);
- optionVector.addOption(String.valueOf(i),value.toString());
- }
- if (isFixed)
- return new XSDSimpleAtomicEnumFixFragment(id, name, config, optionVector);
- else
- return new XSDSimpleAtomicEnumRangeFragment(id, name, config, optionVector);
- }
-
- private XSDSimpleAtomicFragment getXSDSimpleBooleanFragment(String id, String name, XSDToFragmentConfiguration config, XSDSimpleTypeDefinition xsdBooleanType,boolean isEnum,boolean isFixed)
- {
- if (isEnum)
- return null;
- OptionVector optionVector = new OptionVector();
- optionVector.addOption("true","true");
- optionVector.addOption("false","false");
- if (isFixed)
- return new XSDSimpleAtomicEnumFixFragment(id, name, config, optionVector);
- else
- return new XSDSimpleAtomicEnumRangeFragment(id, name, config, optionVector);
- }
-
- private IXSDFragment getXSDSimpleListFragment(XSDToFragmentConfiguration config, String id, String name) {
-
- boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
- if (isFixed)
- return new XSDSimpleListFixFragment(id, name, config, getController());
- else
- return new XSDSimpleListRangeFragment(id, name, config, getController());
- }
-
- private IXSDFragment getXSDSimpleUnionFragment(XSDToFragmentConfiguration config, String id, String name) {
-
- boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
- if (isFixed)
- return new XSDSimpleUnionFixFragment(id, name, config, getController());
- else
- return new XSDSimpleUnionRangeFragment(id, name, config, getController());
- }
-
- private boolean isSimpleTypeEnumeration(XSDSimpleTypeDefinition simpleType) {
- EList e = simpleType.getEnumerationFacets();
- return (e != null && e.size() > 0);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java
deleted file mode 100644
index dc3250d9a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.xsd.XSDComponent;
-
-public class XSDToFragmentConfiguration {
- private XSDComponent component_;
- private int minOccurs_;
- private int maxOccurs_;
- private int style_;
- private int partEncoding_;
- private boolean isWSDLPart_;
- private String wsdlPartName_;
-
- public XSDToFragmentConfiguration() {
- component_ = null;
- minOccurs_ = FragmentConstants.DEFAULT_MIN_OCCURS;
- maxOccurs_ = FragmentConstants.DEFAULT_MAX_OCCURS;
- style_ = FragmentConstants.STYLE_DOCUMENT;
- partEncoding_ = FragmentConstants.ENCODING_LITERAL;
- isWSDLPart_ = false;
- wsdlPartName_ = null;
- }
-
- public void setXSDComponent(XSDComponent component) {
- component_ = component;
- }
-
- public XSDComponent getXSDComponent() {
- return component_;
- }
-
- public void setMinOccurs(int minOccurs) {
- minOccurs_ = minOccurs;
- }
-
- public int getMinOccurs() {
- return minOccurs_;
- }
-
- public void setMaxOccurs(int maxOccurs) {
- maxOccurs_ = maxOccurs;
- }
-
- public int getMaxOccurs() {
- return maxOccurs_;
- }
-
- public void setStyle(int style) {
- style_ = style;
- }
-
- public int getStyle() {
- return style_;
- }
-
- public void setPartEncoding(int partEncoding) {
- partEncoding_ = partEncoding;
- }
-
- public int getPartEncoding() {
- return partEncoding_;
- }
-
- public void setIsWSDLPart(boolean isWSDLPart) {
- isWSDLPart_ = isWSDLPart;
- }
-
- public boolean getIsWSDLPart() {
- return isWSDLPart_;
- }
-
- public void setWSDLPartName(String wsdlPartName) {
- wsdlPartName_ = wsdlPartName;
- }
-
- public String getWSDLPartName() {
- return wsdlPartName_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java
deleted file mode 100644
index 20c57d6fa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-
-public class XSDToFragmentController {
- private WSDLPartsToXSDTypeMapper wsdlToXSDMapper_;
- private XSDLiteralXMLEncodingToFragmentMapper xsdLiteralMapper_;
- private XSDSOAPEncodingToFragmentMapper xsdSoapMapper_;
- private Hashtable xsdToFragmentCache_;
-
- public XSDToFragmentController() {
- wsdlToXSDMapper_ = null;
- xsdLiteralMapper_ = null;
- xsdSoapMapper_ = null;
- xsdToFragmentCache_ = new Hashtable();
- }
-
- public void setWSDLPartsToXSDTypeMapper(WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- wsdlToXSDMapper_ = wsdlToXSDMapper;
- }
-
- public WSDLPartsToXSDTypeMapper getWSDLPartsToXSDTypeMapper() {
- return wsdlToXSDMapper_;
- }
-
- private XSDLiteralXMLEncodingToFragmentMapper getXSDLiteralMapper() {
- if (xsdLiteralMapper_ == null)
- xsdLiteralMapper_ = new XSDLiteralXMLEncodingToFragmentMapper(this, wsdlToXSDMapper_);
- return xsdLiteralMapper_;
- }
-
- private XSDSOAPEncodingToFragmentMapper getXSDSOAPMapper() {
- if (xsdSoapMapper_ == null)
- xsdSoapMapper_ = new XSDSOAPEncodingToFragmentMapper(this, wsdlToXSDMapper_);
- return xsdSoapMapper_;
- }
-
- public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
- IXSDFragment frag = getCachedFragment(id);
- if (frag != null)
- return frag;
- frag = getNewFragment(config, id, name);
- if (frag != null)
- addToCache(id, frag);
- return frag;
- }
-
- public IXSDFragment getCachedFragment(String id) {
- return (IXSDFragment)xsdToFragmentCache_.get(id);
- }
-
- public IXSDFragment getNewFragment(XSDToFragmentConfiguration config, String id, String name) {
- switch (config.getPartEncoding())
- {
- case FragmentConstants.ENCODING_SOAP:
- return getXSDSOAPMapper().getFragment(config,id,name);
- case FragmentConstants.ENCODING_LITERAL:
- case FragmentConstants.ENCODING_URL:
- default:
- return getXSDLiteralMapper().getFragment(config,id,name);
- }
- }
-
- public void addToCache(String id, IXSDFragment frag) {
- xsdToFragmentCache_.put(id, frag);
- }
-
- public void removeFromCache(String id) {
- xsdToFragmentCache_.remove(id);
- }
-
- public void emptyCache() {
- xsdToFragmentCache_.clear();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java
deleted file mode 100644
index 1c64f6e0c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDefaultFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDEmptyFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public abstract class XSDToFragmentMapper {
- private XSDToFragmentController controller_;
- private WSDLPartsToXSDTypeMapper wsdlToXSDMapper_;
-
- public XSDToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- controller_ = controller;
- wsdlToXSDMapper_ = wsdlToXSDMapper;
- }
-
- public void setController(XSDToFragmentController controller) {
- controller_ = controller;
- }
-
- public XSDToFragmentController getController() {
- return controller_;
- }
-
- public void setWSDLPartsToXSDTypeMapper(WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
- wsdlToXSDMapper_ = wsdlToXSDMapper;
- }
-
- public WSDLPartsToXSDTypeMapper getWSDLPartsToXSDTypeMapper() {
- return wsdlToXSDMapper_;
- }
-
- protected IXSDFragment getXSDDefaultFragment(XSDToFragmentConfiguration config, String id, String name) {
- return new XSDDefaultFragment(id, name, config);
- }
-
- protected IXSDFragment getXSDEmptyFragment(XSDToFragmentConfiguration config, String id, String name) {
- return new XSDEmptyFragment(id, name, config);
- }
-
- public abstract IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name);
-
- protected XSDToFragmentConfiguration resolveXSDComponent(XSDToFragmentConfiguration config)
- {
- XSDComponent component = config.getXSDComponent();
- if (!isComponentResolvable(component) && (component instanceof XSDNamedComponent))
- {
- XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent((XSDNamedComponent)component);
- if (resolvedComponent != null)
- config.setXSDComponent(resolvedComponent);
- }
- return config;
- }
-
- protected boolean isComponentResolvable(XSDComponent component)
- {
- if (component == null)
- return false;
- XSDSchema schema = component.getSchema();
- if (schema == null)
- return false;
- if (schema.getTargetNamespace() == null)
- return false;
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java
deleted file mode 100644
index fd5e32812..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment;
-
-public abstract class Fragment implements IFragment {
- private String id_;
- private String name_;
- private Hashtable params_;
-
- public Fragment(String id, String name) {
- id_ = id;
- name_ = name;
- params_ = new Hashtable();
- }
-
- public void setID(String id) {
- id_ = id;
- }
-
- public String getID() {
- return id_;
- }
-
- public void setName(String name) {
- name_ = name;
- }
-
- public String getName() {
- return name_;
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- String[] params = parser.getParameterValues(getID());
- setParameterValues(getID(), params);
- return validateAllParameterValues();
- }
-
- public void setParameterValues(String paramKey, String[] params) {
- if (params == null)
- params_.remove(paramKey);
- else
- params_.put(paramKey, params);
- }
-
- public void setParameterValues(String paramKey, Vector params) {
- if (params == null)
- params_.remove(paramKey);
- else {
- String[] paramsArray = new String[params.size()];
- for (int i = 0; i < paramsArray.length; i++) {
- paramsArray[i] = params.get(i).toString();
- }
- setParameterValues(paramKey, paramsArray);
- }
- }
-
- public String[] getParameterValues(String paramKey) {
- return (String[])params_.get(paramKey);
- }
-
- public String getParameterValue(String paramKey, int paramIndex) {
- String[] params = getParameterValues(paramKey);
- if (params != null && paramIndex < params.length)
- return params[paramIndex];
- else
- return null;
- }
-
- public boolean validateAllParameterValues() {
- Enumeration paramKeys = params_.keys();
- while (paramKeys != null && paramKeys.hasMoreElements()) {
- if (!validateParameterValues((String)paramKeys.nextElement()))
- return false;
- }
- return true;
- }
-
- public boolean validateParameterValues(String paramKey) {
- String[] params = getParameterValues(paramKey);
- for (int i = 0; params != null && i < params.length; i++) {
- if (!validateParameterValue(paramKey, i))
- return false;
- }
- return true;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java
deleted file mode 100644
index 061fe81b1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class SOAPEncArrayFixFragment extends SOAPEncArrayFragment {
- public SOAPEncArrayFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java
deleted file mode 100644
index ff03dd2b2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.ISOAPEncArrayFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class SOAPEncArrayFragment extends XSDGroupSeqFragment implements ISOAPEncArrayFragment
-{
- public SOAPEncArrayFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup)
- {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- removeGroupIDs();
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- for (int i = 0; i < instanceDocumentsCopy.length; i++)
- {
- IXSDFragment soapEncArrayTypeFrag = (getGroupMemberFragments(createSOAPEncArrayInstance()))[0];
- Vector instancesVector = new Vector();
- NodeList nl = instanceDocumentsCopy[i].getChildNodes();
- for (int j = 0; j < nl.getLength(); j++)
- {
- Node node = nl.item(j);
- if (node instanceof Element)
- instancesVector.add(node);
- else
- paramsValid = false;
- }
- Element[] childInstanceDocuments = new Element[instancesVector.size()];
- instancesVector.copyInto(childInstanceDocuments);
- if (!soapEncArrayTypeFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, soapEncArrayTypeFrag.getName())))
- paramsValid = false;
- }
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
- {
- String[] groupIDs = getGroupIDs();
- Element[] instanceDocument = new Element[groupIDs.length];
- StringBuffer attrName = new StringBuffer();
- StringBuffer attrValue = new StringBuffer();
-// StringBuffer attrArrayTypeName = new StringBuffer();
-// StringBuffer attrArrayTypeValue = new StringBuffer();
- for (int i = 0; i < instanceDocument.length; i++)
- {
- int numInstances = 0;
- instanceDocument[i] = doc.createElement(getInstanceDocumentTagName(namespaceTable));
- IXSDFragment fragment = (getGroupMemberFragments(groupIDs[i]))[0];
- Element[] fragmentInstanceDocuments = fragment.genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- for (int j = 0; j < fragmentInstanceDocuments.length; j++)
- {
- if (fragmentInstanceDocuments[j] != null)
- instanceDocument[i].appendChild(fragmentInstanceDocuments[j]);
- numInstances++;
- }
- String soapURI = FragmentConstants.URI_SOAP;
- String soapPrefix = getPrefixFromNamespaceURI(soapURI, namespaceTable);
- String soapEncArrayTypeURI = getXSDTypeDefinition().getTargetNamespace();
- String soapEncArrayTypePrefix = getPrefixFromNamespaceURI(soapEncArrayTypeURI, namespaceTable);
- // Set the arrayType attribute
- attrName.setLength(0);
- attrName.setLength(0);
- attrName.append(soapPrefix);
- attrName.append(FragmentConstants.COLON);
- attrName.append(FragmentConstants.SOAP_ENC_ARRAY_TYPE);
- attrValue.setLength(0);
- attrValue.append(soapEncArrayTypePrefix);
- attrValue.append(FragmentConstants.COLON);
- attrValue.append(getXSDTypeDefinition().getName());
- attrValue.append(FragmentConstants.LEFT_SQUARE_BRACKET);
- attrValue.append(numInstances);
- attrValue.append(FragmentConstants.RIGHT_SQUARE_BRACKET);
- instanceDocument[i].setAttribute(attrName.toString(), attrValue.toString());
- }
- if (genXSIType)
- {
-// TODO: Used to call the plugin's ignoreSchemaForSOAPArrays()method.
- boolean ignoreSchemaForSOAPArrays = true;
- if (ignoreSchemaForSOAPArrays)
- {
- for (int i = 0; i < instanceDocument.length; i++)
- {
- String xsiURI = FragmentConstants.URI_XSI;
- String xsiPrefix = getPrefixFromNamespaceURI(xsiURI, namespaceTable);
- String xsiTypeURI = FragmentConstants.URI_SOAP;
- String xsiTypePrefix = getPrefixFromNamespaceURI(xsiTypeURI, namespaceTable);
- attrName.setLength(0);
- attrName.append(xsiPrefix).append(FragmentConstants.COLON).append(FragmentConstants.XSI_TYPE);
- attrValue.setLength(0);
- attrValue.append(xsiTypePrefix).append(FragmentConstants.COLON);
- attrValue.append(FragmentConstants.QNAME_LOCAL_NAME_ARRAY);
- instanceDocument[i].setAttribute(attrName.toString(), attrValue.toString());
- }
- }
- else
- return addXSIType(instanceDocument, namespaceTable);
- }
- return instanceDocument;
- }
-
- public String createSOAPEncArrayInstance()
- {
- if (getXSDTypeDefinition() != null)
- {
- String groupID = genID();
- String[] groupMemberID = {genID()};
- int minOccurs = 0;
- int maxOccurs = FragmentConstants.UNBOUNDED;
- XSDElementDeclaration elementDecl = null;
- if (getXSDModelGroup() != null)
- {
- XSDParticle groupOwner = (XSDParticle)getXSDModelGroup().getContainer();
- int groupMin = groupOwner.getMinOccurs();
- int groupMax = groupOwner.getMaxOccurs();
- int elementMin = 0;
- int elementMax = FragmentConstants.UNBOUNDED;
- EList xsdParticles = getXSDModelGroup().getParticles();
- if (xsdParticles.size() > 0)
- {
- XSDParticleContent xsdParticleContent = ((XSDParticle)xsdParticles.get(0)).getContent();
- if (xsdParticleContent instanceof XSDElementDeclaration)
- {
- elementDecl = (XSDElementDeclaration)xsdParticleContent;
- XSDParticle elementOwner = (XSDParticle)elementDecl.getContainer();
- elementMin = elementOwner.getMinOccurs();
- elementMax = elementOwner.getMaxOccurs();
- }
- }
- if (groupMin >= 0 && elementMin >= 0)
- minOccurs = groupMin * elementMin;
- if (groupMax >= 0 && groupMax != FragmentConstants.UNBOUNDED && elementMax >= 0 && elementMax != FragmentConstants.UNBOUNDED)
- maxOccurs = groupMax * elementMax;
- }
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- xsdConfig.setXSDComponent(getXSDTypeDefinition());
- xsdConfig.setMinOccurs(minOccurs);
- xsdConfig.setMaxOccurs(maxOccurs);
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- String name = (elementDecl != null) ? elementDecl.getName() : getXSDTypeDefinition().getName();
- IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, groupMemberID[0], name);
- addFragment(groupMemberID[0], frag);
- setGroupMemberIDs(groupID, groupMemberID);
- return groupID;
- }
- else
- return null;
- }
-
- public String createGroupSeqInstance()
- {
- return createSOAPEncArrayInstance();
- }
-
- public String createInstance()
- {
- return createSOAPEncArrayInstance();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java
deleted file mode 100644
index 76567ee3e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class SOAPEncArrayRangeFragment extends SOAPEncArrayFragment {
- public SOAPEncArrayRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java
deleted file mode 100644
index fd93e27dd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.ISOAPEncodingWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class SOAPEncodingWrapperFragment extends XSDDelegationFragment implements ISOAPEncodingWrapperFragment
-{
- private static final String ID = "id";
- private static final String HREF = "href";
- private static final String POUND = "#";
-
- private Hashtable uriReferenceTable_;
-
- public SOAPEncodingWrapperFragment(String id, String name, XSDToFragmentConfiguration config)
- {
- super(id, name, null);
- uriReferenceTable_ = null;
- }
-
- public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
- {
- getXSDDelegationFragment().setXSDToFragmentConfiguration(config);
- }
-
- public XSDToFragmentConfiguration getXSDToFragmentConfiguration()
- {
- return getXSDDelegationFragment().getXSDToFragmentConfiguration();
- }
-
- public void setXSDTypeDefinition(XSDTypeDefinition typeDef)
- {
- getXSDDelegationFragment().setXSDTypeDefinition(typeDef);
- }
-
- public XSDTypeDefinition getXSDTypeDefinition()
- {
- return getXSDDelegationFragment().getXSDTypeDefinition();
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- for (int i = 0; i < instanceDocuments.length; i++)
- instanceDocuments[i] = resolveURIReferences(uriReferenceTable_, instanceDocuments[i]);
- return getXSDDelegationFragment().setParameterValuesFromInstanceDocuments(instanceDocuments);
- }
-
- public void setURIReferences(Hashtable uriReferences)
- {
- uriReferenceTable_ = uriReferences;
- }
-
- public static Hashtable parseURIReferences(Element element, boolean overwrites)
- {
- Hashtable uriReferences = new Hashtable();
- parseURIReferences(uriReferences, element, overwrites);
- return uriReferences;
- }
-
- private static boolean parseURIReferences(Hashtable uriReferences, Element element, boolean overwrites)
- {
- boolean resolved = true;
- if (element != null)
- {
- URIReference ref = null;
- String id = element.getAttribute(ID);
- resolved = !element.hasAttribute(HREF);
- if (id != null && id.length() > 0 && (overwrites || !uriReferences.contains(id)))
- {
- ref = new URIReference(element, true);
- uriReferences.put(id, ref);
- }
- NodeList nl = element.getChildNodes();
- for (int i = 0; i < nl.getLength(); i++)
- {
- Node node = nl.item(i);
- if (node instanceof Element)
- resolved = parseURIReferences(uriReferences, (Element)node, overwrites) && resolved;
- }
- if (ref != null)
- ref.setResolved(resolved);
- }
- return resolved;
- }
-
- public static Element resolveURIReferences(Hashtable uriReferences, Element element)
- {
- if (uriReferences != null && !uriReferences.isEmpty())
- return resolveURIReferences(uriReferences, element.getOwnerDocument(), element, new Vector());
- else
- return element;
- }
-
- private static Element resolveURIReferences(Hashtable uriReferences, Document doc, Element element, Vector usedIds)
- {
- String href = element.getAttribute(HREF);
- Element resolvedElement = element;
- boolean resolved = false;
- if (href != null && href.length() > 0)
- {
- URIReference ref = null;
- if (href.indexOf(POUND) != -1)
- href = href.substring(1, href.length());
- if (!usedIds.contains(href))
- {
- ref = (URIReference)uriReferences.get(href);
- if (ref != null)
- {
- usedIds.add(href);
- Element elementRef = ref.getRefElement();
- resolved = ref.getResolved();
- resolvedElement = doc.createElement(element.getTagName());
- NodeList nl = elementRef.getChildNodes();
- for (int i = 0; i < nl.getLength(); i++)
- {
- Node node = nl.item(i);
- if (node != null)
- resolvedElement.appendChild(doc.importNode(node, true));
- }
- }
- }
- }
- if (!resolved)
- {
- NodeList nl = resolvedElement.getChildNodes();
- for (int i = 0; i < nl.getLength(); i++)
- {
- Node node = nl.item(i);
- if (node instanceof Element)
- {
- Element child = resolveURIReferences(uriReferences, resolvedElement.getOwnerDocument(), (Element)node, usedIds);
- if (child != node)
- resolvedElement.replaceChild(child, node);
- }
- }
- }
- if (href != null)
- usedIds.remove(href);
- return resolvedElement;
- }
-
- private static class URIReference
- {
- private Element ref_;
- private boolean resolved_;
-
- public URIReference(Element ref, boolean resolved)
- {
- ref_ = ref;
- resolved_ = resolved;
- }
-
- public Element getRefElement()
- {
- return ref_;
- }
-
- public void setRefElement(Element ref)
- {
- ref_ = ref;
- }
-
- public boolean getResolved()
- {
- return resolved_;
- }
-
- public void setResolved(boolean resolved)
- {
- resolved_ = resolved;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java
deleted file mode 100644
index ca92c970a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPHeaderWrapperFragment.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * A SOAP header fragment, which is a wrapper around the fragment that represents the SOAP header content.
- */
-public class SOAPHeaderWrapperFragment extends XSDDelegationFragment {
-
- private static final String MUST_UNDERSTAND = "mustUnderstand";
- private static final String ACTOR = "actor";
-
- private boolean mustUnderstand = false;
- private String actor = "";
- private boolean validActor = true;
-
- /**
- * Constructor.
- *
- * @param fragment The fragment that this SOAP header fragment wraps around.
- */
- public SOAPHeaderWrapperFragment(IXSDFragment fragment) {
- super(fragment.genID(), fragment.getName(), null);
- setXSDDelegationFragment(fragment);
- }
-
- /*
- * Retrieves the first element from a string array.
- */
- private String getFirstElement(String[] stringArray) {
- if (stringArray == null || stringArray.length == 0)
- return null;
- return stringArray[0];
- }
-
- /*
- * Retrieves the first element from a vector.
- */
- private String getFirstElement(Vector vector) {
- if (vector == null || vector.isEmpty())
- return null;
-
- Object obj = vector.firstElement();
- if (!(obj instanceof String))
- return null;
-
- return (String) obj;
- }
-
- /*
- * Sets the mustUnderstand value. Any non-empty string (except "0")
- * translates to a mustUnderstand value of true.
- */
- private void setMustUnderstand(String param) {
- mustUnderstand = (param != null && !param.equals("0"));
- }
-
- /*
- * Sets the actor value. Also sets the flag for validActor.
- */
- private void setActor(String param) {
- if (param == null || param.length() == 0)
- actor = "";
- else {
- actor = param;
- try {
- new URI(actor);
- }
- catch (URISyntaxException e) {
- validActor = false;
- return;
- }
- }
-
- validActor = true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#processParameterValues(org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser)
- */
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-
- setMustUnderstand(parser.getParameter(getMustUnderstandID()));
- setActor(parser.getParameter(getActorID()));
-
- // mustUnderstand is either set or unset, no further validation necessary
- // only need to validate actor URI
- return super.processParameterValues(parser) && validateActor();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#setParameterValues(java.lang.String, java.lang.String[])
- */
- public void setParameterValues(String paramKey, String[] params) {
- if (getMustUnderstandID().equals(paramKey))
- setMustUnderstand(getFirstElement(params));
- else if (getActorID().equals(paramKey))
- setActor(getFirstElement(params));
- else
- super.setParameterValues(paramKey, params);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#setParameterValues(java.lang.String, java.util.Vector)
- */
- public void setParameterValues(String paramKey, Vector params) {
- if (getMustUnderstandID().equals(paramKey))
- setMustUnderstand(getFirstElement(params));
- else if (getActorID().equals(paramKey))
- setActor(getFirstElement(params));
- else
- super.setParameterValues(paramKey, params);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#getParameterValues(java.lang.String)
- */
- public String[] getParameterValues(String paramKey) {
- if (getMustUnderstandID().equals(paramKey))
- return new String[] { mustUnderstand ? "1" : "0" };
- else if (getActorID().equals(paramKey))
- return new String[] { actor };
- else
- return super.getParameterValues(paramKey);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#getParameterValue(java.lang.String, int)
- */
- public String getParameterValue(String paramKey, int paramIndex) {
- return getParameterValues(paramKey)[paramIndex];
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#validateAllParameterValues()
- */
- public boolean validateAllParameterValues() {
- return super.validateAllParameterValues() && validateActor();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#validateParameterValues(java.lang.String)
- */
- public boolean validateParameterValues(String paramKey) {
- if (getMustUnderstandID().equals(paramKey))
- return true;
- else if (getActorID().equals(paramKey))
- return validateActor();
- else
- return super.validateParameterValues(paramKey);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#validateParameterValue(java.lang.String, int)
- */
- public boolean validateParameterValue(String paramKey, int paramIndex) {
- if (getMustUnderstandID().equals(paramKey))
- return true;
- else if (getActorID().equals(paramKey))
- return validateActor();
- else
- return super.validateParameterValue(paramKey, paramIndex);
- }
-
- /**
- * Sets the values for this SOAP header given an instance document and a namespace table.
- *
- * @param instanceDocument The instance document.
- * @param namespaceTable The namespace table.
- *
- * @return True if all values extracted from the instance document are valid.
- */
- public boolean setParameterValuesFromInstanceDocument(Element instanceDocument, Map namespaceTable) {
-
- boolean valid = setParameterValuesFromInstanceDocuments(new Element[] { instanceDocument });
-
- String prefix = namespaceTable.get(FragmentConstants.NS_URI_SOAP_ENV) + FragmentConstants.COLON;
-
- String mustUnderstandValue = instanceDocument.getAttribute(prefix + MUST_UNDERSTAND);
- if ("".equals(mustUnderstandValue))
- mustUnderstand = false;
- else if ("0".equals(mustUnderstandValue) || "1".equals(mustUnderstandValue))
- setMustUnderstand(mustUnderstandValue);
- else
- valid = false;
-
- setActor(instanceDocument.getAttribute(prefix + ACTOR));
-
- return valid && validateActor();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#genInstanceDocumentsFromParameterValues(boolean, java.util.Hashtable, org.w3c.dom.Document)
- */
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
- Element[] elements = super.genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-
- if (elements.length == 0)
- return elements;
-
- String prefix = getPrefixFromNamespaceURI(FragmentConstants.NS_URI_SOAP_ENV, namespaceTable) + FragmentConstants.COLON;
-
- for (int i = 0; i < elements.length; i++) {
-
- if (mustUnderstand)
- elements[i].setAttribute(prefix + MUST_UNDERSTAND, "1");
-
- if (actor.length() > 0)
- elements[i].setAttribute(prefix + ACTOR, actor);
- }
-
- return elements;
- }
-
- /**
- * Convenience method for getting for the mustUnderstand value
- * @return The mustUnderstand value, true if mustUnderstand="1", false otherwise.
- */
- public boolean isMustUnderstand() {
- return mustUnderstand;
- }
-
- /**
- * Convenience method for getting the actor value
- * @return The actor value
- */
- public String getActor() {
- return actor;
- }
-
- /**
- * Determines if the actor value is a valid URI.
- * @return True if the actor value is valid, false otherwise.
- */
- public boolean validateActor() {
- return validActor;
- }
-
- /**
- * Returns the ID of the mustUnderstand input element
- * @return The ID of the mustUnderstand input element
- */
- public String getMustUnderstandID() {
- return getID() + FragmentConstants.ID_SEPERATOR + MUST_UNDERSTAND;
- }
-
- /**
- * Returns the ID of the actor input element
- * @return The ID of the actor input element
- */
- public String getActorID() {
- return getID() + FragmentConstants.ID_SEPERATOR + ACTOR;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.XSDDelegationFragment#getWriteFragment()
- */
- public String getWriteFragment() {
- return "/wsdl/fragment/SOAPHeaderWrapperWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDAttributeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDAttributeFragment.java
deleted file mode 100644
index 0e539a202..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDAttributeFragment.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * <copyright>
- *
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2002 - All Rights
- * Reserved. US Government Users Restricted Rights - Use, duplication or
- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
- *
- * </copyright>
- *
- * File
- * plugins/com.ibm.etools.webservice.explorer/wsexplorer/src/com/ibm/etools/webservice/explorer/wsdl/fragment/Impl/XSDElementFragment.java,
- * wsa.etools.ws.explorer, lunar-5.1.2, 20031231a 5 Version 1.5 03/09/24
- * 14:30:38
- */
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDForm;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDAttributeFragment extends XSDDelegationFragment implements IXSDAttributeFragment
-{
-
-
- public XSDAttributeFragment(String id, String name, XSDToFragmentConfiguration config)
- {
- super(id, name, config);
-
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- IXSDFragment attributeTypeFragment = getXSDDelegationFragment();
-
- if (!attributeTypeFragment.processParameterValues(parser))
- return false;
- return true;
- }
-
- public boolean validateAllParameterValues()
- {
- IXSDFragment attributeTypeFragment = getXSDDelegationFragment();
- if (!attributeTypeFragment.validateAllParameterValues())
- return false;
- return true;
- }
-
- public boolean validateParameterValues(String paramKey)
- {
- String[] params = getParameterValues(paramKey);
- if (params != null)
- return false;
- if (!getXSDDelegationFragment().validateParameterValues(paramKey))
- return false;
- return true;
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex)
- {
- if (!getXSDDelegationFragment().validateParameterValue(paramKey, paramIndex))
- return false;
- return true;
- }
-
- public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
- {
- super.setXSDToFragmentConfiguration(config);
-
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = instanceDocuments;
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- String wsdlPartName = config.getWSDLPartName();
- NodeList nl = instanceDocumentsCopy[0].getChildNodes();
-
-
-
- if (config.getIsWSDLPart() && config.getStyle() == FragmentConstants.STYLE_RPC && wsdlPartName != null && wsdlPartName.length() > 0 && instanceDocumentsCopy.length == 1 && wsdlPartName.equals(instanceDocumentsCopy[0].getTagName()))
- {
- Vector childElements = new Vector();
- for (int i = 0; i < nl.getLength(); i++)
- {
- Node node = nl.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE){
- childElements.add(node);
- }
- }
- instanceDocumentsCopy = (Element[])childElements.toArray(new Element[0]);
- }
- IXSDFragment attributeTypeFragment = getXSDDelegationFragment();
- instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocumentsCopy, getName());
- return attributeTypeFragment.setParameterValuesFromInstanceDocuments(setElementsTagName(instanceDocumentsCopy, attributeTypeFragment.getName()));
- }
-
- protected boolean isInstanceNamespaceQualified()
- {
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- if (config.getPartEncoding() == FragmentConstants.ENCODING_LITERAL)
- {
- XSDAttributeUse xsdAttributeUse = (XSDAttributeUse)config.getXSDComponent();
- XSDAttributeDeclaration xsdAttribute = (XSDAttributeDeclaration)xsdAttributeUse.getAttributeDeclaration();
- if (xsdAttribute.isGlobal())
- return true;
- else
- {
- if (xsdAttribute.isSetForm())
- return (xsdAttribute.getForm().getValue() == XSDForm.QUALIFIED);
- else
- return (xsdAttribute.getSchema().getAttributeFormDefault().getValue() == XSDForm.QUALIFIED);
- }
- }
- else
- return false;
- }
-
- protected String getInstanceDocumentTagName(Hashtable namespaceTable)
- {
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- XSDAttributeUse xsdAttributeUse = (XSDAttributeUse)config.getXSDComponent();
- XSDAttributeDeclaration xsdAttribute = xsdAttributeUse.getAttributeDeclaration();
-
- StringBuffer tagName = new StringBuffer();
- if (isInstanceNamespaceQualified())
- {
- String nsURI = null;
- // port to org.eclipse.xsd
- if (xsdAttribute.getResolvedAttributeDeclaration() != null)
- nsURI = xsdAttribute.getResolvedAttributeDeclaration().getTargetNamespace();
- else
- nsURI = xsdAttribute.getTargetNamespace();
- if (nsURI != null && nsURI.length() > 0)
- {
- String prefix = getPrefixFromNamespaceURI(nsURI, namespaceTable);
- tagName.append(prefix);
- tagName.append(FragmentConstants.COLON);
- }
- }
- String xsdAttributeName = xsdAttribute.getName();
- if (xsdAttributeName == null || xsdAttributeName.length() <= 0)
- {
- // port to org.eclipse.xsd
- if (xsdAttribute.getResolvedAttributeDeclaration() != null)
- xsdAttributeName = xsdAttribute.getResolvedAttributeDeclaration().getName();
- else
- xsdAttributeName = getName();
- }
- tagName.append(xsdAttributeName);
- return tagName.toString();
- }
-
-
-
-
- public String getInformationFragment()
- {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment()
- {
- return "/wsdl/fragment/XSDDelegateFragmentJSP.jsp";
- }
-
- public String getWriteFragment()
- {
- return "/wsdl/fragment/XSDDelegateFragmentJSP.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java
deleted file mode 100644
index 02cf5d1c1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDComplexFixFragment extends XSDComplexFragment {
- public XSDComplexFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDComplexRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java
deleted file mode 100644
index 45facb772..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070516 185596 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer misinterprets response message
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDComplexFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexFinal;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class XSDComplexFragment extends XSDMapFragment implements IXSDComplexFragment
-{
- public XSDComplexFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller)
- {
- super(id, name, config, controller);
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent instanceof XSDTypeDefinition)
- setParamsForXSDTypeDef(instanceDocumentsCopy);
- else
- setParamsForXSDParticle(instanceDocumentsCopy);
- return setParamsForAttributes(instanceDocumentsCopy) && paramsValid;
- }
-
- private boolean setParamsForAttributes(Element[] instanceDocuments){
- boolean paramsValid = true;
-
- String[] fragmentsOrder = getFragmentsOrder();
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++){
-
- if (i >= fragmentsOrder.length) break;
- String fragmentID = fragmentsOrder[i];
-
- for (int k = 0; k < attributeFragments.length; k++){
- if(attributeFragments[k].getID().startsWith(fragmentID)){
- NamedNodeMap nodeMap = instanceDocuments[i].getAttributes();
- String name = ((XSDAttributeUse)attributeFragments[k].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- paramsValid = attributeFragments[k].getXSDDelegationFragment().setAttributeParamsFromInstanceDocuments(nodeMap.getNamedItem(name));
- }
- }
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDTypeDef(Element[] instanceDocuments)
- {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Element[] childInstanceDocuments = new Element[1];
- childInstanceDocuments[0] = instanceDocuments[i];
- if (!childFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, childFrag.getName())))
- paramsValid = false;
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDParticle(Element[] instanceDocuments)
- {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Vector instancesVector = new Vector();
- NodeList nl = instanceDocuments[i].getChildNodes();
- for (int j = 0; j < nl.getLength(); j++)
- {
- Node node = nl.item(j);
- if (node instanceof Element)
- instancesVector.add(node);
- else
- paramsValid = false;
- }
- Element[] childInstanceDocuments = new Element[instancesVector.size()];
- instancesVector.copyInto(childInstanceDocuments);
- if (!childFrag.setParameterValuesFromInstanceDocuments(childInstanceDocuments))
- paramsValid = false;
- }
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
- {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- Element[] instanceDocuments;
- String tagName = getInstanceDocumentTagName(namespaceTable);
- if (complexTypeContent instanceof XSDTypeDefinition)
- instanceDocuments = genInstancesForXSDTypeDef(genXSIType, namespaceTable, tagName, doc);
- else
- instanceDocuments = genInstancesForXSDParticle(genXSIType, namespaceTable, tagName, doc);
- if(genXSIType) addXSIType(instanceDocuments, namespaceTable);
- instanceDocuments = addAttributes(instanceDocuments);
- return instanceDocuments;
- }
-
- private Element[] addAttributes(Element[] instanceDocuments){
-
- String[] fragmentsOrder = getFragmentsOrder();
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int i = 0;i< instanceDocuments.length;i++){
-
- if (i >= fragmentsOrder.length) break;
- String fragmentID = fragmentsOrder[i];
-
- for (int k = 0; k < attributeFragments.length; k++){
- if(attributeFragments[k].getID().startsWith(fragmentID)){
- String name = ((XSDAttributeUse)attributeFragments[k].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- attributeFragments[k].getXSDDelegationFragment().setAttributesOnInstanceDocuments(instanceDocuments[i],name);
- }
- }
- }
- return instanceDocuments;
- }
-
- private Element[] genInstancesForXSDTypeDef(boolean genXSIType, Hashtable namespaceTable, String tagName, Document doc)
- {
- IXSDFragment[] fragments = getAllFragments();
- Vector instanceDocumentsCopy = new Vector();
- for (int i = 0; i < fragments.length; i++)
- {
- Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- if (fragmentInstances.length > 0)
- instanceDocumentsCopy.add(fragmentInstances[0]);
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
- }
- return setElementsTagName(instanceDocuments, tagName);
- }
-
- private Element[] genInstancesForXSDParticle(boolean genXSIType, Hashtable namespaceTable, String tagName, Document doc)
- {
- IXSDFragment[] childFrags = getAllFragments();
- Element[] instanceDocuments = new Element[childFrags.length];
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- Element[] childInstances = childFrags[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- Element instanceDocument = doc.createElement(tagName);
- for (int j = 0; j < childInstances.length; j++)
- {
- if (childInstances[j] != null)
- instanceDocument.appendChild(childInstances[j]);
- }
- instanceDocuments[i] = instanceDocument;
- }
- return instanceDocuments;
- }
-
- private XSDModelGroup getXSDModelGroup(XSDParticle xsdParticle)
- {
- if (xsdParticle != null)
- {
- XSDParticleContent xsdParticleContent = xsdParticle.getContent();
- if (xsdParticleContent != null)
- {
- if (xsdParticleContent instanceof XSDModelGroupDefinition)
- {
- XSDModelGroupDefinition xsdModelGroupDef = (XSDModelGroupDefinition)xsdParticleContent;
- if (xsdModelGroupDef.isModelGroupDefinitionReference())
- xsdModelGroupDef = xsdModelGroupDef.getResolvedModelGroupDefinition();
- return xsdModelGroupDef.getModelGroup();
- }
- else if (xsdParticleContent instanceof XSDModelGroup)
- return (XSDModelGroup)xsdParticleContent;
- }
- }
- return null;
- }
-
- private List getInheritedParticles(XSDComplexTypeDefinition complexType)
- {
- Vector v = new Vector();
- if (complexType.getDerivationMethod().getValue() == XSDComplexFinal.EXTENSION)
- {
- XSDTypeDefinition extType = complexType.getBaseType();
- if (extType != null && !(extType instanceof XSDComplexTypeDefinition))
- {
- String namespace = extType.getTargetNamespace();
- String localname = extType.getName();
- if (namespace != null && localname != null)
- {
- XSDNamedComponent xsdNamedComp = getXSDToFragmentController().getWSDLPartsToXSDTypeMapper().getXSDTypeFromSchema(namespace, localname, false);
- if (xsdNamedComp instanceof XSDComplexTypeDefinition)
- {
- extType = (XSDComplexTypeDefinition)xsdNamedComp;
- }
- }
- }
- if (extType != null && extType != complexType && extType instanceof XSDComplexTypeDefinition)
- {
- XSDComplexTypeContent extTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent((XSDComplexTypeDefinition)extType);
- if (extTypeContent instanceof XSDParticle)
- {
- XSDModelGroup xsdModelGroup = getXSDModelGroup((XSDParticle)extTypeContent);
- if (xsdModelGroup != null)
- {
- v.addAll(getInheritedParticles((XSDComplexTypeDefinition)extType));
- v.addAll(xsdModelGroup.getParticles());
- }
- }
- }
- }
- return v;
- }
-
- private void gatherInheritedParticles(XSDComplexTypeDefinition complexType)
- {
- if (complexType.getDerivationMethod().getValue() == XSDComplexFinal.EXTENSION)
- {
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent instanceof XSDParticle)
- {
- XSDModelGroup xsdModelGroup = getXSDModelGroup((XSDParticle)complexTypeContent);
- if (xsdModelGroup != null)
- {
- List inheritedParticles = getInheritedParticles(complexType);
- List particles = xsdModelGroup.getParticles();
- particles.addAll(0, inheritedParticles);
- }
- }
- }
- }
-
-
-
- public IXSDAttributeFragment[] getAllAttributeFragments()
- {
- return super.getAllAttributeFragments();
-
- }
-
- public void createAttributeFragments(String complexChildID)
- {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- EList atContentList = complexType.getAttributeContents();
- Iterator iterator = atContentList.iterator();
- while(iterator.hasNext()){
- Object object = (Object)iterator.next();
- if(object instanceof XSDAttributeGroupDefinition){
- XSDAttributeGroupDefinition xsdAGD = (XSDAttributeGroupDefinition)object;
- XSDAttributeGroupDefinition resolved = xsdAGD.getResolvedAttributeGroupDefinition();
- EList aList = resolved.getContents();
- Iterator iterator2 = aList.iterator();
- while(iterator2.hasNext()){
- createAttributeHelper((XSDAttributeUse)iterator2.next(),complexChildID);
- }
- }
- else{
- XSDAttributeUse attUse = (XSDAttributeUse)object;
- createAttributeHelper(attUse,complexChildID);
- }
-
- }
- }
-
- private void createAttributeHelper(XSDAttributeUse attUse,String complexChildID){
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- xsdConfig.setXSDComponent(attUse);
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- String newID = genID();
- addAttributeFragment(complexChildID + newID, getXSDToFragmentController().getFragment(xsdConfig,complexChildID + newID, complexChildID + newID));
-
- }
-
-
- public String createComplexInstance()
- {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- gatherInheritedParticles(complexType);
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- xsdConfig.setXSDComponent(complexTypeContent);
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- String newID = genID();
- addFragment(newID, getXSDToFragmentController().getFragment(xsdConfig, newID, getName()));
- createAttributeFragments(newID);
- return newID;
- }
-
- public String createInstance()
- {
- return createComplexInstance();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java
deleted file mode 100644
index 869bd8e1d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDComplexRangeFragment extends XSDComplexFragment {
- public XSDComplexRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDComplexRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentFixFragment.java
deleted file mode 100644
index bc5a33297..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentFixFragment.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/src/com/ibm/etools/webservice/explorer/wsdl/fragment/Impl/XSDComplexFixFragment.java, wsa.etools.ws.explorer, lunar-5.1.2 1
-* Version 1.1 03/02/28 15:25:15
-*/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDComplexSimpleContentFixFragment extends XSDComplexFragment {
- public XSDComplexSimpleContentFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
-
-
-
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent instanceof XSDTypeDefinition)
- return setParamsForXSDTypeDef(instanceDocumentsCopy) && paramsValid;
- else
- return setParamsForXSDParticle(instanceDocumentsCopy) && paramsValid;
- }
-
- private boolean setParamsForAttributes(Element instanceDocument,IXSDFragment frag){
- boolean paramsValid = true;
-
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int i = 0; i < attributeFragments.length; i++){
- if(attributeFragments[i].getID().startsWith(frag.getID())){
- NamedNodeMap nodeMap = instanceDocument.getAttributes();
- String name = ((XSDAttributeUse)attributeFragments[i].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- paramsValid = attributeFragments[i].getXSDDelegationFragment().setAttributeParamsFromInstanceDocuments(nodeMap.getNamedItem(name));
- }
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDTypeDef(Element[] instanceDocuments)
- {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Element[] childInstanceDocuments = new Element[1];
- childInstanceDocuments[0] = instanceDocuments[i];
- if (!childFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, childFrag.getName())))
- paramsValid = false;
- setParamsForAttributes(childInstanceDocuments[0],childFrag);
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDParticle(Element[] instanceDocuments) {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Vector instancesVector = new Vector();
-
- NodeList nl = instanceDocuments[i].getChildNodes();
- for (int j = 0; j < nl.getLength(); j++) {
- Node node = nl.item(j);
- if (node instanceof Element)
- instancesVector.add(node);
- else
- paramsValid = false;
- }
- Element[] childInstanceDocuments = new Element[instancesVector.size()];
- instancesVector.copyInto(childInstanceDocuments);
- if (!childFrag.setParameterValuesFromInstanceDocuments(childInstanceDocuments))
- paramsValid = false;
- setParamsForAttributes(childInstanceDocuments[i],childFrag);
-
- }
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable,Document doc) {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- Element[] instanceDocuments;
- String tagName = getInstanceDocumentTagName(namespaceTable);
- if (complexTypeContent instanceof XSDTypeDefinition)
- instanceDocuments = genInstancesForXSDTypeDef(genXSIType, namespaceTable, tagName,doc);
- else
- instanceDocuments = genInstancesForXSDParticle(genXSIType, namespaceTable, tagName,doc);
- if(genXSIType) addXSIType(instanceDocuments, namespaceTable);
- return instanceDocuments;
- }
-
- private Element addAttributes(Element instanceDocument, IXSDFragment fragment, Hashtable namespaceTable ){
-
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int k = 0; k < attributeFragments.length; k++){
- if(attributeFragments[k].getID().startsWith(fragment.getID())){
- String name = ((XSDAttributeUse)attributeFragments[k].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- attributeFragments[k].getXSDDelegationFragment().setAttributesOnInstanceDocuments(instanceDocument,name);
- }
- }
-
- return instanceDocument;
- }
-
- private Element[] genInstancesForXSDTypeDef(boolean genXSIType, Hashtable namespaceTable, String tagName,Document doc)
- {
- IXSDFragment[] fragments = getAllFragments();
- Vector instanceDocumentsCopy = new Vector();
- for (int i = 0; i < fragments.length; i++) {
- Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable,doc);
- if (fragmentInstances.length > 0){
- fragmentInstances[0] = addAttributes(fragmentInstances[0],fragments[i],namespaceTable);
- instanceDocumentsCopy.add(fragmentInstances[0]);
- }
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- for (int i = 0; i < instanceDocuments.length; i++) {
- instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
- }
- return setElementsTagName(instanceDocuments, tagName);
- }
-
- private Element[] genInstancesForXSDParticle(boolean genXSIType, Hashtable namespaceTable, String tagName,Document doc) {
- IXSDFragment[] childFrags = getAllFragments();
- Element[] instanceDocuments = new Element[childFrags.length];
- for (int i = 0; i < instanceDocuments.length; i++) {
- Element[] childInstances = childFrags[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable,doc);
-
- Element instanceDocument = doc.createElement(tagName);
- for (int j = 0; j < childInstances.length; j++) {
- if (childInstances[j] != null){
- addAttributes(childInstances[j],childFrags[i],namespaceTable);
- instanceDocument.appendChild(doc.importNode(childInstances[j], true));
- }
- }
- instanceDocuments[i] = instanceDocument;
- }
- return instanceDocuments;
- }
-
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDComplexSimpleContentRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDComplexSimpleContentFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentRangeFragment.java
deleted file mode 100644
index 109bb8951..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexSimpleContentRangeFragment.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*
-* File plugins/com.ibm.etools.webservice.explorer/wsexplorer/src/com/ibm/etools/webservice/explorer/wsdl/fragment/Impl/XSDComplexRangeFragment.java, wsa.etools.ws.explorer, lunar-5.1.2 1
-* Version 1.1 03/02/28 15:25:18
-*/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDComplexSimpleContentRangeFragment extends XSDComplexSimpleContentFixFragment {
- public XSDComplexSimpleContentRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- if (complexTypeContent instanceof XSDTypeDefinition)
- return setParamsForXSDTypeDef(instanceDocumentsCopy) && paramsValid;
- else
- return setParamsForXSDParticle(instanceDocumentsCopy) && paramsValid;
- }
-
- private boolean setParamsForAttributes(Element instanceDocument,IXSDFragment frag){
- boolean paramsValid = true;
-
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int i = 0; i < attributeFragments.length; i++){
- if(attributeFragments[i].getID().startsWith(frag.getID())){
- NamedNodeMap nodeMap = instanceDocument.getAttributes();
- String name = ((XSDAttributeUse)attributeFragments[i].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- paramsValid = attributeFragments[i].getXSDDelegationFragment().setAttributeParamsFromInstanceDocuments(nodeMap.getNamedItem(name));
- }
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDTypeDef(Element[] instanceDocuments)
- {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Element[] childInstanceDocuments = new Element[1];
- childInstanceDocuments[0] = instanceDocuments[i];
- if (!childFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, childFrag.getName())))
- paramsValid = false;
- setParamsForAttributes(childInstanceDocuments[0],childFrag);
- }
- return paramsValid;
- }
-
- private boolean setParamsForXSDParticle(Element[] instanceDocuments) {
- boolean paramsValid = true;
- removeAllFragments();
- removeAllAttributeFragments();
- for (int i = 0; i < instanceDocuments.length; i++) {
- IXSDFragment childFrag = getFragment(createInstance());
- Vector instancesVector = new Vector();
-
- NodeList nl = instanceDocuments[i].getChildNodes();
- for (int j = 0; j < nl.getLength(); j++) {
- Node node = nl.item(j);
- if (node instanceof Element)
- instancesVector.add(node);
- else
- paramsValid = false;
- }
- Element[] childInstanceDocuments = new Element[instancesVector.size()];
- instancesVector.copyInto(childInstanceDocuments);
- if (!childFrag.setParameterValuesFromInstanceDocuments(childInstanceDocuments))
- paramsValid = false;
- setParamsForAttributes(childInstanceDocuments[i],childFrag);
-
- }
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable,Document doc) {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
- XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
- Element[] instanceDocuments;
- String tagName = getInstanceDocumentTagName(namespaceTable);
- if (complexTypeContent instanceof XSDTypeDefinition)
- instanceDocuments = genInstancesForXSDTypeDef(genXSIType, namespaceTable, tagName, doc);
- else
- instanceDocuments = genInstancesForXSDParticle(genXSIType, namespaceTable, tagName, doc);
- if(genXSIType) addXSIType(instanceDocuments, namespaceTable);
- return instanceDocuments;
- }
-
- private Element addAttributes(Element instanceDocument, IXSDFragment fragment, Hashtable namespaceTable ){
-
- IXSDAttributeFragment[] attributeFragments = getAllAttributeFragments();
- for (int k = 0; k < attributeFragments.length; k++){
- if(attributeFragments[k].getID().startsWith(fragment.getID())){
- String name = ((XSDAttributeUse)attributeFragments[k].getXSDToFragmentConfiguration().getXSDComponent()).getAttributeDeclaration().getName();
- attributeFragments[k].getXSDDelegationFragment().setAttributesOnInstanceDocuments(instanceDocument,name);
- }
- }
-
- return instanceDocument;
- }
-
- private Element[] genInstancesForXSDTypeDef(boolean genXSIType, Hashtable namespaceTable, String tagName,Document doc)
- {
- IXSDFragment[] fragments = getAllFragments();
- Vector instanceDocumentsCopy = new Vector();
- for (int i = 0; i < fragments.length; i++) {
- Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable,doc);
- if (fragmentInstances.length > 0){
- fragmentInstances[0] = addAttributes(fragmentInstances[0],fragments[i],namespaceTable);
- instanceDocumentsCopy.add(fragmentInstances[0]);
- }
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- for (int i = 0; i < instanceDocuments.length; i++) {
- instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
- }
- return setElementsTagName(instanceDocuments, tagName);
- }
-
- private Element[] genInstancesForXSDParticle(boolean genXSIType, Hashtable namespaceTable, String tagName,Document doc) {
- IXSDFragment[] childFrags = getAllFragments();
- Element[] instanceDocuments = new Element[childFrags.length];
-
- for (int i = 0; i < instanceDocuments.length; i++) {
- Element[] childInstances = childFrags[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-
- Element instanceDocument = doc.createElement(tagName);
- for (int j = 0; j < childInstances.length; j++) {
- if (childInstances[j] != null){
- addAttributes(childInstances[j],childFrags[i],namespaceTable);
- instanceDocument.appendChild(doc.importNode(childInstances[j], true));
- }
- }
- instanceDocuments[i] = instanceDocument;
- }
- return instanceDocuments;
- }
-
-
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDComplexSimpleContentRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDComplexSimpleContentRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java
deleted file mode 100644
index 959bd0b37..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDDefaultFragment extends XSDFragment {
- public XSDDefaultFragment(String id, String name, XSDToFragmentConfiguration config) {
- super(id, name, config);
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- String[] param = new String[1];
- param[0] = parser.getParameter(getID());
- setParameterValues(getID(), param);
- return isElement(addRootElement(param[0]));
- }
-
- private String addRootElement(String element) {
- StringBuffer sb = new StringBuffer();
- sb.append(FragmentConstants.ROOT_ELEMENT_START_TAG);
- sb.append(element);
- sb.append(FragmentConstants.ROOT_ELEMENT_END_TAG);
- return sb.toString();
- }
-
- private boolean isElement(String elementString) {
- try {
- return (XMLUtils.stringToElement(elementString) != null);
- }
- catch (Throwable t) {
- return false;
- }
- }
-
- public boolean validateAllParameterValues() {
- String param = getParameterValue(getID(), 0);
- return (param == null || isElement(addRootElement(param)));
- }
-
- public boolean validateParameterValues(String paramKey) {
- String param = getParameterValue(getID(), 0);
- return (param == null || isElement(addRootElement(param)));
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex) {
- String param = getParameterValue(getID(), 0);
- return (param == null || isElement(addRootElement(param)));
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- StringBuffer sb = new StringBuffer();
- boolean paramValid = true;
- for (int i = 0; i < instanceDocuments.length; i++) {
- String instanceString = XMLUtils.serialize(instanceDocuments[i], true);
- if (instanceString != null && instanceString.length() > 0)
- sb.append(instanceString);
- else
- paramValid = false;
- }
- String[] param = {sb.toString()};
- setParameterValues(getID(), param);
- return paramValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
- String param = getParameterValue(getID(), 0);
- if (param == null)
- return new Element[0];
- Element root;
- try {
- root = (Element)doc.importNode(XMLUtils.stringToElement(addRootElement(param)), true);
- }
- catch (Throwable t) {
- return new Element[0];
- }
- NodeList nl = root.getChildNodes();
- Vector instanceDocumentVector = new Vector();
- for (int i = 0; i < nl.getLength(); i++) {
- Node node = nl.item(i);
- if (node instanceof Element)
- instanceDocumentVector.add(node);
- }
- Element[] instanceDocuments = new Element[instanceDocumentVector.size()];
- for (int i = 0; i < instanceDocuments.length; i++) {
- instanceDocuments[i] = (Element)instanceDocumentVector.get(i);
- }
- return instanceDocuments;
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDDefaultRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDDefaultWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java
deleted file mode 100644
index 4b632a8fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDDelegationFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class XSDDelegationFragment extends XSDFragment implements IXSDDelegationFragment
-{
- private IXSDFragment xsdFragment_;
-
- public XSDDelegationFragment(String id, String name, XSDToFragmentConfiguration config)
- {
- super(id, name, config);
- xsdFragment_ = null;
- }
-
- public void setName(String name) {
- super.setName(name);
- if (xsdFragment_ != null)
- xsdFragment_.setName(name);
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- return xsdFragment_.processParameterValues(parser);
- }
-
- public void setParameterValues(String paramKey, String[] params)
- {
- xsdFragment_.setParameterValues(paramKey, params);
- }
-
- public void setParameterValues(String paramKey, Vector params)
- {
- xsdFragment_.setParameterValues(paramKey, params);
- }
-
- public String[] getParameterValues(String paramKey)
- {
- return xsdFragment_.getParameterValues(paramKey);
- }
-
- public String getParameterValue(String paramKey, int paramIndex)
- {
- return xsdFragment_.getParameterValue(paramKey, paramIndex);
- }
-
- public boolean validateAllParameterValues()
- {
- return xsdFragment_.validateAllParameterValues();
- }
-
- public boolean validateParameterValues(String paramKey)
- {
- return xsdFragment_.validateParameterValues(paramKey);
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex)
- {
- return xsdFragment_.validateParameterValue(paramKey, paramIndex);
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- return xsdFragment_.setParameterValuesFromInstanceDocuments(instanceDocuments);
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
- {
- return xsdFragment_.genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- }
-
- public String getInformationFragment()
- {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment()
- {
- return "/wsdl/fragment/XSDDelegationRFragmentJSP.jsp";
- }
-
- public String getWriteFragment()
- {
- return "/wsdl/fragment/XSDDelegationWFragmentJSP.jsp";
- }
-
- public void setXSDDelegationFragment(IXSDFragment xsdFragment)
- {
- xsdFragment_ = xsdFragment;
- }
-
- public IXSDFragment getXSDDelegationFragment()
- {
- return xsdFragment_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java
deleted file mode 100644
index ad7a56d9d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060119 123539 jesper@selskabet.org - Jesper Møller
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDElementFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDForm;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDElementFragment extends XSDDelegationFragment implements IXSDElementFragment
-{
- private int minOccurs_;
- private int maxOccurs_;
- private boolean isNil_;
-
-
- public XSDElementFragment(String id, String name, XSDToFragmentConfiguration config)
- {
- super(id, name, config);
- if (config != null)
- {
- minOccurs_ = config.getMinOccurs();
- maxOccurs_ = config.getMaxOccurs();
- }
- else
- {
- minOccurs_ = FragmentConstants.DEFAULT_MIN_OCCURS;
- maxOccurs_ = FragmentConstants.DEFAULT_MAX_OCCURS;
- }
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- IXSDFragment elementTypeFragment = getXSDDelegationFragment();
- setIsNil(parser);
- if(isNil_)return true;
-
- if (!elementTypeFragment.processParameterValues(parser))
- return false;
- String[] params = getParameterValues(elementTypeFragment.getID());
- if (params != null && !withinRange(params.length))
- return false;
- return true;
- }
-
- public boolean setIsNil(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String nil = parser.getParameter(getNilID());
- if(nil != null) isNil_ = true;
- else isNil_ = false;
- return isNil_;
- }
-
- public boolean validateAllParameterValues()
- {
- IXSDFragment elementTypeFragment = getXSDDelegationFragment();
- String[] params = getParameterValues(elementTypeFragment.getID());
- if (params != null && !withinRange(params.length))
- return false;
- if (!elementTypeFragment.validateAllParameterValues())
- return false;
- return true;
- }
-
- public boolean validateParameterValues(String paramKey)
- {
- String[] params = getParameterValues(paramKey);
- if (params != null && !withinRange(params.length))
- return false;
- if (!getXSDDelegationFragment().validateParameterValues(paramKey))
- return false;
- return true;
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex)
- {
- if (!withinRange(paramIndex + 1))
- return false;
- XSDElementDeclaration xsdElement = (XSDElementDeclaration)getXSDToFragmentConfiguration().getXSDComponent();
- String param = getParameterValue(paramKey, paramIndex);
- if (param != null && param.length() <= 0 && !xsdElement.isNillable())
- return false;
- if (!getXSDDelegationFragment().validateParameterValue(paramKey, paramIndex))
- return false;
- return true;
- }
-
- public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
- {
- super.setXSDToFragmentConfiguration(config);
- minOccurs_ = config.getMinOccurs();
- maxOccurs_ = config.getMaxOccurs();
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = instanceDocuments;
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- String wsdlPartName = config.getWSDLPartName();
- NodeList nl = instanceDocumentsCopy[0].getChildNodes();
-
- if(instanceDocumentsCopy[0].hasAttribute(XSI_NIL_ATTRIBUTE)){
- String nil = instanceDocumentsCopy[0].getAttribute(XSI_NIL_ATTRIBUTE);
- if(nil.equals(TRUE)) isNil_ = true;
- }
-
-
- if (config.getIsWSDLPart() && config.getStyle() == FragmentConstants.STYLE_RPC && wsdlPartName != null && wsdlPartName.length() > 0 && instanceDocumentsCopy.length == 1 && wsdlPartName.equals(instanceDocumentsCopy[0].getTagName()))
- {
- Vector childElements = new Vector();
- for (int i = 0; i < nl.getLength(); i++)
- {
- Node node = nl.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE)
- childElements.add(node);
- }
- instanceDocumentsCopy = (Element[])childElements.toArray(new Element[0]);
- }
- IXSDFragment elementTypeFragment = getXSDDelegationFragment();
- instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocumentsCopy, getName());
- return elementTypeFragment.setParameterValuesFromInstanceDocuments(setElementsTagName(instanceDocumentsCopy, elementTypeFragment.getName()));
- }
-
- public static String XSI_NIL_ATTRIBUTE = "xsi:nil";
- public static String TRUE = "true";
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
- {
-
- Element[] instanceDocuments = getXSDDelegationFragment().genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- if(isNil_){
- for(int j=0;j < instanceDocuments.length;j++){
- instanceDocuments[j].setAttribute(XSI_NIL_ATTRIBUTE,TRUE);
- NodeList nodeList = instanceDocuments[j].getChildNodes();
- int length = nodeList.getLength();
- for(int i =0;i < length;i++){
- instanceDocuments[j].removeChild(nodeList.item(0));
- }
- }
- }
- instanceDocuments = setElementsTagName(instanceDocuments, getInstanceDocumentTagName(namespaceTable));
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- String wsdlPartName = config.getWSDLPartName();
- if (config.getIsWSDLPart() && config.getStyle() == FragmentConstants.STYLE_RPC && wsdlPartName != null && wsdlPartName.length() > 0)
- {
- Element[] instanceDocumentsCopy = instanceDocuments;
- instanceDocuments = new Element[1];
- instanceDocuments[0] = doc.createElement(wsdlPartName);
- for (int i = 0; i < instanceDocumentsCopy.length; i++)
- {
- if (instanceDocumentsCopy[i] != null)
- instanceDocuments[0].appendChild(instanceDocumentsCopy[i]);
- }
- }
- return instanceDocuments;
- }
-
- protected boolean isInstanceNamespaceQualified()
- {
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- if (config.getPartEncoding() == FragmentConstants.ENCODING_LITERAL)
- {
- XSDElementDeclaration xsdElement = (XSDElementDeclaration)config.getXSDComponent();
- // Try to resolve the element, since an element with a ref can never be global
- if (xsdElement.getResolvedElementDeclaration() != null)
- xsdElement = xsdElement.getResolvedElementDeclaration();
-
- if (xsdElement.isGlobal())
- return true;
- else
- {
- if (xsdElement.isSetForm())
- return (xsdElement.getForm().getValue() == XSDForm.QUALIFIED);
- else
- return (xsdElement.getSchema().getElementFormDefault().getValue() == XSDForm.QUALIFIED);
- }
- }
- else
- return false;
- }
-
- protected String getInstanceDocumentTagName(Hashtable namespaceTable)
- {
- XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
- XSDElementDeclaration xsdElement = (XSDElementDeclaration)config.getXSDComponent();
- StringBuffer tagName = new StringBuffer();
- if (isInstanceNamespaceQualified())
- {
- String nsURI = null;
- // port to org.eclipse.xsd
- if (xsdElement.getResolvedElementDeclaration() != null)
- nsURI = xsdElement.getResolvedElementDeclaration().getTargetNamespace();
- else
- nsURI = xsdElement.getTargetNamespace();
- if (nsURI != null && nsURI.length() > 0)
- {
- String prefix = getPrefixFromNamespaceURI(nsURI, namespaceTable);
- tagName.append(prefix);
- tagName.append(FragmentConstants.COLON);
- }
- }
- String xsdElementName = xsdElement.getName();
- if (xsdElementName == null || xsdElementName.length() <= 0)
- {
- // port to org.eclipse.xsd
- if (xsdElement.getResolvedElementDeclaration() != null)
- xsdElementName = xsdElement.getResolvedElementDeclaration().getName();
- else
- xsdElementName = getName();
- }
- tagName.append(xsdElementName);
- return tagName.toString();
- }
-
- private boolean withinRange(int size)
- {
- if (size < minOccurs_)
- return false;
- if (maxOccurs_ != FragmentConstants.UNBOUNDED && size > maxOccurs_)
- return false;
- return true;
- }
-
- public void setMinOccurs(int minOccurs)
- {
- minOccurs_ = minOccurs;
- }
-
- public int getMinOccurs()
- {
- return minOccurs_;
- }
-
- public void setMaxOccurs(int maxOccurs)
- {
- maxOccurs_ = maxOccurs;
- }
-
- public int getMaxOccurs()
- {
- return maxOccurs_;
- }
-
- public boolean isNillable()
- {
- if(getXSDToFragmentConfiguration().getXSDComponent().getElement().getAttribute("nillable").equals("true"))
- return true;
- return false;
- }
-
- public boolean isNil()
- {
- return isNil_;
- }
-
-
- public String getNilID()
- {
- return getID() + IXSDElementFragment.NIL;
- }
-
- public String getInformationFragment()
- {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment()
- {
- return "/wsdl/fragment/XSDElementRFragmentJSP.jsp";
- }
-
- public String getWriteFragment()
- {
- return "/wsdl/fragment/XSDElementWFragmentJSP.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java
deleted file mode 100644
index ea2258d81..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDEmptyFragment extends XSDFragment {
- private int occurance_;
-
- public XSDEmptyFragment(String id, String name, XSDToFragmentConfiguration config) {
- super(id, name, config);
- occurance_ = 0;
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- String occurance = parser.getParameter(getID());
- try {
- occurance_ = Integer.parseInt(occurance);
- return validateAllParameterValues();
- }
- catch (Throwable t) {
- occurance_ = -1;
- return false;
- }
- }
-
- public void setParameterValues(String paramKey, String[] params) {
- }
-
- public void setParameterValues(String paramKey, Vector params) {
- }
-
- public String[] getParameterValues(String paramKey) {
- if (occurance_ < 0)
- return null;
- else {
- String[] params = new String[occurance_];
- for (int i = 0; i < params.length; i++) {
- params[i] = "";
- }
- return params;
- }
- }
-
- public String getParameterValue(String paramKey, int paramIndex) {
- if (paramIndex >= 0 && paramIndex < occurance_)
- return "";
- else
- return null;
- }
-
- public boolean validateAllParameterValues() {
- XSDToFragmentConfiguration xsdConfig = getXSDToFragmentConfiguration();
- int min = xsdConfig.getMinOccurs();
- int max = xsdConfig.getMaxOccurs();
- return (occurance_ >= 0 && occurance_ >= min && (max == FragmentConstants.UNBOUNDED || occurance_ <= max));
- }
-
- public boolean validateParameterValues(String paramKey) {
- return validateAllParameterValues();
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex) {
- return validateAllParameterValues();
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- boolean paramsValid = true;
- for (int i = 0; i < instanceDocumentsCopy.length; i++) {
- NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
- if (nodeList.getLength() > 1)
- paramsValid = false;
- else if (nodeList.getLength() != 0) {
- Node node = nodeList.item(0);
- if (node.getNodeType() != Node.TEXT_NODE || !isWhitespace(node.getNodeValue()))
- paramsValid = false;
- }
- }
- occurance_ = instanceDocumentsCopy.length;
- return paramsValid && validateAllParameterValues();
- }
-
- private boolean isWhitespace(String s) {
- char[] chars = s.toCharArray();
- for (int i = 0; i < chars.length; i++) {
- if (!Character.isWhitespace(chars[i]) || !Character.isSpaceChar(chars[i]))
- return false;
- }
- return true;
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDEmptyWFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDEmptyRFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java
deleted file mode 100644
index ab18a9910..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDForm;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class XSDFragment extends Fragment implements IXSDFragment
-{
- private XSDToFragmentConfiguration config_;
- private XSDTypeDefinition typeDef_;
- private int seed_;
-
- public XSDFragment(String id, String name, XSDToFragmentConfiguration config)
- {
- super(id, name);
- config_ = config;
- if (config_ != null)
- {
- XSDComponent component = config.getXSDComponent();
- if (component instanceof XSDTypeDefinition)
- typeDef_ = (XSDTypeDefinition)component;
- else
- typeDef_ = null;
- }
- seed_ = 0;
- }
-
- public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
- {
- config_ = config;
- if (config_ != null)
- {
- XSDComponent component = config.getXSDComponent();
- if (component instanceof XSDTypeDefinition)
- setXSDTypeDefinition((XSDTypeDefinition)component);
- }
- }
-
- public XSDToFragmentConfiguration getXSDToFragmentConfiguration()
- {
- return config_;
- }
-
- public void setXSDTypeDefinition(XSDTypeDefinition typeDef)
- {
- typeDef_ = typeDef;
- }
-
- public XSDTypeDefinition getXSDTypeDefinition()
- {
- return typeDef_;
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- String[] params = new String[instanceDocumentsCopy.length];
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- for (int i = 0; i < instanceDocumentsCopy.length; i++)
- {
- params[i] = "";
- NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
- if (nodeList.getLength() > 0)
- {
- Node node = nodeList.item(0);
- if (nodeList.getLength() > 1)
- paramsValid = false;
- if (node.getNodeType() != Node.TEXT_NODE)
- paramsValid = false;
- else
- params[i] = node.getNodeValue();
- }
- else
- paramsValid = false;
- }
- setParameterValues(getID(), params);
- return paramsValid && validateAllParameterValues();
- }
-
- protected Element[] getInstanceDocumentsByTagName(Element[] instanceDocuments, String tagName)
- {
- if (instanceDocuments == null)
- return new Element[0];
- Vector instancesCopy = new Vector();
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- if (instanceDocuments[i] == null)
- continue;
- String instanceTagName = trimPrefix(instanceDocuments[i].getTagName());
- if (instanceTagName.equals(tagName))
- instancesCopy.add(instanceDocuments[i]);
- }
- Element[] instances = new Element[instancesCopy.size()];
- instancesCopy.copyInto(instances);
- return instances;
- }
-
- protected String trimPrefix(String s)
- {
- String sCopy = new String(s);
- int colonIndex = sCopy.indexOf(FragmentConstants.COLON);
- if (colonIndex != -1 && colonIndex + 1 < sCopy.length() && !((String.valueOf(sCopy.charAt(colonIndex + 1))).equals(FragmentConstants.COLON)))
- sCopy = sCopy.substring(colonIndex + 1, sCopy.length());
- return sCopy;
- }
-
- public Element[] genInstanceDocumentsForNil(boolean genXSIType, Hashtable namespaceTable,Document doc){
- Element[] instanceDocuments = new Element[1];
- String tagName = getInstanceDocumentTagName(namespaceTable);
- for (int i = 0; i < instanceDocuments.length; i++) {
- Element instanceDocument = doc.createElement(tagName);
- instanceDocuments[i] = instanceDocument;
- }
- return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
-
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable,Document doc) {
- String[] params = getParameterValues(getID());
- if (params == null)
- return new Element[0];
- Element[] instanceDocuments = new Element[params.length];
- String tagName = getInstanceDocumentTagName(namespaceTable);
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- Element instanceDocument = doc.createElement(tagName);
- Node textNode = doc.createTextNode(params[i]);
- instanceDocument.appendChild(textNode);
- instanceDocuments[i] = instanceDocument;
- }
- return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
- }
-
- public Element setAttributesOnInstanceDocuments(Element instanceDocument,String attName){
- String[] params = getParameterValues(getID());
- if (params == null)
- return instanceDocument;
- if (isAttributeInstanceNamespaceQualified()){
- instanceDocument.setAttributeNS(config_.getXSDComponent().getSchema().getTargetNamespace(),attName,params[0]);
-
- }
- else instanceDocument.setAttribute(attName,params[0]);
-
- return instanceDocument;
- }
-
- public boolean setAttributeParamsFromInstanceDocuments(Node attribute){
- String[] params = new String[1];
- params[0] = attribute.getNodeValue();
- setParameterValues(getID(), params);
- return validateAllParameterValues();
- }
-
- public String genID()
- {
- StringBuffer newID = new StringBuffer();
- newID.append(getID());
- newID.append(FragmentConstants.ID_SEPERATOR);
- newID.append(seed_++);
- return newID.toString();
- }
-
- protected boolean isInstanceNamespaceQualified()
- {
- XSDSchema xsdSchema = config_.getXSDComponent().getSchema();
- return (!config_.getIsWSDLPart() && config_.getPartEncoding() == FragmentConstants.ENCODING_LITERAL && xsdSchema.getElementFormDefault().getValue() == XSDForm.QUALIFIED);
- }
-
- protected boolean isAttributeInstanceNamespaceQualified() {
- XSDSchema xsdSchema = config_.getXSDComponent().getSchema();
-
- return (!config_.getIsWSDLPart() &&
- config_.getPartEncoding() == FragmentConstants.ENCODING_LITERAL &&
- xsdSchema.getAttributeFormDefault().getValue() == XSDForm.QUALIFIED);
-
- }
-
-
-
- protected String getInstanceDocumentTagName(Hashtable namespaceTable) {
- StringBuffer tagName = new StringBuffer();
- if (isInstanceNamespaceQualified())
- {
- String nsURI = config_.getXSDComponent().getSchema().getTargetNamespace();
- String prefix = getPrefixFromNamespaceURI(nsURI, namespaceTable);
- tagName.append(prefix);
- tagName.append(FragmentConstants.COLON);
- }
- tagName.append(getName());
- return tagName.toString();
- }
-
- protected Element[] addXSIType(Element[] instanceDocuments, Hashtable namespaceTable)
- {
- XSDComponent xsdComponent = config_.getXSDComponent();
- if (instanceDocuments != null && (xsdComponent instanceof XSDNamedComponent))
- {
- String xsdComponentName = ((XSDNamedComponent)xsdComponent).getName();
- if (xsdComponentName != null && xsdComponentName.length() > 0)
- {
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- if (instanceDocuments[i] == null)
- continue;
- String xsiURI = FragmentConstants.URI_XSI;
- String xsiPrefix = getPrefixFromNamespaceURI(xsiURI, namespaceTable);
- String xsiTypeURI = xsdComponent.getSchema().getTargetNamespace();
- String xsiTypePrefix = getPrefixFromNamespaceURI(xsiTypeURI, namespaceTable);
- ;
- StringBuffer attrName = new StringBuffer();
- attrName.append(xsiPrefix);
- attrName.append(FragmentConstants.COLON);
- attrName.append(FragmentConstants.XSI_TYPE);
- StringBuffer attrValue = new StringBuffer();
- attrValue.append(xsiTypePrefix);
- attrValue.append(FragmentConstants.COLON);
- attrValue.append(xsdComponentName);
- instanceDocuments[i].setAttribute(attrName.toString(), attrValue.toString());
- }
- }
- }
- return instanceDocuments;
- }
-
- public boolean validateAllParameterValues()
- {
- if (!super.validateAllParameterValues())
- return false;
- String[] params = getParameterValues(getID());
- int length = (params != null) ? params.length : 0;
- int min = config_.getMinOccurs();
- int max = config_.getMaxOccurs();
- return (length >= min && (max == FragmentConstants.UNBOUNDED || length <= max));
- }
-
- protected String getPrefixFromNamespaceURI(String nsURI, Hashtable namespaceTable)
- {
- String prefix = (String)namespaceTable.get(nsURI);
- int i = 0;
- while (prefix == null || prefix.length() <= 0)
- {
- StringBuffer prefixCopy = new StringBuffer();
- prefixCopy.append(FragmentConstants.QNAME_PREFIX);
- prefixCopy.append(String.valueOf(i));
- i++;
- if (!namespaceTable.contains(prefixCopy.toString()))
- {
- namespaceTable.put(nsURI, prefixCopy.toString());
- prefix = prefixCopy.toString();
- }
- }
- return prefix;
- }
-
- protected Element setElementTagName(Element e, String tagName)
- {
- if (!e.getTagName().equals(tagName))
- {
- try
- {
- Document doc = e.getOwnerDocument();
- NodeList children = e.getChildNodes();
- NamedNodeMap attributes = e.getAttributes();
- Element eCopy = doc.createElement(tagName);
- for (int i = 0; i < children.getLength(); i++)
- {
- Node child = children.item(i);
- if (child != null)
- {
- eCopy.appendChild(child.cloneNode(true));
- }
- }
- for (int j = 0; j < attributes.getLength(); j++)
- {
- Node attr = attributes.item(j);
- if (attr != null && (attr instanceof Attr))
- {
- Attr attribute = (Attr)attr;
- eCopy.setAttribute(attribute.getName(), attribute.getValue());
- }
- }
- return eCopy;
- }
- catch (Exception exception)
- {
- }
- }
- return e;
- }
-
- protected Element[] setElementsTagName(Element[] e, String tagName)
- {
- Element[] eCopy = new Element[e.length];
- for (int i = 0; i < eCopy.length; i++)
- {
- eCopy[i] = setElementTagName(e[i], tagName);
- }
- return eCopy;
- }
-
- protected boolean internalEquals(Element[] instanceDocumentsCopy, Element[] instanceDocuments)
- {
- if (!config_.getIsWSDLPart())
- {
- int length = (instanceDocuments != null) ? instanceDocuments.length : 0;
- int lengthCopy = (instanceDocumentsCopy != null) ? instanceDocumentsCopy.length : 0;
- return (length == lengthCopy);
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java
deleted file mode 100644
index 66dd8969f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupAllFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-import org.w3c.dom.Element;
-
-public class XSDGroupAllFragment extends XSDGroupFragment implements IXSDGroupAllFragment {
- private String groupID_;
-
- public XSDGroupAllFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- groupID_ = null;
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- String groupID = parser.getParameter(getID());
- if (groupID_ != null && groupID != null && groupID_.equals(groupID)) {
- setGroupMemberIDsOrdering(parser.getParameterValues(groupID_));
- boolean valuesValid = true;
- IXSDFragment[] groupMemberFragments = getGroupMemberFragments(groupID_);
- for (int i = 0; i < groupMemberFragments.length; i++) {
- if (groupMemberFragments[i] != null && !groupMemberFragments[i].processParameterValues(parser))
- valuesValid = false;
- }
- return valuesValid;
- }
- else {
- groupID_ = null;
- removeGroupIDs();
- return true;
- }
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- removeGroupIDs();
- boolean paramsValid = true;
- if (instanceDocuments != null && instanceDocuments.length > 0) {
- groupID_ = createInstance();
- IXSDFragment[] groupMemberFrags = getGroupMemberFragments(groupID_);
- String[] groupMemberIDsOrder = new String[groupMemberFrags.length];
- int orderIndex = 0;
- for (int i = 0; i < instanceDocuments.length; i++) {
- boolean paramsAssigned = false;
- for (int j = 0; j < groupMemberFrags.length; j++) {
- if (groupMemberFrags[j] != null && groupMemberFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
- Element[] childInstance = {instanceDocuments[i]};
- if (!groupMemberFrags[j].setParameterValuesFromInstanceDocuments(childInstance))
- paramsValid = false;
- groupMemberIDsOrder[orderIndex] = groupMemberFrags[j].getID();
- orderIndex++;
- paramsAssigned = true;
- groupMemberFrags[j] = null;
- break;
- }
- }
- if (!paramsAssigned)
- paramsValid = false;
- }
- for (int k = 0; k < groupMemberFrags.length; k++) {
- if (groupMemberFrags[k] != null) {
- groupMemberIDsOrder[orderIndex] = groupMemberFrags[k].getID();
- orderIndex++;
- }
- }
- setGroupMemberIDsOrdering(groupMemberIDsOrder);
- }
- return paramsValid;
- }
-
- public String getGroupAllInstance() {
- if (groupID_ == null)
- groupID_ = createGroupInstance();
- return groupID_;
- }
-
- public String createInstance() {
- return getGroupAllInstance();
- }
-
- public boolean setGroupMemberIDsOrdering(String[] groupMemberIDs) {
- if (groupMemberIDs == null)
- return false;
- String[] existingGroupMemberIDs = getGroupMemberIDs(groupID_);
- if (existingGroupMemberIDs.length != groupMemberIDs.length)
- return false;
- Vector existingGroupMemberIDsVector = new Vector();
- for (int i = 0; i < existingGroupMemberIDs.length; i++) {
- existingGroupMemberIDsVector.add(existingGroupMemberIDs[i]);
- }
- for (int j = 0; j < groupMemberIDs.length; j++) {
- if (!existingGroupMemberIDsVector.remove(groupMemberIDs[j]))
- return false;
- }
- if (setFragmentsOrder(groupMemberIDs)) {
- setGroupMemberIDs(groupID_, groupMemberIDs);
- return true;
- }
- else
- return false;
- }
-
- public boolean moveUpGroupMemberID(String groupMemberID) {
- String[] groupMemberIDs = getGroupMemberIDs(groupID_);
- if (groupMemberID.equals(groupMemberIDs[0]))
- return false;
- for (int i = 1; i < groupMemberIDs.length; i++) {
- if (groupMemberID.equals(groupMemberIDs[i])) {
- groupMemberIDs[i] = groupMemberIDs[i - 1];
- groupMemberIDs[i - 1] = groupMemberID;
- if (setFragmentsOrder(groupMemberIDs)) {
- setGroupMemberIDs(groupID_, groupMemberIDs);
- return true;
- }
- else
- return false;
- }
- }
- return false;
- }
-
- public boolean moveDownGroupMemberID(String groupMemberID) {
- String[] groupMemberIDs = getGroupMemberIDs(groupID_);
- if (groupMemberID.equals(groupMemberIDs[groupMemberIDs.length - 1]))
- return false;
- for (int i = 0; i < groupMemberIDs.length - 1; i++) {
- if (groupMemberID.equals(groupMemberIDs[i])) {
- groupMemberIDs[i] = groupMemberIDs[i + 1];
- groupMemberIDs[i + 1] = groupMemberID;
- if (setFragmentsOrder(groupMemberIDs)) {
- setGroupMemberIDs(groupID_, groupMemberIDs);
- return true;
- }
- else
- return false;
- }
- }
- return false;
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java
deleted file mode 100644
index cc24e308a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupChoiceFixFragment extends XSDGroupChoiceFragment {
- public XSDGroupChoiceFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java
deleted file mode 100644
index f3adf0870..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupChoiceFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public abstract class XSDGroupChoiceFragment extends XSDGroupFragment implements IXSDGroupChoiceFragment {
- private XSDParticle[] choices_;
- private Hashtable choiceIndexes_;
-
- public XSDGroupChoiceFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- choices_ = null;
- choiceIndexes_ = new Hashtable();
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- super.processParameterValues(parser);
- String[] groupIDs = getGroupIDs();
- choiceIndexes_.clear();
- boolean paramsValid = true;
- for (int i = 0; i < groupIDs.length; i++) {
- String selectedChoiceFragID = parser.getParameter(groupIDs[i]);
- int choiceIndex = 0;
- IXSDFragment[] choiceFrags = getGroupMemberFragments(groupIDs[i]);
- for (int j = 0; j < choiceFrags.length; j++) {
- if (choiceFrags[j].getID().equals(selectedChoiceFragID)) {
- choiceIndex = j;
- paramsValid = (paramsValid && choiceFrags[j].validateAllParameterValues());
- break;
- }
- }
- setChoiceIndex(groupIDs[i], choiceIndex);
- }
- return paramsValid;
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- removeGroupIDs();
- choiceIndexes_.clear();
- boolean paramsValid = true;
- if (instanceDocuments != null) {
- for (int i = 0; i < instanceDocuments.length; i++) {
- String groupID = createGroupChoiceInstance(0);
- IXSDFragment[] choiceFrags = getGroupMemberFragments(groupID);
- for (int j = 0; j < choiceFrags.length; j++) {
- if (choiceFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
- XSDToFragmentConfiguration xsdConfig = choiceFrags[j].getXSDToFragmentConfiguration();
- Element[] childInstances = getInstanceDocumentPartition(instanceDocuments, i, xsdConfig.getMinOccurs(), xsdConfig.getMaxOccurs());
- if (!choiceFrags[j].setParameterValuesFromInstanceDocuments(childInstances))
- paramsValid = false;
- setChoiceIndex(groupID, j);
- if (childInstances.length > 0)
- i = i + childInstances.length - 1; // minus 1 because there's an i++ in the outer for loop
- break;
- }
- }
- }
- }
- return paramsValid;
- }
-
- private Element[] getInstanceDocumentPartition(Element[] instanceDocuments, int start, int minSize, int maxSize) {
- String tagName = instanceDocuments[start].getTagName();
- int size = 1;
- for (int i = start + 1; i < instanceDocuments.length; i++) {
- if (instanceDocuments[i].getTagName().equals(tagName))
- size++;
- else
- break;
- }
- if (maxSize != FragmentConstants.UNBOUNDED && size > maxSize) {
- size = size - minSize;
- if (size > maxSize)
- size = maxSize;
- }
- Element[] subset = new Element[size];
- for (int j = 0; j < subset.length; j++) {
- subset[j] = instanceDocuments[start + j];
- }
- return subset;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
- Vector instanceDocumentsCopy = new Vector();
- String[] groupIDs = getGroupIDs();
- for (int i = 0; i < groupIDs.length; i++) {
- IXSDFragment[] choiceFrags = getGroupMemberFragments(groupIDs[i]);
- int choiceIndex = getChoiceIndex(groupIDs[i]);
- Element[] choiceFragInstances = choiceFrags[choiceIndex].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- for (int j = 0; j < choiceFragInstances.length; j++) {
- instanceDocumentsCopy.add(choiceFragInstances[j]);
- }
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- instanceDocumentsCopy.copyInto(instanceDocuments);
- return instanceDocuments;
- }
-
- public XSDParticle[] getChoices() {
- if (choices_ == null) {
- EList particles = getXSDModelGroup().getParticles();
- choices_ = new XSDParticle[particles.size()];
- for (int i = 0; i < choices_.length; i++) {
- choices_[i] = (XSDParticle)particles.get(i);
- }
- }
- return choices_;
- }
-
- public String createGroupChoiceInstance(int choiceIndex) {
- getChoices();
- if (choiceIndex < 0 || choiceIndex > choices_.length - 1)
- return null;
- String groupID = createGroupInstance();
- setChoiceIndex(groupID, choiceIndex);
- return groupID;
- }
-
- public String createInstance() {
- return createGroupChoiceInstance(0);
- }
-
- public int getChoiceIndex(String groupID) {
- Integer index = (Integer)choiceIndexes_.get(groupID);
- if (index != null)
- return index.intValue();
- else
- return 0;
- }
-
- public void setChoiceIndex(String groupID, int choiceIndex) {
- choiceIndexes_.put(groupID, new Integer(choiceIndex));
- }
-
- public boolean validateAllParameterValues()
- {
- String[] groupIDs = getGroupIDs();
- for (int i = 0; i < groupIDs.length; i++)
- {
- int selectionIndex = getChoiceIndex(groupIDs[i]);
- if (!getGroupMemberFragments(groupIDs[i])[selectionIndex].validateAllParameterValues())
- return false;
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java
deleted file mode 100644
index 240e14d98..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupChoiceRangeFragment extends XSDGroupChoiceFragment {
- public XSDGroupChoiceRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java
deleted file mode 100644
index fda413307..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDWildcard;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public abstract class XSDGroupFragment extends XSDMapFragment implements IXSDGroupFragment {
- private XSDModelGroup xsdModelGroup_;
- private Vector groupIDsOrder_;
- private Hashtable groupIDs_;
-
- public XSDGroupFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller);
- xsdModelGroup_ = xsdModelGroup;
- groupIDsOrder_ = new Vector();
- groupIDs_ = new Hashtable();
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- boolean valuesValid = true;
- String[] params = parser.getParameterValues(getID());
- Vector frags = new Vector();
- Vector groupIDsOrderCopy = new Vector();
- Hashtable groupIDsCopy = new Hashtable();
- for (int i = 0; params != null && i < params.length; i++) {
- if (params[i] != null) {
- groupIDsOrderCopy.add(params[i]);
- groupIDsCopy.put(params[i], getGroupMemberIDs(params[i]));
- IXSDFragment[] groupMemberFragments = getGroupMemberFragments(params[i]);
- for (int j = 0; j < groupMemberFragments.length; j++) {
- if (groupMemberFragments[j] != null) {
- frags.add(groupMemberFragments[j]);
- if (!groupMemberFragments[j].processParameterValues(parser))
- valuesValid = false;
- }
- }
- }
- }
- groupIDsOrder_ = groupIDsOrderCopy;
- groupIDs_ = groupIDsCopy;
- removeAllFragments();
- addFragments(frags);
- return valuesValid;
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- removeGroupIDs();
- boolean paramsValid = true;
- String prevGroupID = null;
- String currGroupID = null;
- int groupMemberIndex = 0;
- for (int i = 0; i < instanceDocuments.length; ) {
- if (currGroupID == null) {
- String newGroupID = createInstance();
- prevGroupID = currGroupID;
- currGroupID = newGroupID;
- }
- Element[] instancePartition = null;
- int j = groupMemberIndex;
- boolean paramsAssigned = false;
- int wildcardFragIndex = -1;
- do {
- IXSDFragment[] groupMemberFrags = getGroupMemberFragments(currGroupID);
- XSDComponent xsdComponent = groupMemberFrags[j].getXSDToFragmentConfiguration().getXSDComponent();
- if (xsdComponent instanceof XSDWildcard) {
- if (wildcardFragIndex < 0)
- wildcardFragIndex = j;
- }
- else if (groupMemberFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
- instancePartition = getInstanceDocumentPartition(instanceDocuments, i, groupMemberFrags[j].getXSDToFragmentConfiguration().getMaxOccurs());
- if (!groupMemberFrags[j].setParameterValuesFromInstanceDocuments(instancePartition))
- paramsValid = false;
- paramsAssigned = true;
- }
- else if(groupMemberFrags[j] instanceof XSDGroupFragment) {
- groupMemberFrags[j].setParameterValuesFromInstanceDocuments(instanceDocuments);
- }
-
- if (j == groupMemberFrags.length - 1) {
- j = 0;
- String newGroupID;
- if (!paramsAssigned)
- newGroupID = createInstance();
- else
- newGroupID = null;
- prevGroupID = currGroupID;
- currGroupID = newGroupID;
- }
- else
- j++;
- } while (!paramsAssigned && j != groupMemberIndex);
- groupMemberIndex = j;
- if (!paramsAssigned) {
- instancePartition = getInstanceDocumentPartition(instanceDocuments, i, FragmentConstants.UNBOUNDED);
- if (wildcardFragIndex >= 0) {
- if (wildcardFragIndex >= groupMemberIndex) {
- removeGroupID(currGroupID);
- currGroupID = prevGroupID;
- }
- groupMemberIndex = wildcardFragIndex;
- IXSDFragment[] groupMemberFrags = getGroupMemberFragments(currGroupID);
- if (!groupMemberFrags[wildcardFragIndex].setParameterValuesFromInstanceDocuments(instancePartition))
- paramsValid = false;
- paramsAssigned = true;
- }
- else if (currGroupID != null && (prevGroupID == null || !currGroupID.equals(prevGroupID))) {
- paramsValid = false;
- removeGroupID(currGroupID);
- currGroupID = prevGroupID;
- }
- }
- i = i + instancePartition.length;
- }
- return paramsValid;
- }
-
- private Element[] getInstanceDocumentPartition(Element[] instanceDocuments, int start, int maxSize) {
- String tagName = instanceDocuments[start].getTagName();
- int size = 1;
- for (int i = start + 1; i < instanceDocuments.length; i++) {
- if (maxSize != FragmentConstants.UNBOUNDED && size >= maxSize)
- break;
- else if (instanceDocuments[i].getTagName().equals(tagName))
- size++;
- else
- break;
- }
- Element[] subset = new Element[size];
- for (int j = 0; j < subset.length; j++) {
- subset[j] = instanceDocuments[start + j];
- }
- return subset;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
- IXSDFragment[] groupMemberFragments = getAllFragments();
- Vector instanceDocumentsCopy = new Vector();
- for (int i = 0; i < groupMemberFragments.length; i++) {
- Element[] fragmentInstances = groupMemberFragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- for (int j = 0; j < fragmentInstances.length; j++) {
- instanceDocumentsCopy.add(fragmentInstances[j]);
- }
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- for (int k = 0; k < instanceDocuments.length; k++) {
- instanceDocuments[k] = (Element)instanceDocumentsCopy.get(k);
- }
- return instanceDocuments;
- }
-
- public void setXSDModelGroup(XSDModelGroup xsdModelGroup) {
- xsdModelGroup_ = xsdModelGroup;
- }
-
- public XSDModelGroup getXSDModelGroup() {
- return xsdModelGroup_;
- }
-
- public String[] getGroupIDs() {
- String[] groupIDs = new String[groupIDsOrder_.size()];
- for (int i = 0; i < groupIDs.length; i++) {
- groupIDs[i] = (String)groupIDsOrder_.get(i);
- }
- return groupIDs;
- }
-
- protected void removeGroupIDs() {
- removeAllFragments();
- groupIDsOrder_.clear();
- groupIDs_.clear();
- }
-
- protected void removeGroupID(String groupID) {
- String[] memberFragIDs = getGroupMemberIDs(groupID);
- removeFragments(memberFragIDs);
- groupIDsOrder_.remove(groupID);
- groupIDs_.remove(groupID);
- }
-
- protected void setGroupMemberIDs(String groupID, String[] groupMemberIDs) {
- if (groupID != null) {
- if (!groupIDsOrder_.contains(groupID))
- groupIDsOrder_.add(groupID);
- if (groupMemberIDs != null)
- groupIDs_.put(groupID, groupMemberIDs);
- else
- groupIDs_.put(groupID, new String[0]);
- }
- }
-
- protected void setGroupMemberFragments(String groupID, IXSDFragment[] groupMemberFragments) {
- addFragments(groupMemberFragments);
- String[] ids = new String[groupMemberFragments.length];
- for (int i = 0; i < ids.length; i++) {
- ids[i] = groupMemberFragments[i].getID();
- }
- setGroupMemberIDs(groupID, ids);
- }
-
- public String[] getGroupMemberIDs(String groupID) {
- if (groupID != null) {
- String[] groupMemberIDs = (String[])groupIDs_.get(groupID);
- if (groupMemberIDs != null)
- return groupMemberIDs;
- }
- return new String[0];
- }
-
- public IXSDFragment[] getGroupMemberFragments(String groupID) {
- String[] groupMemberIDs = getGroupMemberIDs(groupID);
- IXSDFragment[] groupMemberFragments = new IXSDFragment[groupMemberIDs.length];
- for (int i = 0; i < groupMemberFragments.length; i++) {
- groupMemberFragments[i] = getFragment(groupMemberIDs[i]);
- }
- return groupMemberFragments;
- }
-
- protected String createGroupInstance() {
- String groupID = genID();
- EList particles = getXSDModelGroup().getParticles();
- String[] groupMemberIDs = new String[particles.size()];
- for (int i = 0; i < particles.size(); i++) {
- XSDParticle xsdParticle = (XSDParticle)particles.get(i);
- XSDParticleContent xsdParticleContent = xsdParticle.getContent();
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- if (xsdParticleContent instanceof XSDComponent)
- xsdConfig.setXSDComponent((XSDComponent)xsdParticleContent);
- else
- xsdConfig.setXSDComponent(null);
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- groupMemberIDs[i] = genID();
- addFragment(groupMemberIDs[i], getXSDToFragmentController().getFragment(xsdConfig, groupMemberIDs[i], groupMemberIDs[i]));
- }
- setGroupMemberIDs(groupID, groupMemberIDs);
- return groupID;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java
deleted file mode 100644
index 7b0798460..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupSeqFixFragment extends XSDGroupSeqFragment {
- public XSDGroupSeqFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java
deleted file mode 100644
index c49b66176..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupSeqFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public abstract class XSDGroupSeqFragment extends XSDGroupFragment implements IXSDGroupSeqFragment {
- public XSDGroupSeqFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String createGroupSeqInstance() {
- return createGroupInstance();
- }
-
- public String createInstance() {
- return createGroupSeqInstance();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java
deleted file mode 100644
index e32d972bd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupSeqRangeFragment extends XSDGroupSeqFragment {
- public XSDGroupSeqRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
- super(id, name, config, controller, xsdModelGroup);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java
deleted file mode 100644
index 9c3a08d88..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDAttributeFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDMapFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public abstract class XSDMapFragment extends XSDFragment implements IXSDMapFragment {
- private XSDToFragmentController controller_;
- private Vector fragmentsOrder_;
- private Hashtable fragments_;
- private Hashtable attributeFragments_;
-
- public XSDMapFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config);
- controller_ = controller;
- fragmentsOrder_ = new Vector();
- fragments_ = new Hashtable();
- attributeFragments_ = new Hashtable();
- }
-
- public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
- boolean valuesValid = true;
- String[] params = parser.getParameterValues(getID());
- Vector frags = new Vector();
- Vector attfrags = new Vector();
- if (params != null) {
- for (int i = 0; i < params.length; i++) {
- if (params[i] != null) {
- IXSDFragment frag = getFragment(params[i]);
- if (frag != null) {
- frags.add(frag);
- if (!frag.processParameterValues(parser))
- valuesValid = false;
- }
- else {
- IXSDAttributeFragment afrag = getAttributeFragment(params[i]);
- if (afrag != null) {
- attfrags.add(afrag);
- if (!afrag.processParameterValues(parser))
- valuesValid = false;
- }
-
- }
-
- }
- }
- }
- removeAllFragments();
- removeAllAttributeFragments();
- addAttributeFragments(attfrags);
- addFragments(frags);
- return valuesValid;
- }
-
- public void setParameterValues(String paramKey, String[] params) {
- IXSDFragment frag = getFragment(paramKey);
- if (frag != null)
- frag.setParameterValues(paramKey, params);
- }
-
- public String[] getParameterValues(String paramKey) {
- IXSDFragment frag = getFragment(paramKey);
- return (frag != null) ? frag.getParameterValues(paramKey) : null;
- }
-
- public boolean validateAllParameterValues() {
- IXSDFragment[] fragments = getAllFragments();
- for (int i = 0; i < fragments.length; i++) {
- if (!fragments[i].validateAllParameterValues())
- return false;
- }
- return true;
- }
-
- public boolean validateParameterValues(String paramKey) {
- IXSDFragment frag = getFragment(paramKey);
- return (frag != null) ? frag.validateParameterValues(paramKey) : true;
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex) {
- IXSDFragment frag = getFragment(paramKey);
- return (frag != null) ? frag.validateParameterValue(paramKey, paramIndex) : true;
- }
-
- public void setXSDToFragmentController(XSDToFragmentController controller) {
- controller_ = controller;
- }
-
- public XSDToFragmentController getXSDToFragmentController() {
- return controller_;
- }
-
- protected void addFragment(String id, IXSDFragment frag) {
- addFragment(id, frag, true);
- }
-
- protected void addFragments(String[] id, IXSDFragment[] frags) {
- addFragments(id, frags, true);
- }
-
- protected void addFragment(IXSDFragment frag) {
- addFragment(frag, true);
- }
-
- protected void addFragments(IXSDFragment[] frags) {
- addFragments(frags, true);
- }
-
- protected void addFragments(Vector frags) {
- addFragments(frags, true);
- }
-
- protected void addFragment(String id, IXSDFragment frag, boolean addToController) {
- fragmentsOrder_.add(id);
- fragments_.put(id, frag);
- controller_.addToCache(id, frag);
- }
-
- protected void addAttributeFragment(String id, IXSDFragment frag) {
- attributeFragments_.put(id, frag);
- controller_.addToCache(id, frag);
- }
-
- public IXSDAttributeFragment[] getAllAttributeFragments() {
- IXSDAttributeFragment[] fragments = new XSDAttributeFragment[attributeFragments_.size()];
- Iterator it = attributeFragments_.values().iterator();
- int i = 0;
- while(it.hasNext()){
- fragments[i] = (IXSDAttributeFragment)it.next();
- i++;
- }
- return fragments;
- }
-
- protected void addFragments(String[] id, IXSDFragment[] frags, boolean addToController) {
- for (int i = 0; i < id.length && i < frags.length; i++) {
- addFragment(id[i], frags[i], addToController);
- }
- }
-
- protected void addFragment(IXSDFragment frag, boolean addToController) {
- addFragment(frag.getID(), frag, addToController);
- }
-
- protected void addFragments(IXSDFragment[] frags, boolean addToController) {
- for (int i = 0; i < frags.length; i++) {
- addFragment(frags[i].getID(), frags[i], addToController);
- }
- }
-
- protected void addFragments(Vector frags, boolean addToController) {
- Iterator it = frags.iterator();
- while (it.hasNext()) {
- Object obj = it.next();
- if (obj instanceof IXSDFragment) {
- IXSDFragment frag = (IXSDFragment)obj;
- addFragment(frag.getID(), frag, addToController);
- }
- }
- }
-
- protected void addAttributeFragments(Vector frags) {
- Iterator it = frags.iterator();
- while (it.hasNext()) {
- Object obj = it.next();
- if (obj instanceof IXSDAttributeFragment) {
- IXSDAttributeFragment frag = (IXSDAttributeFragment)obj;
- addAttributeFragment(frag.getID(), frag);
- }
- }
- }
-
- public String[] getFragmentsOrder() {
- String[] fragmentsOrder = new String[fragmentsOrder_.size()];
- for (int i = 0; i < fragmentsOrder.length; i++) {
- fragmentsOrder[i] = (String)fragmentsOrder_.get(i);
- }
- return fragmentsOrder;
- }
-
- protected boolean setFragmentsOrder(String[] fragmentsOrder) {
- if (fragmentsOrder.length != fragmentsOrder_.size())
- return false;
- Vector fragmentsOrderCopy = new Vector(fragmentsOrder_);
- for (int i = 0; i < fragmentsOrder.length; i++) {
- if (!fragmentsOrderCopy.remove(fragmentsOrder[i]))
- return false;
- }
- fragmentsOrder_.clear();
- for (int j = 0; j < fragmentsOrder.length; j++) {
- fragmentsOrder_.add(fragmentsOrder[j]);
- }
- return true;
- }
-
- public IXSDAttributeFragment getAttributeFragment(String id) {
- return (IXSDAttributeFragment)attributeFragments_.get(id);
- }
-
- public IXSDFragment getFragment(String id) {
- return (IXSDFragment)fragments_.get(id);
- }
-
- public IXSDFragment[] getFragments(String[] ids) {
- IXSDFragment[] frags = new IXSDFragment[ids.length];
- for (int i = 0; i < frags.length; i++) {
- frags[i] = getFragment(ids[i]);
- }
- return frags;
- }
-
- public IXSDFragment[] getAllFragments() {
- IXSDFragment[] fragments = new IXSDFragment[fragmentsOrder_.size()];
- for (int i = 0; i < fragmentsOrder_.size(); i++) {
- fragments[i] = getFragment((String)fragmentsOrder_.get(i));
- }
- return fragments;
- }
-
- protected void removeFragment(String id) {
- removeFragment(id, true);
- }
-
- protected void removeFragments(String[] ids) {
- removeFragments(ids, true);
- }
-
- protected void removeAllFragments() {
- removeAllFragments(true);
- }
-
- protected void removeFragment(String id, boolean removeFromController) {
- fragmentsOrder_.remove(id);
- fragments_.remove(id);
- if (removeFromController)
- controller_.removeFromCache(id);
- }
-
- protected void removeFragments(String[] ids, boolean removeFromController) {
- for (int i = 0; i < ids.length; i++) {
- removeFragment(ids[i], removeFromController);
- }
- }
-
- protected void removeAllFragments(boolean removeFromController) {
- if (removeFromController)
- {
- Enumeration ids = fragments_.keys();
- while (ids.hasMoreElements())
- {
- String id = (String)ids.nextElement();
- controller_.removeFromCache(id);
- }
- }
- fragmentsOrder_.clear();
- fragments_.clear();
- }
-
- protected void removeAllAttributeFragments() {
- Enumeration ids = attributeFragments_.keys();
- while (ids.hasMoreElements())
- {
- String id = (String)ids.nextElement();
- controller_.removeFromCache(id);
- }
-
- attributeFragments_.clear();
- }
-
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java
deleted file mode 100644
index 1579c6a6c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicDateTimeFixFragment extends XSDSimpleAtomicFixFragment {
- private int calendarType_;
- public XSDSimpleAtomicDateTimeFixFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType) {
- super(id, name, config);
- calendarType_ = calendarType;
- }
-
- public String getWriteFragment() {
- StringBuffer fragmentLink = new StringBuffer("/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp?");
- fragmentLink.append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType_);
- return fragmentLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java
deleted file mode 100644
index a7ce22df5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicDateTimeRangeFragment extends XSDSimpleAtomicRangeFragment {
- private int calendarType_;
- public XSDSimpleAtomicDateTimeRangeFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType) {
- super(id, name, config);
- calendarType_ = calendarType;
- }
-
- public String getWriteFragment() {
- StringBuffer fragmentLink = new StringBuffer("/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp?");
- fragmentLink.append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType_);
- return fragmentLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java
deleted file mode 100644
index 6ba3e9274..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-
-public class XSDSimpleAtomicEnumFixFragment extends XSDSimpleAtomicEnumFragment {
- public XSDSimpleAtomicEnumFixFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
- super(id, name, config, elist);
- }
-
- public XSDSimpleAtomicEnumFixFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
- {
- super(id, name, config, v);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java
deleted file mode 100644
index 0de9e8e18..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-import org.eclipse.xsd.XSDEnumerationFacet;
-
-public abstract class XSDSimpleAtomicEnumFragment extends XSDSimpleAtomicFragment {
- private OptionVector optionVector_;
- public XSDSimpleAtomicEnumFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
- super(id, name, config);
- optionVector_ = new OptionVector();
- for (int i=0;i<elist.size();i++)
- {
- String enumValue = ((XSDEnumerationFacet)elist.get(i)).getLexicalValue();
- optionVector_.addOption(enumValue,enumValue);
- }
- }
-
- public XSDSimpleAtomicEnumFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
- {
- super(id, name, config);
- optionVector_ = new OptionVector();
- for (int i=0;i<v.size();i++)
- optionVector_.addOption(v.getDisplayValue(i),v.getValue(i));
- }
-
- public final OptionVector getOptionVector()
- {
- return optionVector_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java
deleted file mode 100644
index 8de58f3dc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.OptionVector;
-
-public class XSDSimpleAtomicEnumRangeFragment extends XSDSimpleAtomicEnumFragment {
- public XSDSimpleAtomicEnumRangeFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
- super(id, name, config, elist);
- }
-
- public XSDSimpleAtomicEnumRangeFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
- {
- super(id, name, config, v);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java
deleted file mode 100644
index 328568c01..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicFixFragment extends XSDSimpleAtomicFragment {
- public XSDSimpleAtomicFixFragment(String id, String name, XSDToFragmentConfiguration config) {
- super(id, name, config);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java
deleted file mode 100644
index daa410fed..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleAtomicFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public abstract class XSDSimpleAtomicFragment extends XSDFragment implements IXSDSimpleAtomicFragment {
- public XSDSimpleAtomicFragment(String id, String name, XSDToFragmentConfiguration config) {
- super(id, name, config);
- }
-
- public boolean validateParameterValue(String paramKey, int paramIndex) {
- String param = getParameterValue(paramKey, paramIndex);
- if (param != null && !((XSDSimpleTypeDefinition)getXSDTypeDefinition()).isValidLiteral(param))
- return false;
- else
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java
deleted file mode 100644
index e575802e5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicRangeFragment extends XSDSimpleAtomicFragment {
- public XSDSimpleAtomicRangeFragment(String id, String name, XSDToFragmentConfiguration config) {
- super(id, name, config);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java
deleted file mode 100644
index aa3366f9e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleListFixFragment extends XSDSimpleListFragment {
- public XSDSimpleListFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java
deleted file mode 100644
index a6c6661b1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060217 127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleListFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDLengthFacet;
-import org.eclipse.xsd.XSDMaxLengthFacet;
-import org.eclipse.xsd.XSDMinLengthFacet;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import com.ibm.icu.util.StringTokenizer;
-
-public abstract class XSDSimpleListFragment extends XSDMapFragment implements IXSDSimpleListFragment
-{
- public XSDSimpleListFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller)
- {
- super(id, name, config, controller);
- }
-
- public void setName(String name)
- {
- super.setName(name);
- IXSDFragment[] fragments = getAllFragments();
- for (int i = 0; i < fragments.length; i++)
- {
- fragments[i].setName(name);
- }
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
- {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- String[] params = new String[instanceDocumentsCopy.length];
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- for (int i = 0; i < instanceDocumentsCopy.length; i++)
- {
- params[i] = "";
- NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
- if (nodeList.getLength() > 0)
- {
- Node node = nodeList.item(0);
- if (nodeList.getLength() > 1)
- paramsValid = false;
- if (node.getNodeType() != Node.TEXT_NODE)
- paramsValid = false;
- else
- params[i] = node.getNodeValue();
- }
- else
- paramsValid = false;
- }
- removeAllFragments();
- for (int i = 0; i < params.length; i++)
- {
- IXSDFragment childFrag = getFragment(createListInstance());
- StringTokenizer st = new StringTokenizer(params[i].trim());
- String[] childParams = new String[st.countTokens()];
- for (int j = 0; j < childParams.length; j++)
- {
- childParams[j] = st.nextToken();
- }
- childFrag.setParameterValues(childFrag.getID(), childParams);
- paramsValid = paramsValid && childFrag.validateAllParameterValues();
- }
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
- {
- IXSDFragment[] fragments = getAllFragments();
- Element[] instanceDocuments = new Element[fragments.length];
- String tagName = getInstanceDocumentTagName(namespaceTable);
- for (int i = 0; i < fragments.length; i++)
- {
- Element instanceDocument = doc.createElement(tagName);
- StringBuffer listValue = new StringBuffer();
- String[] params = fragments[i].getParameterValues(fragments[i].getID());
- for (int j = 0; params != null && j < params.length; j++)
- {
- if (j != 0)
- listValue.append(FragmentConstants.LIST_SEPERATOR);
- listValue.append(params[j]);
- }
- Node textNode = doc.createTextNode(listValue.toString());
- instanceDocument.appendChild(textNode);
- instanceDocuments[i] = instanceDocument;
- }
- return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
- }
-
- public String createListInstance()
- {
- String newID = genID();
- XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)getXSDTypeDefinition();
- int min = 0;
- int max = FragmentConstants.UNBOUNDED;
- XSDLengthFacet xsdLengthFacet = simpleType.getLengthFacet();
- // port to org.eclipse.xsd
- if (xsdLengthFacet != null)
- {
- min = xsdLengthFacet.getValue();
- max = xsdLengthFacet.getValue();
- }
- else
- {
- XSDMinLengthFacet xsdMinLengthFacet = simpleType.getMinLengthFacet();
- XSDMaxLengthFacet xsdMaxLengthFacet = simpleType.getMaxLengthFacet();
- // port to org.eclipse.xsd
- if (xsdMinLengthFacet != null)
- min = xsdMinLengthFacet.getValue();
- if (xsdMaxLengthFacet != null)
- max = xsdMaxLengthFacet.getValue();
- }
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- xsdConfig.setXSDComponent(simpleType.getItemTypeDefinition());
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- xsdConfig.setMinOccurs(min);
- xsdConfig.setMaxOccurs(max);
- IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, newID, getName());
- frag.setID(newID);
- frag.setName(getName());
- addFragment(newID, frag);
- return newID;
- }
-
- public String createInstance()
- {
- return createListInstance();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java
deleted file mode 100644
index 518584f96..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleListRangeFragment extends XSDSimpleListFragment {
- public XSDSimpleListRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java
deleted file mode 100644
index 732c93b32..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleUnionFixFragment extends XSDSimpleUnionFragment {
- public XSDSimpleUnionFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java
deleted file mode 100644
index e6fc81571..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleUnionFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public abstract class XSDSimpleUnionFragment extends XSDMapFragment implements IXSDSimpleUnionFragment {
- private XSDSimpleTypeDefinition[] memberTypes_;
-
- public XSDSimpleUnionFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- memberTypes_ = null;
- }
-
- public void setName(String name) {
- super.setName(name);
- IXSDFragment[] fragments = getAllFragments();
- for (int i = 0; i < fragments.length; i++) {
- fragments[i].setName(name);
- }
- }
-
- public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
- Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
- int numTypes = getMemberTypeDefinitions().length;
- boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
- Vector memberFragments = new Vector();
- for (int i = 0; i < instanceDocumentsCopy.length; i++) {
- IXSDFragment compatibleFrag = null;
- for (int j = 0; j < numTypes; j++) {
- IXSDFragment memberFrag = getFragment(createUnionInstance(j));
- Element[] memberInstanceDocument = new Element[1];
- memberInstanceDocument[0] = setElementTagName(instanceDocumentsCopy[i], memberFrag.getName());
- if (memberFrag.setParameterValuesFromInstanceDocuments(memberInstanceDocument)) {
- if (memberFrag.validateAllParameterValues()) {
- compatibleFrag = memberFrag;
- break;
- }
- else if (compatibleFrag == null)
- compatibleFrag = memberFrag;
- }
- }
- if (compatibleFrag != null)
- memberFragments.add(compatibleFrag);
- else
- paramsValid = false;
- }
- removeAllFragments();
- addFragments(memberFragments);
- return paramsValid;
- }
-
- public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
- IXSDFragment[] fragments = getAllFragments();
- Vector instanceDocumentsCopy = new Vector();
- for (int i = 0; i < fragments.length; i++) {
- Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
- if (fragmentInstances.length > 0)
- instanceDocumentsCopy.add(fragmentInstances[0]);
- }
- Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
- for (int i = 0; i < instanceDocuments.length; i++) {
- instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
- }
- return setElementsTagName(instanceDocuments, getInstanceDocumentTagName(namespaceTable));
- }
-
- public XSDSimpleTypeDefinition[] getMemberTypeDefinitions() {
- if (memberTypes_ == null) {
- EList memberTypes = ((XSDSimpleTypeDefinition)getXSDTypeDefinition()).getMemberTypeDefinitions();
- memberTypes_ = new XSDSimpleTypeDefinition[memberTypes.size()];
- for (int i = 0; i < memberTypes_.length; i++) {
- memberTypes_[i] = (XSDSimpleTypeDefinition)memberTypes.get(i);
- }
- }
- return memberTypes_;
- }
-
- public String createUnionInstance(int memberTypeIndex) {
- getMemberTypeDefinitions();
- if (memberTypeIndex < 0 || memberTypeIndex > memberTypes_.length - 1)
- return null;
- String newID = genID();
- XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
- XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
- xsdConfig.setXSDComponent(memberTypes_[memberTypeIndex]);
- xsdConfig.setStyle(thisConfig.getStyle());
- xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
- xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
- IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, newID, getName());
- frag.setID(newID);
- frag.setName(getName());
- addFragment(newID, frag);
- return newID;
- }
-
- public String createInstance() {
- return createUnionInstance(0);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java
deleted file mode 100644
index fd84b6dc8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleUnionRangeFragment extends XSDSimpleUnionFragment {
- public XSDSimpleUnionRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
- super(id, name, config, controller);
- }
-
- public String getInformationFragment() {
- return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
- }
-
- public String getReadFragment() {
- return "/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp";
- }
-
- public String getWriteFragment() {
- return "/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java
deleted file mode 100644
index 3965c8b45..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import java.util.Hashtable;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleAtomicFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleListFragment;
-import org.w3c.dom.Element;
-
-public class HTTPUtil
-{
- private HTTPUtil()
- {
- }
-
- public static String genURLEncodedParameters(IXSDFragment fragment)
- {
- if (fragment instanceof IXSDSimpleListFragment)
- return genURLEncodedParamsFromListFragment((IXSDSimpleListFragment)fragment);
- else if (fragment instanceof IXSDSimpleAtomicFragment)
- return genURLEncodedParamsFromAtomicFragment((IXSDSimpleAtomicFragment)fragment);
- else
- return genURLEncodedXMLParameters(fragment);
- }
-
- private static String genURLEncodedParamsFromAtomicFragment(IXSDSimpleAtomicFragment fragment)
- {
- StringBuffer urlEncodedParam = new StringBuffer();
- String[] params = fragment.getParameterValues(fragment.getID());
- for (int i = 0; i < params.length; i++)
- {
- urlEncodedParam.append(URLUtils.encode(fragment.getName()));
- urlEncodedParam.append("=");
- urlEncodedParam.append(URLUtils.encode(params[i]));
- if (i < params.length - 1)
- urlEncodedParam.append("&");
- }
- return urlEncodedParam.toString();
- }
-
- private static String genURLEncodedParamsFromListFragment(IXSDSimpleListFragment fragment)
- {
- StringBuffer urlEncodedParam = new StringBuffer();
- IXSDFragment[] childFrags = fragment.getAllFragments();
- for (int i = 0; i < childFrags.length; i++)
- {
- urlEncodedParam.append(URLUtils.encode(fragment.getName()));
- urlEncodedParam.append("=");
- String[] params = childFrags[i].getParameterValues(childFrags[i].getID());
- StringBuffer paramBuffer = new StringBuffer();
- for (int j = 0; j < params.length; j++)
- {
- paramBuffer.append(params[j]);
- if (j < params.length - 1)
- paramBuffer.append(FragmentConstants.LIST_SEPERATOR);
- }
- urlEncodedParam.append(URLUtils.encode(paramBuffer.toString()));
- if (i < childFrags.length - 1)
- urlEncodedParam.append("&");
- }
- return urlEncodedParam.toString();
- }
-
- private static String genURLEncodedXMLParameters(IXSDFragment fragment)
- {
- StringBuffer urlEncodedParam = new StringBuffer();
- Hashtable soapEnvelopeNamespaceTable = new Hashtable();
- soapEnvelopeNamespaceTable.put(Constants.URI_SOAP11_ENV, Constants.NS_PREFIX_SOAP_ENV);
- soapEnvelopeNamespaceTable.put(Constants.URI_2001_SCHEMA_XSI, Constants.NS_PREFIX_SCHEMA_XSI);
- soapEnvelopeNamespaceTable.put(Constants.URI_2001_SCHEMA_XSD, Constants.NS_PREFIX_SCHEMA_XSD);
- Element[] instanceDocuments = new Element[0];
- try
- {
- instanceDocuments = fragment.genInstanceDocumentsFromParameterValues(true, soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
- }
- catch (ParserConfigurationException pce)
- {
- }
- for (int i = 0; i < instanceDocuments.length; i++)
- {
- urlEncodedParam.append(URLUtils.encode(fragment.getName()));
- urlEncodedParam.append("=");
- urlEncodedParam.append(URLUtils.encode(XMLUtils.serialize(instanceDocuments[i], true)));
- if (i < instanceDocuments.length - 1)
- urlEncodedParam.append("&");
- }
- return urlEncodedParam.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java
deleted file mode 100644
index f7ae5b1ab..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import java.util.Vector;
-
-public class OptionVector
-{
- private Vector options_;
-
- public OptionVector()
- {
- options_ = new Vector();
- }
-
- public void addOption(String displayValue,String value)
- {
- options_.addElement(new Option(displayValue,value));
- }
-
- public String getDisplayValue(int position)
- {
- Option option = (Option)options_.elementAt(position);
- return option.getDisplayValue();
- }
-
- public String getValue(int position)
- {
- Option option = (Option)options_.elementAt(position);
- return option.getValue();
- }
-
- public int size()
- {
- return options_.size();
- }
-
- private final class Option
- {
- private String displayValue_;
- private String value_;
- public Option(String displayValue,String value)
- {
- displayValue_ = displayValue;
- value_ = value;
- }
-
- public final String getDisplayValue()
- {
- return displayValue_;
- }
-
- public final String getValue()
- {
- return value_;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java
deleted file mode 100644
index ac59e196d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class XSDTypeDefinitionUtil {
- private XSDTypeDefinitionUtil() {
- }
-
- public static boolean isXSDBuiltInTypeDefinition(XSDTypeDefinition type) {
- if (type == null)
- return false;
- String ns = type.getTargetNamespace();
- return (ns != null && ns.equals(FragmentConstants.URI_XSD));
- }
-
- public static boolean isRootTypeDefinition(XSDTypeDefinition type) {
- if (type == null)
- return true;
- XSDTypeDefinition baseType = type.getBaseType();
- if (baseType == null)
- return true;
- String typeNS = type.getTargetNamespace();
- String baseTypeNS = baseType.getTargetNamespace();
- String typeName = type.getName();
- String baseTypeName = baseType.getName();
- boolean sameNS;
- boolean sameName;
- if (typeNS == null && baseTypeNS == null)
- sameNS = true;
- else if (typeNS != null && baseTypeNS != null && typeNS.equals(baseTypeNS))
- sameNS = true;
- else
- sameNS = false;
- if (typeName == null && baseTypeName == null)
- sameName = true;
- else if (typeName != null && baseTypeName != null && typeName.equals(baseTypeName))
- sameName = true;
- else
- sameName = false;
- return (sameNS && sameName);
- }
-
- public static XSDTypeDefinition resolveToXSDBuiltInTypeDefinition(XSDTypeDefinition type) {
- if (type == null)
- return null;
- XSDTypeDefinition currType = type;
- while (!isXSDBuiltInTypeDefinition(currType)) {
- if (isRootTypeDefinition(currType))
- return null;
- currType = currType.getBaseType();
- }
- return currType;
- }
-
- public static boolean isSoapEncArray(XSDTypeDefinition type) {
- XSDTypeDefinition currType = type;
- if (currType != null)
- while(currType != null) {
- String ns = currType.getTargetNamespace();
- String name = currType.getName();
- if (FragmentConstants.URI_SOAP.equals(ns) && FragmentConstants.QNAME_LOCAL_NAME_ARRAY.equals(name))
- return true;
- else if (isRootTypeDefinition(currType))
- return false;
- else
- currType = currType.getBaseType();
- }
- return false;
- }
-
- /**
- * Returns the complex type content given a complex type.
- * If complexType is a user defined type:
- * This method will return the user defined complex content of this type or the content of the extended
- * or derived type iff the extended or derived type is not a built-in XSD type (for example, xsd:anyType).
- * If complexType is a built-in XSD type:
- * It will return the complex content of this built-in XSD complex type. It will not return the
- * complex content of its extended or derived type.
- * @param complexType XSDComplexTypeDefinition complex type.
- * @return XSDComplexTypeContent XSDComplexTypeContent the resolved complex type content.
- **/
- public static XSDComplexTypeContent getXSDComplexTypeContent(XSDComplexTypeDefinition complexType)
- {
- if (!isXSDBuiltInTypeDefinition(complexType))
- {
- XSDTypeDefinition type = complexType;
- while (!isXSDBuiltInTypeDefinition(type) && (type instanceof XSDComplexTypeDefinition))
- {
- XSDComplexTypeContent complexTypeContent = ((XSDComplexTypeDefinition)type).getContent();
- if (complexTypeContent != null)
- return complexTypeContent;
- if (isRootTypeDefinition(type))
- return null;
- type = type.getBaseType();
- }
- return null;
- }
- else
- return complexType.getContent();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java
deleted file mode 100644
index f0f38eea3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public abstract class DetailsTool extends FormTool {
-
- public String formLink_;
-
- public DetailsTool(ToolManager toolManager, String alt, String formLink) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- formLink_ = formLink;
- }
-
- protected void initDefaultProperties() {
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return formLink_;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java
deleted file mode 100644
index cf946981f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-
-public class InvokeWSDLOperationTool extends FormTool {
-
- private String fragmentViewID_;
- private String fragmentNameAnchorID_;
- private String endPoint_;
-
- public InvokeWSDLOperationTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsdl/images/invoke_wsdl_operation_enabled.gif", "wsdl/images/invoke_wsdl_operation_highlighted.gif", alt);
- fragmentViewID_ = FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM;
- fragmentNameAnchorID_ = null;
- endPoint_ = null;
- }
-
- protected void initDefaultProperties() {
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- StringBuffer formLink = new StringBuffer();
- formLink.append("wsdl/forms/InvokeWSDLOperationForm.jsp");
- String nameAnchorID = getFragmentNameAnchorID();
- if (nameAnchorID != null && nameAnchorID.length() > 0) {
- formLink.append("#");
- formLink.append(nameAnchorID);
- setFragmentNameAnchorID(null);
- }
- return formLink.toString();
- }
-
- public String getFormActionLink(int operationType,String fragmentViewID)
- {
- switch (operationType)
- {
- case WSDLOperationElement.OPERATION_TYPE_SOAP:
- if (fragmentViewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
- return "wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp";
- else
- return "wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp";
- case WSDLOperationElement.OPERATION_TYPE_HTTP_GET:
- return "wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp";
- case WSDLOperationElement.OPERATION_TYPE_HTTP_POST:
- default:
- return "wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp";
- }
- }
-
- public String getFragmentViewID() {
- return fragmentViewID_;
- }
-
- public void setFragmentViewID(String fragmentViewID) {
- fragmentViewID_ = fragmentViewID;
- }
-
- public String getFragmentNameAnchorID() {
- return fragmentNameAnchorID_;
- }
-
- public void setFragmentNameAnchorID(String fragmentNameAnchorID) {
- fragmentNameAnchorID_ = fragmentNameAnchorID;
- }
-
- public String getEndPoint()
- {
- return endPoint_;
- }
-
- public void setEndPoint(String endPoint)
- {
- endPoint_ = endPoint;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java
deleted file mode 100644
index 768c1fecc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class OpenWSDLTool extends FormTool {
-
- public OpenWSDLTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsdl/images/open_wsdl_enabled.gif", "wsdl/images/open_wsdl_highlighted.gif", alt);
- }
-
- protected void initDefaultProperties() {
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "wsdl/forms/OpenWSDLForm.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java
deleted file mode 100644
index 34f0afada..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-
-public class SOAPMessageQueue extends MessageQueue
-{
- private Vector cachedMessageList_;
-
- public SOAPMessageQueue()
- {
- super();
- cachedMessageList_ = new Vector();
- }
-
- public void clear()
- {
- cachedMessageList_.removeAllElements();
- messageList_.removeAllElements();
- }
-
- public String getMessagesFromList()
- {
- if (messageList_.size() == 0)
- copyMessages(cachedMessageList_,messageList_);
- else
- copyMessages(messageList_,cachedMessageList_);
- return super.getMessagesFromList();
- }
-
- private final void copyMessages(Vector sourceList,Vector destList)
- {
- for (int i=0;i<sourceList.size();i++)
- destList.addElement(sourceList.elementAt(i));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java
deleted file mode 100644
index ce9b0003e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLAddToFavoritesAction;
-
-public class WSDLAddToFavoritesTool extends ActionTool {
- public WSDLAddToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return WSDLAddToFavoritesAction.getActionLink(selectedNode.getNodeId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java
deleted file mode 100644
index a904796d2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLBindingDetailsTool extends DetailsTool {
-
- public WSDLBindingDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, alt, "wsdl/forms/WSDLBindingDetailsForm.jsp");
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java
deleted file mode 100644
index 92fc0931f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// WSDL binding node for the WSDL Navigator Tree View
-public class WSDLBindingNode extends WSDLNavigatorNode
-{
- public WSDLBindingNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_binding_node.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
- WSDLOperationNode wsdlOperationNode = new WSDLOperationNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(wsdlOperationNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- setVisibilityOfChildren(false);
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- new WSDLBindingDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_BINDING_DETAILS"));
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java
deleted file mode 100644
index faa810065..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLDetailsTool extends DetailsTool {
-
- public static final int FORM_VIEW_ID = 0;
- public static final int SOURCE_VIEW_ID = 1;
-
- private int viewId_;
-
- public WSDLDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, alt, "wsdl/forms/WSDLDetailsForm.jsp");
- viewId_ = FORM_VIEW_ID;
- }
-
- public int getViewId() {
- return viewId_;
- }
-
- public void setViewId(int viewId) {
- if (viewId == FORM_VIEW_ID || viewId == SOURCE_VIEW_ID)
- viewId_ = viewId;
- }
-
- public void toggleViewId() {
- if (viewId_ == FORM_VIEW_ID)
- viewId_ = SOURCE_VIEW_ID;
- else
- viewId_ = FORM_VIEW_ID;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java
deleted file mode 100644
index eb37d9117..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLImportWSDLToFileSystemAction;
-
-public class WSDLImportWSDLToFileSystemTool extends ImportToFileSystemTool {
- public WSDLImportWSDLToFileSystemTool(ToolManager toolManager,String alt) {
- super(toolManager,alt);
- }
-
- public final String getSelectToolActionHref(boolean forHistory) {
- Node node = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getActionLink() {
- Node node = toolManager_.getNode();
- return WSDLImportWSDLToFileSystemAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java
deleted file mode 100644
index d38524090..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class WSDLImportWSDLToWorkbenchTool extends ImportToWorkbenchTool {
- public WSDLImportWSDLToWorkbenchTool(ToolManager toolManager,String alt) {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node node = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getFormLink() {
- return "wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java
deleted file mode 100644
index 5f3e3be38..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class WSDLLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
- public WSDLLaunchWebServiceWizardTool(ToolManager toolManager,String alt) {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node node = toolManager_.getNode();
- return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
- }
-
- public final String getFormLink() {
- return "wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java
deleted file mode 100644
index 78773f2d8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// Root node for the WSDL Navigator Tree View
-public class WSDLMainNode extends WSDLNavigatorNode
-{
- public WSDLMainNode(TreeElement element,NodeManager nodeManager)
- {
- super(element,nodeManager,1,"images/root_main.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(WSDLModelConstants.REL_WSDL)) {
- WSDLNode wsdlNode = new WSDLNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(wsdlNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- new OpenWSDLTool(toolManager_, wsdlPerspective.getMessage("ALT_OPEN_WSDL"));
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java
deleted file mode 100644
index 5b7580faf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLNavigatorNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.ToggleWSDLNavigatorNodeAction;
-
-public abstract class WSDLNavigatorNode extends Node
-{
- public WSDLNavigatorNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
- {
- super(element,nodeManager,nodeDepth,imagePath);
- }
-
- // wsdl/actions/ToggleWSDLNavigatorNodeAction.jsp?nodeId=...
- public final String getToggleNodeActionHref()
- {
- return ToggleWSDLNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- // wsdl/actions/SelectWSDLNavigatorNodeAction.jsp?nodeId=...
- public final String getLinkActionHref()
- {
- return SelectWSDLNavigatorNodeAction.getActionLink(nodeId_,false);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java
deleted file mode 100644
index 5f1274cc9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// WSDL node for the WSDL Navigator Tree View
-public class WSDLNode extends WSDLNavigatorNode
-{
- public WSDLNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"images/wsdl.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
- WSDLServiceNode wsdlServiceNode = new WSDLServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(wsdlServiceNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- setVisibilityOfChildren(false);
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- new WSDLDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_DETAILS"));
- new WSDLImportWSDLToWorkbenchTool(toolManager_, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new WSDLImportWSDLToFileSystemTool(toolManager_, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new WSDLLaunchWebServiceWizardTool(toolManager_, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new WSDLAddToFavoritesTool(toolManager_, wsdlPerspective.getMessage("ALT_ADD_WSDL_TO_FAVORITES"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java
deleted file mode 100644
index 7c8e3c039..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-// WSDL operation node for the WSDL Navigator Tree View
-public class WSDLOperationNode extends WSDLNavigatorNode
-{
- public WSDLOperationNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_operation_node.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- }
- });
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- new InvokeWSDLOperationTool(toolManager_, wsdlPerspective.getMessage("ALT_INVOKE_WSDL_OPERATION"));
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java
deleted file mode 100644
index 361bd857f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.servlet.ServletContext;
-import javax.wsdl.Service;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SwitchPerspectiveFromWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.UpdateWSDLBindingAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLServiceElement;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-public class WSDLPerspective extends Perspective
-{
- public static final int STATUS_CONTENT_DEFAULT = 0;
- public static final int STATUS_CONTENT_RESULT_FORM = 1;
- public static final int STATUS_CONTENT_RESULT_SOURCE = 2;
-
- private BasicModel model_;
- private NodeManager nodeManager_;
- private String perspectiveContentFramesetCols_;
- private String savedPerspectiveContentFramesetCols_;
- private String actionsContainerFramesetRows_;
- private String savedActionsContainerFramesetRows_;
- private int statusContentType_;
-
- private SOAPMessageQueue soapRequestQueue_;
- private SOAPMessageQueue soapResponseQueue_;
- private Node operationNode_;
-
- static
- {
- // Initialize the XSD subsystem.
- (new ResourceFactoryRegistryImpl()).getExtensionToFactoryMap().put("xsd",new XSDResourceFactoryImpl());
- // port to org.eclipse.xsd
- // Init.init();
- EcorePackageImpl.init();
- XSDPackageImpl.init();
- }
-
- public WSDLPerspective(Controller controller)
- {
- super("wsdl",controller);
- }
-
- public final void initPerspective(ServletContext application)
- {
- model_ = new BasicModel("wsdlModel");
- TreeElement treeElement = new TreeElement(getMessage("NODE_NAME_WSDL_MAIN"), model_);
- model_.setRootElement(treeElement);
- nodeManager_ = new NodeManager(controller_);
- WSDLMainNode wsdlMainNode = new WSDLMainNode(treeElement, nodeManager_);
- nodeManager_.setRootNode(wsdlMainNode);
-
- // Starting frameset sizes.
- if (!DirUtils.isRTL())
- perspectiveContentFramesetCols_ = "30%,*";
- else
- perspectiveContentFramesetCols_ = "*,30%";
- savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
- actionsContainerFramesetRows_ = "75%,*";
- savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
-
- // Message status pane
- statusContentType_ = STATUS_CONTENT_DEFAULT;
- soapRequestQueue_ = new SOAPMessageQueue();
- soapResponseQueue_ = new SOAPMessageQueue();
- operationNode_ = null;
- }
-
- public final void preloadWSDL(String[] wsdlURLs) {
- if (wsdlURLs != null) {
- for (int i = 0; i < wsdlURLs.length; i++) {
- OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
- Hashtable propertyTable = openWSDLAction.getPropertyTable();
- String decodedWSDLURL = URLUtils.decode(wsdlURLs[i]);
- propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, decodedWSDLURL);
- openWSDLAction.run();
- }
- if (wsdlURLs.length > 0)
- controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
- }
- }
-
- public final void preloadEndpoints(String[] wsdlURLs, String[] endpoints)
- {
- if (wsdlURLs != null && wsdlURLs.length > 0 && endpoints != null && endpoints.length > 0)
- {
- String wsdlURL = wsdlURLs[0];
- Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
- for (Iterator wsdlNodesIterator = wsdlNodes.iterator(); wsdlNodesIterator.hasNext();)
- {
- Node wsdlNode = (Node)wsdlNodesIterator.next();
- if (wsdlNode.getNodeName().equals(wsdlURL))
- {
- Vector serviceNodes = wsdlNode.getChildNodes();
- for (Iterator serviceNodesIterator = serviceNodes.iterator(); serviceNodesIterator.hasNext();)
- {
- Node serviceNode = (Node)serviceNodesIterator.next();
- Vector bindingNodes = serviceNode.getChildNodes();
- String[] nodeIds = new String[bindingNodes.size()];
- for (int i = 0; i < nodeIds.length; i++)
- nodeIds[i] = String.valueOf(((Node)bindingNodes.get(i)).getNodeId());
- UpdateWSDLBindingAction action = new UpdateWSDLBindingAction(controller_);
- Hashtable propertyTable = new Hashtable();
- propertyTable.put(ActionInputs.NODEID, nodeIds);
- propertyTable.put(WSDLActionInputs.END_POINT, endpoints);
- action.setPropertyTable(propertyTable);
- action.execute(false);
- }
- return;
- }
- }
- }
- }
-
- public final void preselectServiceOrBinding(String[] wsdlURLs,String[] serviceQNameStrings,String[] bindingNameStrings)
- {
- if (wsdlURLs != null && wsdlURLs.length > 0)
- {
- String wsdlURL = wsdlURLs[0];
- if (serviceQNameStrings != null && serviceQNameStrings.length > 0)
- preselectService(wsdlURL,serviceQNameStrings[0]);
- else
- {
- if (bindingNameStrings != null && bindingNameStrings.length > 0)
- preselectBinding(wsdlURL,bindingNameStrings[0]);
- }
- }
- }
-
- private final void preselectService(String wsdlURL,String serviceQNameString)
- {
- Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
- for (int i=0;i<wsdlNodes.size();i++)
- {
- Node wsdlNode = (Node)wsdlNodes.elementAt(i);
- if (wsdlNode.getNodeName().equals(wsdlURL))
- {
- Vector serviceNodes = wsdlNode.getChildNodes();
- for (int j=0;j<serviceNodes.size();j++)
- {
- Node serviceNode = (Node)serviceNodes.elementAt(j);
- WSDLServiceElement serviceElement = (WSDLServiceElement)serviceNode.getTreeElement();
- Service service = serviceElement.getService();
- if (service.getQName().toString().equals(serviceQNameString))
- {
- nodeManager_.setSelectedNodeId(serviceNode.getNodeId());
- nodeManager_.makeSelectedNodeVisible();
- controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
- return;
- }
- }
- }
- }
- }
-
- private final void preselectBinding(String wsdlURL,String bindingNameString)
- {
- Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
- for (int i=0;i<wsdlNodes.size();i++)
- {
- Node wsdlNode = (Node)wsdlNodes.elementAt(i);
- if (wsdlNode.getNodeName().equals(wsdlURL))
- {
- Vector serviceNodes = wsdlNode.getChildNodes();
- for (int j=0;j<serviceNodes.size();j++)
- {
- Node serviceNode = (Node)serviceNodes.elementAt(j);
- Vector bindingNodes = serviceNode.getChildNodes();
- for (int k=0;k<bindingNodes.size();k++)
- {
- Node bindingNode = (Node)bindingNodes.elementAt(k);
- WSDLBindingElement bindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
- if (bindingElement.getBinding().getQName().toString().equals(bindingNameString))
- {
- nodeManager_.setSelectedNodeId(bindingNode.getNodeId());
- nodeManager_.makeSelectedNodeVisible();
- controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
- return;
- }
- }
- }
- }
- }
- }
-
- public NodeManager getNodeManager()
- {
- return nodeManager_;
- }
-
- public String getPerspectiveContentPage()
- {
- return "wsdl/wsdl_perspective_content.jsp";
- }
-
- public int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSDL;
- }
-
- public String getPanesFile()
- {
- return "wsdl/scripts/wsdlpanes.jsp";
- }
-
- public String getFramesetsFile()
- {
- return "wsdl/scripts/wsdlframesets.jsp";
- }
-
- public String getProcessFramesetsForm()
- {
- return "wsdl/forms/ProcessWSDLFramesetsForm.jsp";
- }
-
- public String getTreeContentVar()
- {
- return "wsdlNavigatorContent";
- }
-
- public String getTreeContentPage()
- {
- return "wsdl/wsdl_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar()
- {
- return "wsdlPropertiesContainer";
- }
-
- public String getPropertiesContainerPage()
- {
- return "wsdl/wsdl_properties_container.jsp";
- }
-
- public String getStatusContentVar()
- {
- return "wsdlStatusContent";
- }
-
- public String getStatusContentPage()
- {
- return "wsdl/wsdl_status_content.jsp";
- }
-
- public final String getPerspectiveContentFramesetCols()
- {
- return perspectiveContentFramesetCols_;
- }
-
- public final void setPerspectiveContentFramesetCols(String cols)
- {
- perspectiveContentFramesetCols_ = cols;
- }
-
- public final void setSavedPerspectiveContentFramesetCols(String cols)
- {
- savedPerspectiveContentFramesetCols_ = cols;
- }
-
- public final String getSavedPerspectiveContentFramesetCols()
- {
- return savedPerspectiveContentFramesetCols_;
- }
-
- public final String getActionsContainerFramesetRows()
- {
- return actionsContainerFramesetRows_;
- }
-
- public final void setActionsContainerFramesetRows(String rows)
- {
- actionsContainerFramesetRows_ = rows;
- }
-
- public final void setSavedActionsContainerFramesetRows(String rows)
- {
- savedActionsContainerFramesetRows_ = rows;
- }
-
- public final String getSavedActionsContainerFramesetRows()
- {
- return savedActionsContainerFramesetRows_;
- }
-
- public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- return SwitchPerspectiveFromWSDLAction.getFormActionLink(targetPerspectiveId,forHistory);
- }
-
- public final int getStatusContentType()
- {
- return statusContentType_;
- }
-
- public final void setStatusContentType(int statusContentType)
- {
- statusContentType_ = statusContentType;
- }
-
- public final SOAPMessageQueue getSOAPRequestQueue()
- {
- return soapRequestQueue_;
- }
-
- public final SOAPMessageQueue getSOAPResponseQueue()
- {
- return soapResponseQueue_;
- }
-
- public final Node getOperationNode()
- {
- return operationNode_;
- }
-
- public final void setOperationNode(Node operationNode)
- {
- operationNode_ = operationNode;
- }
-
- public final String getSOAPEnvelopeXMLLink(int soapEnvelopeType)
- {
- StringBuffer link = new StringBuffer("wsdl/soap_envelope_xml.jsp?");
- link.append(WSDLActionInputs.SOAP_ENVELOPE_TYPE).append('=').append(soapEnvelopeType);
- return link.toString();
- }
-
- public final String getBindingTypeString(int bindingType)
- {
- switch (bindingType)
- {
- case BindingTypes.SOAP:
- return getMessage("FORM_LABEL_BINDING_TYPE_SOAP");
- case BindingTypes.HTTP_GET:
- return getMessage("FORM_LABEL_BINDING_TYPE_HTTP_GET");
- case BindingTypes.HTTP_POST:
- return getMessage("FORM_LABEL_BINDING_TYPE_HTTP_POST");
- default:
- return getMessage("FORM_LABEL_BINDING_TYPE_UNSUPPORTED");
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java
deleted file mode 100644
index ec1fef231..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLServiceDetailsTool extends DetailsTool {
-
- public WSDLServiceDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, alt, "wsdl/forms/WSDLServiceDetailsForm.jsp");
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java
deleted file mode 100644
index e562300a7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-
-// WSDL service node for the WSDL Navigator Tree View
-public class WSDLServiceNode extends WSDLNavigatorNode
-{
- public WSDLServiceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
- {
- super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_service_node.gif");
- element.addListener(new ElementAdapter()
- {
- public void relAdded(RelAddEvent event)
- {
- String rel = event.getOutBoundRelName();
- if (rel.equals(WSDLModelConstants.REL_WSDL_BINDING)) {
- WSDLBindingNode wsdlBindingNode = new WSDLBindingNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(wsdlBindingNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event)
- {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_BINDING)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_BINDING)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- setVisibilityOfChildren(false);
- }
-
- protected final void initTools()
- {
- Controller controller = nodeManager_.getController();
- WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
- new WSDLServiceDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_SERVICE_DETAILS"));
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java
deleted file mode 100644
index 13de69907..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transformer;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Part;
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class FragmentTransformer implements ITransformer
-{
- protected Controller controller;
-
- public FragmentTransformer(Controller controller)
- {
- this.controller = controller;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- StringBuffer sb = new StringBuffer();
- sb.append("<root>");
- WSDLOperationElement operElement = (WSDLOperationElement)controller.getWSDLPerspective().getNodeManager().getSelectedNode().getTreeElement();
- Iterator it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = (IXSDFragment)operElement.getFragment(part);
- Element[] elements = new Element[0];
- try
- {
- elements = frag.genInstanceDocumentsFromParameterValues(!operElement.isUseLiteral(), new Hashtable(), XMLUtils.createNewDocument(null));
- }
- catch (ParserConfigurationException pce)
- {
- }
- for (int i = 0; i < elements.length; i++)
- sb.append(XMLUtils.serialize(elements[i], true));
- }
- sb.append("</root>");
- properties.put(FragmentConstants.SOURCE_CONTENT, sb.toString());
- return properties;
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- String source = (String) properties.get(FragmentConstants.SOURCE_CONTENT);
- if (source != null)
- {
- try
- {
- Element root = XMLUtils.stringToElement(source);
- if (root != null)
- {
- NodeList childNodes = root.getChildNodes();
- Vector childrenVector = new Vector();
- for (int i = 0; i < childNodes.getLength(); i++)
- {
- Node child = childNodes.item(i);
- if (child instanceof Element)
- childrenVector.add(child);
- }
- Element[] children = (Element[])childrenVector.toArray(new Element[0]);
- WSDLOperationElement operElement = (WSDLOperationElement) controller.getWSDLPerspective().getNodeManager().getSelectedNode().getTreeElement();
- Iterator it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext())
- {
- Part part = (Part)it.next();
- IXSDFragment frag = (IXSDFragment)operElement.getFragment(part);
- frag.setParameterValuesFromInstanceDocuments(children);
- }
- }
- }
- catch (Throwable t)
- {
- }
- }
- return properties;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java
deleted file mode 100644
index 1ea28a1e9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ChunkedInputStream extends FilterInputStream
-{
- protected long chunkSize = 0l;
- protected volatile boolean closed = false;
- private static final int maxCharLong = (Long.toHexString(Long.MAX_VALUE)).toString().length();
-
- private ChunkedInputStream()
- {
- super(null);
- }
-
- public ChunkedInputStream(InputStream is)
- {
- super(is);
- }
-
- public int read() throws IOException
- {
- byte[] d = new byte[1];
- int rc = read(d, 0, 1);
- return rc > 0 ? (d[0] & 0xFF) : rc;
- }
-
- public int read(byte[] b) throws IOException
- {
- return read(b, 0, b.length);
- }
-
- public synchronized int read(byte[] b, int off, int len) throws IOException
- {
- if (closed)
- return -1;
-
- int totalread = 0;
- int bytesread = 0;
- try
- {
- do
- {
- if (chunkSize < 1L)
- {
- if (0l == getChunked())
- {
- if (totalread == 0)
- return -1;
- else
- return totalread;
- }
- }
- bytesread = in.read(b, off + totalread, Math.min(len - totalread, (int) Math.min(chunkSize, Integer.MAX_VALUE)));
- if (bytesread > 0)
- {
- totalread += bytesread;
- chunkSize -= bytesread;
- }
- }
- while (len - totalread > 0 && bytesread > -1);
- }
- catch (IOException e)
- {
- closed = true;
- throw e;
- }
- return totalread;
- }
-
- public long skip(final long n) throws IOException
- {
- if (closed)
- return 0;
- long skipped = 0l;
- byte[] b = new byte[1024];
- int bread = -1;
- do
- {
- bread = read(b, 0, b.length);
- if (bread > 0)
- skipped += bread;
- }
- while (bread != -1 && skipped < n);
- return skipped;
- }
-
- public int available() throws IOException
- {
- if (closed)
- return 0;
- int rc = (int) Math.min(chunkSize, Integer.MAX_VALUE);
- return Math.min(rc, in.available());
- }
-
- protected long getChunked() throws IOException
- {
- //StringBuffer buf= new StringBuffer(1024);
- byte[] buf = new byte[maxCharLong + 2];
- int bufsz = 0;
- chunkSize = -1L;
- int c = -1;
- do
- {
- c = in.read();
- if (c > -1)
- {
- if (c != '\r' && c != '\n' && c != ' ' && c != '\t')
- {
- buf[bufsz++] = ((byte) c);
- }
- }
- }
- while (c > -1 && (c != '\n' || bufsz == 0) && bufsz < buf.length);
- if (c < 0)
- {
- closed = true;
- }
- String sbuf = new String(buf, 0, bufsz);
- if (bufsz > maxCharLong)
- {
- closed = true;
- throw new IOException("Chunked input stream failed to receive valid chunk size:" + sbuf);
- }
- try
- {
- chunkSize = Long.parseLong(sbuf, 16);
- }
- catch (NumberFormatException ne)
- {
- closed = true;
- throw new IOException("'" + sbuf + "' " + ne.getMessage());
- }
- if (chunkSize < 1L)
- closed = true;
- if (chunkSize != 0L && c < 0)
- {
- //If chunk size is zero try and be tolerant that there maybe no cr or lf
- // at the end.
- throw new IOException("HTTP Chunked stream closed in middle of chunk.");
- }
- if (chunkSize < 0L)
- throw new IOException("HTTP Chunk size received " + chunkSize + " is less than zero.");
- return chunkSize;
- }
-
- public void close() throws IOException
- {
- synchronized (this)
- {
- if (closed)
- return;
- closed = true;
- }
- byte[] b = new byte[1024];
- int bread = -1;
- do
- {
- bread = read(b, 0, b.length);
- }
- while (bread != -1);
- }
-
- /*
- * public void mark(int readlimit)
- * {
- * }
- */
-
- public void reset() throws IOException
- {
- throw new IOException("Don't support marked streams");
- }
-
- public boolean markSupported()
- {
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java
deleted file mode 100644
index 5cfe0ca26..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-public class HTTPResponse
-{
- private boolean statusSet;
- private int statusCode;
- private String statusMessage;
- private Hashtable headers;
- private byte[] payload;
-
- public HTTPResponse()
- {
- reset();
- }
-
- public void reset()
- {
- statusSet = false;
- statusCode = -1;
- statusMessage = null;
- if (headers != null)
- headers.clear();
- else
- headers = new Hashtable();
- payload = new byte[0];
- }
-
- public boolean isStatusSet()
- {
- return statusSet;
- }
-
- public int getStatusCode()
- {
- return statusCode;
- }
-
- public void setStatusCode(int statusCode)
- {
- statusSet = true;
- this.statusCode = statusCode;
- }
-
- public String getStatusMessage()
- {
- return statusMessage;
- }
-
- public void setStatusMessage(String statusMessage)
- {
- this.statusMessage = statusMessage;
- }
-
- public void addHeader(String key, String value)
- {
- headers.put(key, value);
- }
-
- public String getHeader(String key)
- {
- return (String) headers.get(key);
- }
-
- public Map getHeaders()
- {
- return headers;
- }
-
- public byte[] getPayload()
- {
- return payload;
- }
-
- public void setPayload(byte[] payload)
- {
- this.payload = payload;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java
deleted file mode 100644
index 4527d117a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060131 125777 jesper@selskabet.org - Jesper S Moller
- * 20060222 118019 andyzhai@ca.ibm.com - Andy Zhai
- * 20060222 128564 jesper@selskabet.org - Jesper S Moller
- * 20060823 99034 makandre@ca.ibm.com - Andrew Mak, WSE support for basic-authenticating firewalls
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.Hashtable;
-import javax.net.ssl.SSLSocketFactory;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.transport.HTTPTransportException;
-import org.w3c.dom.Element;
-import sun.misc.BASE64Encoder;
-
-public class HTTPTransport
-{
- private final String SYS_PROP_HTTPS_PROXY_HOST = "https.proxyHost";
- private final String SYS_PROP_HTTPS_PROXY_PORT = "https.proxyPort";
- private final String SYS_PROP_HTTPS_NON_PROXY_HOSTS = "https.nonProxyHosts";
- private final String SYS_PROP_HTTP_PROXY_HOST = "http.proxyHost";
- private final String SYS_PROP_HTTP_PROXY_PORT = "http.proxyPort";
- private final String SYS_PROP_HTTP_PROXY_USER_NAME = "http.proxyUserName";
- private final String SYS_PROP_HTTP_PROXY_PASSWORD = "http.proxyPassword";
- private final String SYS_PROP_HTTP_NON_PROXY_HOSTS = "http.nonProxyHosts";
-
- private final String HTTP_METHOD = "POST";
- private final String HTTP_CONNECT = "CONNECT";
- private final String HTTP_VERSION_1_0 = "HTTP/1.0";
- private final String HTTP_VERSION = "HTTP/1.1";
- private final String HTTP_HEADER_SOAP_ACTION = "SOAPAction";
- public static final String HTTP_HEADER_AUTH = "Authorization";
- public static final String HTTP_HEADER_WWW_AUTH = "WWW-Authenticate";
- private final String HTTP_HEADER_PROXY_AUTH = "Proxy-authorization";
- private final String HTTP_HEADER_COOKIE = "Cookie";
- private final String HTTP_HEADER_COOKIE2 = "Cookie2";
- private final String HTTP_HEADER_HOST = "Host";
- private final String HTTP_HEADER_CONTENT_TYPE = "Content-Type";
- public static final String HTTP_HEADER_CONTENT_LENGTH = "Content-Length";
- private final String HTTP_HEADER_ACCEPT = "Accept";
- private final String HTTP_HEADER_USER_AGENT = "User-Agent";
- private final String HTTP_HEADER_CACHE_CONTROL = "Cache-Control";
- private final String HTTP_HEADER_PRAGMA = "Pragma";
- private final String HTTP_HEADER_TRANSFER_ENCODEING = "Transfer-Encoding";
- private final String HTTP_HEADER_CONNECTION = "Connection";
-
- private final int HTTP_CODE_CONTINUE = 100;
- private final int HTTP_CODE_OK = 200;
- private final int HTTP_CODE_EXCEPTION = 300;
-
- private final String IBM_WEB_SERVICES_EXPLORER = "IBM Web Services Explorer";
- private final String TEXT_XML = "text/xml";
- private final String CONTENT_TYPE_VALUE = "text/xml; charset=utf-8";
- private final String ACCEPT_VALUE = "application/soap+xml, application/dime, multipart/related, text/*";
- public static final String BASIC = "Basic";
- private final String NO_CACHE = "no-cache";
- private final String CHUNKED = "chunked";
- private final String CLOSE = "close";
- private final String HTTPS = "https";
- private final char QUOTE = '\"';
- public static final char COLON = ':';
- private final char SPACE = ' ';
- private final char TAB = '\t';
- private final char R = '\r';
- private final char N = '\n';
- private final char ROOT = '/';
- private final String NEW_LINE = "\r\n";
- private final String EMPTY_STRING = "";
-
- private final int DEFAULT_HTTP_PORT = 80;
- private final int DEFAULT_HTTPS_PORT = 443;
- private final String DEFAULT_SOAP_ENCODING = "UTF-8";
- private final String DEFAULT_HTTP_HEADER_ENCODING = "iso-8859-1";
- private final boolean DEFAULT_CASE_SENSITIVE_FOR_HOST_NAME = false;
-
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
- private boolean maintainSession = false;
- private String cookie;
- private String cookie2;
- private HTTPResponse httpResponse;
-
- public String getHttpBasicAuthUsername()
- {
- return httpBasicAuthUsername;
- }
-
- public void setHttpBasicAuthUsername(String httpBasicAuthUsername)
- {
- this.httpBasicAuthUsername = httpBasicAuthUsername;
- }
-
- public String getHttpBasicAuthPassword()
- {
- return httpBasicAuthPassword;
- }
-
- public void setHttpBasicAuthPassword(String httpBasicAuthPassword)
- {
- this.httpBasicAuthPassword = httpBasicAuthPassword;
- }
-
- private String getMethod(URL url)
- {
- StringBuffer sb = new StringBuffer(HTTP_METHOD);
- sb.append(SPACE);
- String protocol = url.getProtocol();
- String httpProxyHost = System.getProperty(SYS_PROP_HTTP_PROXY_HOST);
- String httpsProxyHost = System.getProperty(SYS_PROP_HTTPS_PROXY_HOST);
- if (protocol.equalsIgnoreCase("http") && httpProxyHost != null && httpProxyHost.length() > 0)
- {
- sb.append(url.toString());
- }
- else if (protocol.equalsIgnoreCase("https") && httpsProxyHost != null && httpsProxyHost.length() > 0)
- {
- sb.append(url.toString());
- }
- else
- {
- String file = url.getFile();
- if (file != null && file.length() > 0)
- sb.append(file);
- else
- sb.append(ROOT);
- }
- sb.append(SPACE);
- sb.append(HTTP_VERSION);
- sb.append(NEW_LINE);
- return sb.toString();
- }
-
- private String getHost(URL url)
- {
- StringBuffer sb = new StringBuffer(HTTP_HEADER_HOST);
- sb.append(COLON);
- sb.append(SPACE);
- sb.append(url.getHost());
- sb.append(COLON);
- int port = url.getPort();
- if (port > 0)
- sb.append(String.valueOf(port));
- else if (url.getProtocol().equalsIgnoreCase(HTTPS))
- sb.append(DEFAULT_HTTPS_PORT);
- else
- sb.append(DEFAULT_HTTP_PORT);
- sb.append(NEW_LINE);
- return sb.toString();
- }
-
- private String getContentType()
- {
- return getHTTPHeader(HTTP_HEADER_CONTENT_TYPE, CONTENT_TYPE_VALUE);
- }
-
- private String getContentLength(byte[] payloadAsBytes)
- {
- return getHTTPHeader(HTTP_HEADER_CONTENT_LENGTH, String.valueOf(payloadAsBytes.length));
- }
-
- private String getSOAPAction(String soapAction)
- {
- StringBuffer sb = new StringBuffer(HTTP_HEADER_SOAP_ACTION);
- sb.append(COLON);
- sb.append(SPACE);
- sb.append(QUOTE);
- if (soapAction != null)
- sb.append(soapAction);
- sb.append(QUOTE);
- sb.append(NEW_LINE);
- return sb.toString();
- }
-
- private String getCookie()
- {
- if (maintainSession)
- return getHTTPHeader(HTTP_HEADER_COOKIE, cookie);
- else
- return EMPTY_STRING;
- }
-
- private String getCookie2()
- {
- if (maintainSession)
- return getHTTPHeader(HTTP_HEADER_COOKIE2, cookie2);
- else
- return EMPTY_STRING;
- }
-
- private String getWWWAuthentication()
- {
- if (httpBasicAuthUsername != null && httpBasicAuthPassword != null)
- {
- StringBuffer sb = new StringBuffer(httpBasicAuthUsername);
- sb.append(COLON);
- sb.append(httpBasicAuthPassword);
- BASE64Encoder encoder = new BASE64Encoder();
- String encodedUserNamePassword = encoder.encode(sb.toString().getBytes());
- sb.setLength(0);
- sb.append(HTTP_HEADER_AUTH);
- sb.append(COLON);
- sb.append(SPACE);
- sb.append(BASIC);
- sb.append(SPACE);
- sb.append(encodedUserNamePassword);
- sb.append(NEW_LINE);
- return sb.toString();
- }
- else
- return EMPTY_STRING;
- }
-
- private String getProxyAuthentication()
- {
- String proxyUserName = System.getProperty(SYS_PROP_HTTP_PROXY_USER_NAME);
- String proxyPassword = System.getProperty(SYS_PROP_HTTP_PROXY_PASSWORD);
- if (proxyUserName != null && proxyPassword != null)
- {
- StringBuffer sb = new StringBuffer(proxyUserName);
- sb.append(COLON);
- sb.append(proxyPassword);
- BASE64Encoder encoder = new BASE64Encoder();
- String encodedUserNamePassword = encoder.encode(sb.toString().getBytes());
- sb.setLength(0);
- sb.append(HTTP_HEADER_PROXY_AUTH);
- sb.append(COLON);
- sb.append(SPACE);
- sb.append(BASIC);
- sb.append(SPACE);
- sb.append(encodedUserNamePassword);
- sb.append(NEW_LINE);
- return sb.toString();
- }
- else
- return EMPTY_STRING;
- }
-
- private String getAccept()
- {
- return getHTTPHeader(HTTP_HEADER_ACCEPT, ACCEPT_VALUE);
- }
-
- private String getUserAgent()
- {
- return getHTTPHeader(HTTP_HEADER_USER_AGENT, IBM_WEB_SERVICES_EXPLORER);
- }
-
- private String getCacheControl()
- {
- return getHTTPHeader(HTTP_HEADER_CACHE_CONTROL, NO_CACHE);
- }
-
- private String getPragma()
- {
- return getHTTPHeader(HTTP_HEADER_PRAGMA, NO_CACHE);
- }
-
- private String getConnection()
- {
- return getHTTPHeader(HTTP_HEADER_CONNECTION, CLOSE);
- }
-
- private String getHTTPHeader(String key, String value)
- {
- if (value != null)
- {
- StringBuffer sb = new StringBuffer(key);
- sb.append(COLON);
- sb.append(SPACE);
- sb.append(value);
- sb.append(NEW_LINE);
- return sb.toString();
- }
- else
- return EMPTY_STRING;
- }
-
- public void send(URL url, String soapAction, String payload) throws UnknownHostException, IOException
- {
- byte[] payloadAsUTF8 = payload.getBytes(DEFAULT_SOAP_ENCODING);
-
- StringBuffer httpHeader = new StringBuffer();
- httpHeader.append(getMethod(url));
- httpHeader.append(getHost(url));
- httpHeader.append(getContentType());
- httpHeader.append(getContentLength(payloadAsUTF8));
- httpHeader.append(getAccept());
- httpHeader.append(getUserAgent());
- httpHeader.append(getCacheControl());
- httpHeader.append(getPragma());
- httpHeader.append(getSOAPAction(soapAction));
- httpHeader.append(getWWWAuthentication());
- httpHeader.append(getProxyAuthentication());
- httpHeader.append(getCookie());
- httpHeader.append(getCookie2());
- httpHeader.append(getConnection());
- httpHeader.append(NEW_LINE); // new line between the HTTP header and the payload
- Socket socket = buildSocket(url);
- InputStream is = socket.getInputStream();
- OutputStream os = socket.getOutputStream();
- os.write(httpHeader.toString().getBytes(DEFAULT_HTTP_HEADER_ENCODING));
- os.write(payloadAsUTF8);
- os.flush();
- httpResponse = new HTTPResponse();
- readHTTPResponseHeader(is, httpResponse);
- int code = httpResponse.getStatusCode();
- if (code == HTTP_CODE_CONTINUE)
- {
- httpResponse.reset();
- readHTTPResponseHeader(is, httpResponse);
- }
- readHTTPResponsePayload(is, httpResponse);
- os.close();
- is.close();
- socket.close();
- code = httpResponse.getStatusCode();
- String contentType = httpResponse.getHeader(HTTP_HEADER_CONTENT_TYPE.toLowerCase());
- if (code >= HTTP_CODE_EXCEPTION && (contentType == null || contentType.toLowerCase().indexOf(TEXT_XML.toLowerCase()) == -1))
- throw new HTTPTransportException(code, httpResponse.getStatusMessage(), httpResponse.getHeaders());
- }
-
- private void readHTTPResponseHeader(InputStream is, HTTPResponse resp) throws IOException
- {
- byte b = 0;
- int len = 0;
- int colonIndex = -1;
- String key;
- String value;
- boolean readTooMuch = false;
- ByteArrayOutputStream baos;
- for (baos = new ByteArrayOutputStream(4096);;)
- {
- if (!readTooMuch)
- b = (byte)is.read();
- if (b == -1)
- break;
- readTooMuch = false;
- if ((b != R) && (b != N))
- {
- if ((b == COLON) && (colonIndex == -1))
- colonIndex = len;
- len++;
- baos.write(b);
- }
- else if (b == R)
- continue;
- else // b == N
- {
- if (len == 0)
- break;
- b = (byte)is.read();
- readTooMuch = true;
- // A space or tab at the begining of a line means the header continues.
- if ((b == SPACE) || (b == TAB))
- continue;
- baos.close();
- byte[] bArray = baos.toByteArray();
- baos.reset();
- if (colonIndex != -1)
- {
- key = new String(bArray, 0, colonIndex, DEFAULT_HTTP_HEADER_ENCODING);
- value = new String(bArray, colonIndex + 1, len - 1 - colonIndex, DEFAULT_HTTP_HEADER_ENCODING);
- colonIndex = -1;
- }
- else
- {
- key = new String(bArray, 0, len, DEFAULT_HTTP_HEADER_ENCODING);
- value = EMPTY_STRING;
- }
- if (!resp.isStatusSet())
- {
- // Reader status code
- int start = key.indexOf(SPACE) + 1;
- String s = key.substring(start).trim();
- int end = s.indexOf(SPACE);
- if (end != -1)
- s = s.substring(0, end);
- try
- {
- resp.setStatusCode(Integer.parseInt(s));
- }
- catch (NumberFormatException nfe)
- {
- resp.setStatusCode(-1);
- }
- resp.setStatusMessage(key.substring(start + end + 1));
- }
- else
- resp.addHeader(key.toLowerCase().trim(), value.trim());
- len = 0;
- }
- }
- baos.close();
- }
-
- private void readHTTPResponsePayload(InputStream is, HTTPResponse resp) throws IOException
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try
- {
- byte b = (byte)is.read();
- while (b != -1)
- {
- baos.write(b);
- b = (byte)is.read();
- }
- }
- catch (SocketTimeoutException ste)
- {
- }
- baos.close();
- resp.setPayload(baos.toByteArray());
- }
-
- /**
- * Receives the bytes from the last web service invocation. This is used by WSE's default
- * SOAP transport.
- *
- * @return A byte array.
- * @throws IOException
- */
- byte[] receiveBytes() throws IOException
- {
- if (httpResponse != null)
- {
- byte[] payload = httpResponse.getPayload();
- if (CHUNKED.equalsIgnoreCase(httpResponse.getHeader(HTTP_HEADER_TRANSFER_ENCODEING.toLowerCase())))
- {
- ByteArrayInputStream bais = new ByteArrayInputStream(payload);
- ChunkedInputStream cis = new ChunkedInputStream(bais);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte b;
- while ((b = (byte)cis.read()) != -1)
- baos.write(b);
- baos.close();
- cis.close();
- bais.close();
- return baos.toByteArray();
- }
- else
- {
- return payload;
- }
- }
- return null;
- }
-
- /**
- * This method is deprecated after WSE swtiches to using a pluggable transport via enhancement 176493.
- * The core functionality of this method is refactored to the receiveBytes() method.
- *
- * @deprecated
- */
- public BufferedReader receive()
- {
- try
- {
- byte[] payload = receiveBytes();
- if (payload != null) {
- Element soapEnvelope = XMLUtils.byteArrayToElement(payload, false);
- // remove XML namespace declaration
- if (soapEnvelope != null)
- return new BufferedReader(new InputStreamReader(new ByteArrayInputStream(XMLUtils.serialize(soapEnvelope, true).getBytes(DEFAULT_SOAP_ENCODING)), DEFAULT_SOAP_ENCODING));
- }
- }
- catch (Throwable t)
- {
- }
- return null;
- }
-
- public Hashtable getHeaders()
- {
- Hashtable headers = new Hashtable();
- if (httpResponse != null)
- headers.putAll(httpResponse.getHeaders());
- return headers;
- }
-
- /**
- * Builds the first line of a connection request to the proxy server
- *
- * @param url The URL that we want to ultimately connect to.
- * @return A string of the form "CONNECT &lt;hostname&gt;:&lt;port&gt; HTTP/1.0".
- */
- private StringBuffer getConnectMethod(URL url) {
-
- StringBuffer sb = new StringBuffer(HTTP_CONNECT);
- sb.append(SPACE);
- sb.append(url.getHost());
- sb.append(COLON);
- sb.append(url.getPort());
- sb.append(SPACE);
- sb.append(HTTP_VERSION_1_0);
- sb.append(NEW_LINE);
- return sb;
- }
-
- /**
- * Construct a socket to the proxy server which be used to tunnel through.
- *
- * @param url The URL that we want to ultimately connect to.
- * @param proxyHost The proxy host.
- * @param proxyPort The proxy port.
- * @return A connected socket to the proxy server.
- * @throws IOException
- */
- private Socket buildTunnelSocket(URL url, String proxyHost, int proxyPort) throws IOException {
-
- StringBuffer httpHeader = new StringBuffer();
- httpHeader.append(getConnectMethod(url));
- httpHeader.append(getProxyAuthentication());
- httpHeader.append(NEW_LINE);
-
- Socket tunnel = new Socket(proxyHost, proxyPort);
-
- InputStream is = tunnel.getInputStream();
- OutputStream os = tunnel.getOutputStream();
-
- os.write(httpHeader.toString().getBytes(DEFAULT_HTTP_HEADER_ENCODING));
- os.flush();
-
- HTTPResponse httpResponse = new HTTPResponse();
- readHTTPResponseHeader(is, httpResponse);
-
- int code = httpResponse.getStatusCode();
-
- // ensure we are successfully connected to the proxy
- if (code != HTTP_CODE_OK)
- throw new HTTPTransportException(code, httpResponse.getStatusMessage(), httpResponse.getHeaders());
-
- return tunnel;
- }
-
- private Socket buildSocket(URL url) throws UnknownHostException, IOException
- {
- Socket s = null;
- String host = url.getHost();
- int port = url.getPort();
- String proxyHost = System.getProperty(SYS_PROP_HTTP_PROXY_HOST);
- int proxyPort = Integer.getInteger(SYS_PROP_HTTP_PROXY_PORT, DEFAULT_HTTP_PORT).intValue();
-
- String nonProxyHosts = System.getProperty(SYS_PROP_HTTP_NON_PROXY_HOSTS);
-
- // String proxyUserName = System.getProperty(SYS_PROP_HTTP_PROXY_USER_NAME);
- // String proxyPassword = System.getProperty(SYS_PROP_HTTP_PROXY_PASSWORD);
- if (url.getProtocol().equalsIgnoreCase(HTTPS))
- {
- proxyHost = System.getProperty(SYS_PROP_HTTPS_PROXY_HOST);
- proxyPort = Integer.getInteger(SYS_PROP_HTTPS_PROXY_PORT, DEFAULT_HTTPS_PORT).intValue();
- nonProxyHosts = System.getProperty(SYS_PROP_HTTPS_NON_PROXY_HOSTS);
-
- if (proxyHost != null && proxyHost.length() > 0 && !isHostInNonProxyHosts(host, nonProxyHosts, DEFAULT_CASE_SENSITIVE_FOR_HOST_NAME))
- {
- // SSL with proxy server
- Socket tunnel = buildTunnelSocket(url, proxyHost, proxyPort);
- s = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(tunnel, host, port, true);
- }
- else
- s = SSLSocketFactory.getDefault().createSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT));
- // Removing dependency on soap.jar
- // s = SSLUtils.buildSSLSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT), proxyHost, proxyPort);
- // TODO:
- // Build an SSL socket that supports proxyUser and proxyPassword,
- // as demonstrated in the following (original) line of code:
- // s = SSLUtils.buildSSLSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT), proxyHost, proxyPort, proxyUserName, proxyPassword);
- }
- else if (proxyHost != null && proxyHost.length() > 0 && !isHostInNonProxyHosts(host, nonProxyHosts, DEFAULT_CASE_SENSITIVE_FOR_HOST_NAME))
- s = new Socket(proxyHost, proxyPort);
- else
- s = new Socket(host, (port > 0 ? port : DEFAULT_HTTP_PORT));
- return s;
- }
-
- private boolean isHostInNonProxyHosts(String host, String nonProxyHosts, boolean caseSensitive)
- {
- if (caseSensitive) return host.matches(createPatternFromString(nonProxyHosts));
- else return host.toLowerCase().matches(createPatternFromString(nonProxyHosts.toLowerCase()));
- }
-
- /*
- * This method is used to generate a valid regular expression for a
- * normal java String used in the proxy mechanism.
- * For example, the http.nonProxyHosts contains following String:
- * "192.168.2.*|localhost|*.ibm.com" . It would be
- * transformed into: "192\.168\.2\.\w*|localhost|\w*\.ibm\.com"
- * Thus, following host string would match above pattern:
- * 192.168.2.5 192.168.2. 192.168.2.666 192.168.2.w
- * localhost
- * torolab.ibm.com .ibm.com 123.ibm.com
- *
- * Two transformations are done:
- * 1. replace all "." into "\." As in regular expression, '.' represents
- * any charater. "\.' represents the real character '.'
- * 2. In order to get the real meaning of "*" used in property
- * http.nonProxyHosts, "\w*" is used to replace "*"
- * "\w" represent a word character: [a-zA-Z_0-9]
- *
- * Restriction:
- * The validity of address is not checked.
- * (192.168.2.555 and 192.168.2.com are OK)
- *
- * TODO check whether * occurs in address or hostname.
- * if it occuus in address representation, replace "*" with "\d*"
- * and check: value < 256 ?
- */
- private String createPatternFromString(String str)
- {
- /* This is the same as following more understandable way:
- * return str.replace(".", "\\.").replace("*", "\\w*");
- * But, replace(CharSequence target, CharSequence replacement) can only be
- * supported after j2se 1.5, on the other hand,
- * replaceAll(String regex, String replacement) can be supported before
- * j2se 1.5.
- */
- return str == null ? null : str.replaceAll("\\.", "\\.").replaceAll("\\*", "\\w*");
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java
deleted file mode 100644
index ddef31857..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPMessageProcessor.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Operation;
-import javax.wsdl.Part;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.SoapHelper;
-import org.eclipse.wst.ws.internal.explorer.transport.IDeserializer;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-import org.eclipse.wst.ws.internal.explorer.transport.ISerializer;
-import org.eclipse.wst.ws.internal.explorer.transport.MessageContext;
-import org.eclipse.wst.ws.internal.explorer.transport.TransportException;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * This class provides implementation for WSE default SOAP transport's ISerializer and IDeserializer.
- */
-public class SOAPMessageProcessor implements ISerializer, IDeserializer {
-
- private static final String LITERAL = "literal";
- private static final String DEFAULT_SOAP_ENCODING = "UTF-8";
- private static final String LINE_SEPARATOR = System.getProperties().getProperty("line.separator");
-
- /*
- * Constructor.
- */
- SOAPMessageProcessor() {}
-
- /*
- * Join the encodingStyles into a space separated string
- */
- private String joinEncodingStyles(List list) {
-
- if (list.isEmpty())
- return null;
-
- StringBuffer sb = new StringBuffer();
-
- Iterator iter = list.iterator();
- while (iter.hasNext())
- sb.append(" ").append(iter.next());
-
- return sb.substring(1).toString();
- }
-
- /*
- * Retrieves the encoding information from the binding for the selected operation.
- * This method is called only for RPC style bindings. Two pieces of information are returned:
- * If the use is encoded, this method returns the encoding namespace in element [0] and the
- * encoding style(s) in element [1]. If the use is literal, then both values will be null.
- */
- private String[] getEncodingInfo(MessageContext context) {
-
- String[] info = new String[] { null, null };
-
- Iterator iter = context.getBindingOperation().getBindingInput()
- .getExtensibilityElements().iterator();
-
- // look for the soapbind:body extensilibity element
- while (iter.hasNext()) {
- ExtensibilityElement e = (ExtensibilityElement) iter.next();
- if (!(e instanceof SOAPBody))
- continue;
-
- SOAPBody soapBody = (SOAPBody) e;
-
- // use="encoded"
- if (!LITERAL.equals(soapBody.getUse())) {
- info[0] = soapBody.getNamespaceURI();
- info[1] = joinEncodingStyles(soapBody.getEncodingStyles());
- }
-
- break;
- }
-
- // namespace not specified on the soapbind:body element, use the definition's
- if (info[0] == null)
- info[0] = context.getDefinition().getTargetNamespace();
-
- return info;
- }
-
- /*
- * WS-I: In a rpc-literal SOAP binding, the serialized child element of the
- * soap:Body element consists of a wrapper element, whose namespace is the value
- * of the namespace attribute of the soapbind:body element and whose local name is
- * either the name of the operation or the name of the operation suffixed
- * with "Response". The namespace attribute is required, as opposed to being
- * optional, to ensure that the children of the soap:Body element are namespace-
- * qualified.
- */
- private Element createRPCWrapper(Document document, MessageContext context, Hashtable namespaceTable) {
-
- String encodingNamespaceURI = getEncodingInfo(context)[0];
-
- return SoapHelper.createRPCWrapperElement(
- document,
- namespaceTable,
- encodingNamespaceURI,
- context.getBindingOperation().getOperation().getName(),
- null);
- }
-
- /*
- * Initializes the contents of new ISOAPMessage.
- */
- void initMessage(ISOAPMessage message) throws TransportException {
-
- try {
- Document document = XMLUtils.createNewDocument(null);
-
- Hashtable namespaceTable = new Hashtable();
- SoapHelper.addDefaultSoapEnvelopeNamespaces(namespaceTable);
-
- message.setEnvelope(SoapHelper.createSoapEnvelopeElement(document, namespaceTable));
- message.setHeader(SoapHelper.createSoapHeaderElement(document));
-
- Element body = SoapHelper.createSoapBodyElement(document);
- if (!message.getMessageContext().isDocumentStyle()) {
- Element rpcWrapper = createRPCWrapper(document, message.getMessageContext(), namespaceTable);
- body.appendChild(rpcWrapper);
- }
- message.setBody(body);
-
- message.setNamespaceTable(namespaceTable);
- }
- catch (ParserConfigurationException e) {
- throw new TransportException(e);
- }
- }
-
- /*
- * Returns the first element with the given local name from the soap envelope namespace
- * This method can be used on elements that are not namespace aware, but we have to give
- * it a namespace table to look up prefixes.
- */
- private Element getSOAPElement(Element root, String localName, Map namespaceTable) {
- String prefix = (String) namespaceTable.get(Constants.URI_SOAP11_ENV);
- if (prefix == null)
- return null;
-
- NodeList list = root.getElementsByTagName(prefix + ":" + localName);
- if (list.getLength() == 0)
- return null;
-
- return (Element) list.item(0);
- }
-
- /*
- * Returns the first element with the given local name from the soap envelope namespace.
- * This version assume the elements are namespace aware.
- */
- private Element getSOAPElementNS(Element root, String localName) {
- NodeList list = root.getElementsByTagNameNS(Constants.URI_SOAP11_ENV, localName);
- if (list.getLength() == 0)
- return null;
-
- return (Element) list.item(0);
- }
-
- /*
- * Convert a NodeList to a vector of elements, nodes which are not elements are skipped.
- */
- private Vector toElementVector(NodeList nodes) {
-
- Vector vector = new Vector();
-
- for (int i = 0; i < nodes.getLength(); i++) {
- Node node = nodes.item(i);
- if (node instanceof Element)
- vector.add(node);
- }
-
- return vector;
- }
-
- /*
- * Convert a NodeList to an array of elements, nodes which are not elements are skipped.
- */
- private Element[] toElementArray(NodeList nodes) {
- Vector vector = toElementVector(nodes);
- Element[] elements = new Element[vector.size()];
- vector.copyInto(elements);
- return elements;
- }
-
- // Serialize ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- /*
- * adds the encoding style attribute to the each element in the given array.
- * noop if encodingStyle is null
- */
- private void addEncodingStyle(Element[] elements, String encodingStyle) {
-
- // encodingStyle is non-null only if use="encoded"
- if (elements == null || encodingStyle == null)
- return;
-
- for (int i=0; i < elements.length; i++) {
- if (elements[i] == null)
- continue;
- elements[i].setAttribute(
- Constants.NS_PREFIX_SOAP_ENV + ":" + Constants.ATTR_ENCODING_STYLE, encodingStyle);
- }
- }
-
- /*
- * Serialize an array of elements
- */
- private String serializeElements(Element[] elements) {
-
- StringBuffer buffer = new StringBuffer();
-
- for (int i = 0; i < elements.length; i++) {
-
- String serializedFragment = XMLUtils.serialize(elements[i], true);
- if (serializedFragment == null) {
- // On Some JRE's (Sun java 5) elements with an attribute with the xsi
- // prefix do not serialize properly because the namespace can not
- // be found so the string returned comes back as null. To workaround
- // this problem try adding in the namespace declaration attribute
- // and retry the serialization (bug 144824)
- elements[i].setAttribute("xmlns:xsi", Constants.URI_2001_SCHEMA_XSI);
- serializedFragment = XMLUtils.serialize(elements[i], true);
- }
-
- buffer.append(serializedFragment);
- buffer.append(LINE_SEPARATOR);
- }
-
- return buffer.toString();
- }
-
- /*
- * Determines if the given message is a request message using RPC style
- */
- private boolean isRPCRequest(ISOAPMessage message) {
- return
- !message.getMessageContext().isDocumentStyle() && // rpc style
- !Boolean.TRUE.equals(message.getProperty(SOAPTransport.PROP_READ_ONLY)); // not read-only
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISerializer#serialize(int, org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage)
- */
- public String serialize(int part, ISOAPMessage message) throws TransportException {
-
- switch (part) {
- case ISOAPMessage.ENVELOPE:
- Element envelope = message.getEnvelope(true);
-
- if (isRPCRequest(message)) {
- Element body = getSOAPElementNS(envelope, Constants.ELEM_BODY);
- if (body == null)
- body = getSOAPElement(envelope, Constants.ELEM_BODY, message.getNamespaceTable());
-
- if (body != null) {
- Element[] bodyContent = toElementArray(body.getFirstChild().getChildNodes());
- addEncodingStyle(bodyContent, getEncodingInfo(message.getMessageContext())[1]);
- }
- }
-
- String xml = XMLUtils.serialize(envelope, true);
- if (xml == null)
- xml = new String((byte[]) message.getProperty(SOAPTransport.PROP_RAW_BYTES));
-
- return xml;
-
- case ISOAPMessage.HEADER_CONTENT:
- return serializeElements(message.getHeaderContent());
-
- case ISOAPMessage.BODY_CONTENT:
- Element[] bodyContent = message.getBodyContent();
-
- if (isRPCRequest(message))
- addEncodingStyle(bodyContent, getEncodingInfo(message.getMessageContext())[1]);
-
- return serializeElements(bodyContent);
- }
-
- return "";
- }
-
- // Deserialize //////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- /*
- * Retrieve the soap header from the envelope and populate the given message
- */
- private void processHeader(Element envelope, ISOAPMessage message) {
-
- Element header = getSOAPElementNS(envelope, Constants.ELEM_HEADER);
- if (header == null)
- return;
-
- message.setHeader(header);
- message.setHeaderContent(toElementArray(header.getChildNodes()));
- }
-
- /*
- * HACK - The root element tag name of the instance document
- * is ambiguous. It lands on a very grey area between the SOAP
- * spec and the WSDL spec. The two specs do not explicitly define
- * that the root element tag name must match the name of the
- * WSDL part. The hack is to treat elements with different tag names
- * as instances of the WSDL part.
- */
- private Element[] fixSOAPResponse(NodeList instanceList, MessageContext context) {
-
- Vector instanceVector = toElementVector(instanceList);
- Element[] instanceDocuments = new Element[instanceVector.size()];
-
- Operation oper = context.getBindingOperation().getOperation();
- Map partsMap = oper.getOutput().getMessage().getParts();
-
- if (partsMap.size() == 1) {
- Iterator it = partsMap.values().iterator();
- Part part = (Part) it.next();
-
- String fragName;
- if (part.getElementName() != null)
- fragName = part.getElementName().getLocalPart();
- else
- fragName = part.getName();
-
- for (int i = 0; i < instanceVector.size(); i++) {
- Element element = (Element) instanceVector.get(i);
-
- if (!element.getTagName().equals(fragName)) {
- Document doc = element.getOwnerDocument();
- NodeList children = element.getChildNodes();
- NamedNodeMap attributes = element.getAttributes();
- element = doc.createElement(fragName);
-
- for (int j = 0; j < children.getLength(); j++) {
- if (children.item(j) != null) {
- element.appendChild(children.item(j));
- // When you append a node from one element to another,
- // the original element will lose its reference to this node,
- // therefore, the size of the node list will decrease by 1.
- j--;
- }
- }
-
- for (int j = 0; j < attributes.getLength(); j++) {
- Object attr = attributes.item(j);
- if (attr != null && (attr instanceof Attr)) {
- Attr attribute = (Attr)attr;
- element.setAttribute(attribute.getName(), attribute.getValue());
- }
- }
- }
- instanceDocuments[i] = element;
- }
- }
- else
- instanceVector.copyInto(instanceDocuments);
-
- return instanceDocuments;
- }
-
- /*
- * Retrieve the soap header from the envelope and populate the given message
- */
- private void processBody(Element envelope, ISOAPMessage message) {
-
- Element body = getSOAPElementNS(envelope, Constants.ELEM_BODY);
- if (body == null)
- return;
-
- message.setBody(body);
-
- // check for soap fault
- Element fault = getSOAPElementNS(body, Constants.ELEM_FAULT);
- if (fault != null) {
- message.setFault(fault);
- return;
- }
-
- NodeList instanceList;
-
- if (message.getMessageContext().isDocumentStyle())
- instanceList = body.getChildNodes();
- else {
- NodeList rpcWrapper = body.getElementsByTagNameNS("*",
- message.getMessageContext().getBindingOperation().getOperation().getOutput().getMessage().getQName().getLocalPart());
-
- /*
- * HACK - Some of the web services out on the internet do not
- * set their RPC wrapper properly. It should be set to the output
- * message name of the selected operation. The hack is to
- * assume the first element inside the body element is the
- * RPC wrapper.
- */
- if (rpcWrapper.getLength() <= 0)
- rpcWrapper = body.getElementsByTagNameNS("*", "*");
-
- if (rpcWrapper.getLength() > 0)
- instanceList = rpcWrapper.item(0).getChildNodes();
- else
- return;
- }
-
- message.setBodyContent(fixSOAPResponse(instanceList, message.getMessageContext()));
- }
-
- /*
- * Deserialize the byte array into the given soap message. The part parameters tells
- * the method whether the input is the whole envelop or just the contents of the
- * header or body.
- */
- void deserialize(int part, byte[] xml, ISOAPMessage message) throws
- ParserConfigurationException,
- SAXException,
- IOException {
-
- Element root = XMLUtils.byteArrayToElement(xml, true);
-
- switch (part) {
- case ISOAPMessage.ENVELOPE:
- message.setEnvelope(root);
- processHeader(root, message);
- processBody(root, message);
- break;
- case ISOAPMessage.HEADER_CONTENT:
- message.setHeaderContent(toElementArray(root.getChildNodes()));
- break;
- case ISOAPMessage.BODY_CONTENT:
- message.setBodyContent(toElementArray(root.getChildNodes()));
- break;
- }
- }
-
- /*
- * Tack on a root element the string which represents a series of elements.
- * This is needed to deserialize the string.
- */
- private String addRootElement(String xml, Map namespaceTable) {
- StringBuffer sb = new StringBuffer();
- sb.append("<root");
-
- Iterator iter = namespaceTable.keySet().iterator();
- while (iter.hasNext()) {
- Object uri = iter.next();
- Object prefix = namespaceTable.get(uri);
- sb.append(" ").append("xmlns:").append(prefix).append("=\"").append(uri).append("\"");
- }
-
- sb.append(">").append(xml).append("</root>");
- return sb.toString();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.IDeserializer#deserialize(int, java.lang.String, org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage)
- */
- public void deserialize(int part, String xml, ISOAPMessage message) throws TransportException {
-
- if (part != ISOAPMessage.ENVELOPE)
- xml = addRootElement(xml, message.getNamespaceTable());
-
- try {
- deserialize(part, xml.getBytes(DEFAULT_SOAP_ENCODING), message);
- }
- catch (Exception e) {
- throw new TransportException(e);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransport.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransport.java
deleted file mode 100644
index 61492b49e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransport.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBinding;
-
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.explorer.transport.IDeserializer;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport;
-import org.eclipse.wst.ws.internal.explorer.transport.ISerializer;
-import org.eclipse.wst.ws.internal.explorer.transport.MessageContext;
-import org.eclipse.wst.ws.internal.explorer.transport.SOAPMessage;
-import org.eclipse.wst.ws.internal.explorer.transport.TransportException;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-
-/**
- * WSE's default implementation of ISOAPTransport
- */
-public class SOAPTransport implements ISOAPTransport {
-
- static final String PROP_READ_ONLY = "prop_read_only";
- static final String PROP_RAW_BYTES = "prop_raw_bytes";
-
- /*
- * Constructor.
- */
- SOAPTransport() {}
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport#newSerializer()
- */
- public ISerializer newSerializer() {
- return new SOAPMessageProcessor();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport#newDeserializer()
- */
- public IDeserializer newDeserializer() {
- return new SOAPMessageProcessor();
- }
-
- /*
- * Check if the binding is supported
- */
- private void checkBinding(ExtensibilityElement binding) throws TransportException {
-
- String bindingURI = binding.getElementType().getNamespaceURI();
-
- // looking for SOAP 1.1 binding
- if (!(binding instanceof SOAPBinding) ||
- !Constants.URI_WSDL11_SOAP.equals(bindingURI))
- throw new TransportException(ExplorerPlugin.getMessage("%MSG_ERROR_UNSUPPORTED_BINDING", new String[] { bindingURI }));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport#newMessage(org.eclipse.wst.ws.internal.explorer.transport.MessageContext)
- */
- public ISOAPMessage newMessage(MessageContext context) throws TransportException {
-
- checkBinding(context.getBindingProtocol());
-
- SOAPMessageProcessor processor = new SOAPMessageProcessor();
- ISOAPMessage message = new SOAPMessage(context, processor);
- processor.initMessage(message);
- return message;
- }
-
- /*
- * Check if the message uses a binding and transport that we support.
- */
- private void checkMessage(ISOAPMessage message) throws TransportException {
-
- ExtensibilityElement binding = message.getMessageContext().getBindingProtocol();
- checkBinding(binding);
-
- SOAPBinding soapBinding = (SOAPBinding) binding;
-
- if (!Constants.URI_SOAP11_HTTP.equals(soapBinding.getTransportURI()))
- throw new TransportException(ExplorerPlugin.getMessage("%MSG_ERROR_UNSUPPORTED_TRANSPORT", new String[] { soapBinding.getTransportURI() }));
- }
-
- /*
- * Create an HTTPTransport for internal use.
- */
- private HTTPTransport createInternalTransport(String username, String password) {
-
- HTTPTransport internalTransport = new HTTPTransport();
-
- if (username != null && password != null) {
- internalTransport.setHttpBasicAuthUsername(username);
- internalTransport.setHttpBasicAuthPassword(password);
- }
-
- return internalTransport;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport#send(java.lang.String, java.lang.String, java.lang.String, org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage)
- */
- public ISOAPMessage send(String url, String username, String password, ISOAPMessage message) throws TransportException {
-
- checkMessage(message);
-
- try {
- HTTPTransport internalTransport = createInternalTransport(username, password);
- internalTransport.send(NetUtils.createURL(url), (String) message.getProperty(ISOAPMessage.PROP_SOAP_ACTION), message.toXML());
-
- SOAPMessageProcessor processor = new SOAPMessageProcessor();
- ISOAPMessage reply = new SOAPMessage(message.getMessageContext(), processor);
- reply.setProperty(PROP_READ_ONLY, Boolean.TRUE);
-
- byte[] rawBytes = internalTransport.receiveBytes();
-
- try {
- processor.deserialize(ISOAPMessage.ENVELOPE, rawBytes, reply);
- }
- catch (Exception e) {
- // if error occurs during deserialization, we want to save a copy of the actual raw bytes
- reply.setProperty(PROP_RAW_BYTES, rawBytes);
- }
-
- return reply;
- }
- catch (TransportException e) {
- throw e;
- }
- catch (Exception e) {
- throw new TransportException(e);
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransportProvider.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransportProvider.java
deleted file mode 100644
index 873c52092..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/SOAPTransportProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransport;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider;
-
-/**
- * WSE's default implementation for ISOAPTransportProvider.
- */
-public class SOAPTransportProvider implements ISOAPTransportProvider {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPTransportProvider#newTransport()
- */
- public ISOAPTransport newTransport() {
- return new SOAPTransport();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SOAPMessageUtils.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SOAPMessageUtils.java
deleted file mode 100644
index 4b4ed7c39..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SOAPMessageUtils.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- * 20070510 186375 makandre@ca.ibm.com - Andrew Mak, Compile errors in wst.ws.explorer
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.util;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Part;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-/**
- * This class has some common routines used by the Web Services explorer to work with ISOAPMessages.
- */
-public class SOAPMessageUtils {
-
- /**
- * Decodes namespace declarations that have been encoded by WSE into the operation element of the WSDL model.
- * The decoded declarations will be added to the given namespace table.
- *
- * @param soapEnvelopeNamespaceTable The namespace table to populate.
- * @param operElement The operation element with the encoded namespace declarations.
- * @return True if new namespace declarations are found and added to the namespace table, false otherwise.
- */
- public static boolean decodeNamespaceTable(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement) {
-
- boolean updated = false;
-
- String[] nsDeclarations = (String[]) operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE);
- if (nsDeclarations == null)
- return false;
-
- // each namespace declaration is decoded into 2 parts: the prefix
- // in element [0] and the namespace uri in element [1].
- for (int i = 0; i < nsDeclarations.length; i++) {
- String[] prefix_ns = SoapHelper.decodeNamespaceDeclaration(nsDeclarations[i]);
-
- // check if the namespace uri is already a key in the namespace table
- // if it is, don't add it
- if (!soapEnvelopeNamespaceTable.containsKey(prefix_ns[1])) {
- soapEnvelopeNamespaceTable.put(prefix_ns[1], prefix_ns[0]);
- updated = true;
- }
- }
-
- return updated;
- }
-
- /**
- * Populate the header content of the given ISOAPMessage using the values from WSE's fragment model
- *
- * @param soapEnvelopeNamespaceTable A namespace table to use during this operation.
- * @param operElement Access WSE's fragments via this operation element.
- * @param soapMessage The ISOAPMessage to populate.
- * @throws ParserConfigurationException
- */
- public static void setHeaderContentFromModel(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws ParserConfigurationException {
-
- Vector headerEntries = new Vector();
-
- Iterator it = operElement.getSOAPHeaders().iterator();
- while (it.hasNext()) {
- SOAPHeader soapHeader = (SOAPHeader) it.next();
- boolean isUseLiteral = "literal".equals(soapHeader.getUse());
- IXSDFragment frag = (IXSDFragment) operElement.getHeaderFragment(soapHeader);
- Element[] instanceDocuments = frag.genInstanceDocumentsFromParameterValues(
- !isUseLiteral, soapEnvelopeNamespaceTable, soapMessage.getEnvelope(false).getOwnerDocument());
- for (int i = 0; i < instanceDocuments.length; i++) {
- if (instanceDocuments[i] == null)
- continue;
- headerEntries.addElement(instanceDocuments[i]);
- }
- }
-
- Element[] headerContent = new Element[headerEntries.size()];
- headerEntries.copyInto(headerContent);
-
- soapMessage.setHeaderContent(headerContent);
- }
-
- /**
- * Populate the body content of the given ISOAPMessage using the values from WSE's fragment model
- *
- * @param soapEnvelopeNamespaceTable A namespace table to use during this operation.
- * @param operElement Access WSE's fragments via this operation element.
- * @param soapMessage The ISOAPMessage to populate.
- * @throws ParserConfigurationException
- */
- public static void setBodyContentFromModel(Hashtable soapEnvelopeNamespaceTable, WSDLOperationElement operElement, ISOAPMessage soapMessage)
- throws ParserConfigurationException {
-
- Vector bodyEntries = new Vector();
- boolean isUseLiteral = operElement.isUseLiteral();
-
- Iterator it = operElement.getOrderedBodyParts().iterator();
- while (it.hasNext()) {
- Part part = (Part)it.next();
- IXSDFragment frag = (IXSDFragment) operElement.getFragment(part);
- Element[] instanceDocuments = frag.genInstanceDocumentsFromParameterValues(
- !isUseLiteral, soapEnvelopeNamespaceTable, soapMessage.getEnvelope(false).getOwnerDocument());
- for (int i = 0; i < instanceDocuments.length; i++) {
- if (instanceDocuments[i] == null)
- continue;
- bodyEntries.addElement(instanceDocuments[i]);
- }
- }
-
- Element[] bodyContent = new Element[bodyEntries.size()];
- bodyEntries.copyInto(bodyContent);
-
- soapMessage.setBodyContent(bodyContent);
- }
-
- /*
- * If the attribute is a namespace declaration, the namespace prefix is returned.
- * Otherwise null is returned.
- */
- private static String getNSPrefix(Attr attribute) {
- String name = attribute.getName();
- if (name.startsWith("xmlns:"))
- return name.substring(6);
- return null;
- }
-
- /*
- * lookup the prefix of the namespaceURI, assuming that it is declared on the element itself
- */
- private static String lookupPrefix(Element element, String namespaceURI) {
-
- NamedNodeMap attributes = element.getAttributes();
- for (int i = 0; i < attributes.getLength(); i++) {
- Attr attribute = (Attr) attributes.item(i);
- String prefix = getNSPrefix(attribute);
- if (prefix != null && attribute.getValue().equals(namespaceURI))
- return prefix;
- }
-
- return null;
- }
-
- /**
- * Given an array of elements, this method will return the index of the first element that matches
- * the given Part. A match is determined by comparing the fully qualified names of the Part and Elements.
- *
- * @param part The Part
- * @param elements The array of Elements
- * @param namespaceTable A namespace table for looking up namespace prefixes.
- * @param fragName Name of the Part's fragment (essentially the Part's local name).
- * @param start The index to begin the search.
- * @return The index of the first matching element, or -1 if no match is found.
- */
- public static int findFirstMatchingElement(Part part, Element[] elements, Map namespaceTable, String fragName, int start) {
-
- String namespaceURI = null;
- String prefix = null;
-
- // try to get the prefix
- if (part.getElementName() != null) {
- namespaceURI = part.getElementName().getNamespaceURI();
- prefix = (String) namespaceTable.get(namespaceURI);
- }
-
- for (int i = start; i < elements.length; i++) {
- Element element = elements[i];
- String name = element.getTagName();
-
- // try to get prefix again, the namespace declaration can be directly on the element
- if (prefix == null && namespaceURI != null && element.hasAttributes())
- prefix = lookupPrefix(element, namespaceURI);
-
- if (prefix == null && name.equals(fragName))
- return i;
- else if (prefix != null && name.equals(prefix + ":" + fragName))
- return i;
- }
-
- return -1;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
deleted file mode 100644
index 8fc8346bf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070305 117034 makandre@ca.ibm.com - Andrew Mak, Web Services Explorer should support SOAP Headers
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.util;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class SoapHelper
-{
- private static Hashtable defaultSoapEnvelopeNamespaces_ = null;
-
- private static final void initDefaultSoapEnvelopeNamespaces()
- {
- defaultSoapEnvelopeNamespaces_ = new Hashtable();
- defaultSoapEnvelopeNamespaces_.put(Constants.URI_SOAP11_ENV,Constants.NS_PREFIX_SOAP_ENV);
- defaultSoapEnvelopeNamespaces_.put(Constants.URI_2001_SCHEMA_XSI,Constants.NS_PREFIX_SCHEMA_XSI);
- defaultSoapEnvelopeNamespaces_.put(Constants.URI_2001_SCHEMA_XSD,Constants.NS_PREFIX_SCHEMA_XSD);
- }
-
- public static final void addDefaultSoapEnvelopeNamespaces(Hashtable soapEnvelopeNamespaces)
- {
- if (defaultSoapEnvelopeNamespaces_ == null)
- initDefaultSoapEnvelopeNamespaces();
- Enumeration defaultSoapEnvelopeNamespaceURIs = defaultSoapEnvelopeNamespaces_.keys();
- while (defaultSoapEnvelopeNamespaceURIs.hasMoreElements())
- {
- String defaultSoapEnvelopeNamespaceURI = (String)defaultSoapEnvelopeNamespaceURIs.nextElement();
- soapEnvelopeNamespaces.put(defaultSoapEnvelopeNamespaceURI,(String)defaultSoapEnvelopeNamespaces_.get(defaultSoapEnvelopeNamespaceURI));
- }
- }
-
- public static final boolean isDefaultSoapEnvelopeNamespace(String namespaceURI,String namespacePrefix)
- {
- if (defaultSoapEnvelopeNamespaces_ == null)
- initDefaultSoapEnvelopeNamespaces();
- if (defaultSoapEnvelopeNamespaces_.get(namespaceURI) != null)
- return true;
- return false;
- }
-
- public static final Element createSoapEnvelopeElement(Document doc,Hashtable soapEnvelopeNamespaceTable)
- {
- Element soapEnvelopeElement = doc.createElement("soapenv:Envelope");
- Enumeration e = soapEnvelopeNamespaceTable.keys();
- while (e.hasMoreElements())
- {
- String soapEnvelopeNamespaceURI = (String)e.nextElement();
- StringBuffer soapEnvelopeNamespaceAttr = new StringBuffer("xmlns:");
- soapEnvelopeNamespaceAttr.append((String)soapEnvelopeNamespaceTable.get(soapEnvelopeNamespaceURI));
- soapEnvelopeElement.setAttribute(soapEnvelopeNamespaceAttr.toString(),soapEnvelopeNamespaceURI);
- }
- return soapEnvelopeElement;
- }
-
- public static final Element createSoapHeaderElement(Document doc)
- {
- return doc.createElement("soapenv:Header");
- }
-
- public static final Element createSoapBodyElement(Document doc)
- {
- return doc.createElement("soapenv:Body");
- }
-
- public static final Element createRPCWrapperElement(Document doc,Hashtable soapEnvelopeNamespaceTable,String encodingNamespaceURI,String operationName, String encodingStyle)
- {
- int nsId = 0;
- StringBuffer wrapperElementName = new StringBuffer();
- String encodingNamespacePrefix = (String)soapEnvelopeNamespaceTable.get(encodingNamespaceURI);
- if (encodingNamespacePrefix != null)
- wrapperElementName.append(encodingNamespacePrefix);
- else
- {
- // Loop until we generate a unique prefix.
- do
- {
- wrapperElementName.setLength(0);
- wrapperElementName.append("ns").append(nsId);
- if (!soapEnvelopeNamespaceTable.containsValue(wrapperElementName.toString()))
- break;
- nsId++;
- } while (true);
-
- // need to ensure whatever prefix we choose is added to the namespace table
- // so that it will not be reused lated on
- soapEnvelopeNamespaceTable.put(encodingNamespaceURI, wrapperElementName.toString());
- }
- String wrapperElementNamePrefix = wrapperElementName.toString();
- wrapperElementName.append(':').append(operationName);
- Element wrapperElement = doc.createElement(wrapperElementName.toString());
- StringBuffer namespaceAttrName = new StringBuffer("xmlns:");
- namespaceAttrName.append(wrapperElementNamePrefix);
- wrapperElement.setAttribute(namespaceAttrName.toString(),encodingNamespaceURI);
- if (encodingStyle != null)
- wrapperElement.setAttribute("soapenv:encodingStyle",encodingStyle);
- return wrapperElement;
- }
-
- public static final String encodeNamespaceDeclaration(String prefix, String uri)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(prefix);
- sb.append(" ");
- sb.append(uri);
- String result = URLUtils.encode(sb.toString());
- return result;
- }
-
- public static final String[] decodeNamespaceDeclaration(String s)
- {
- String sCopy = URLUtils.decode(s);
- int index = sCopy.indexOf(" ");
- String[] nsDecl = new String[2];
- if (index != -1)
- {
- nsDecl[0] = sCopy.substring(0, index);
- nsDecl[1] = sCopy.substring(index+1, sCopy.length());
- }
- else
- {
- nsDecl[0] = null;
- nsDecl[1] = sCopy;
- }
- return nsDecl;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java
deleted file mode 100644
index b39dc41e0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Part;
-import javax.xml.namespace.QName;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class WSDLPartsToXSDTypeMapper
-{
- private final char POUND = '#';
- private Vector xsdSchemaList_;
- private Hashtable partToXSDCache_;
-
- public WSDLPartsToXSDTypeMapper() {
- xsdSchemaList_ = new Vector();
- partToXSDCache_ = new Hashtable();
- }
-
- public void addSchemas(Vector schemaList) {
- for (int i=0;i<schemaList.size();i++) {
- Object schema = schemaList.elementAt(i);
- if (schema != null)
- xsdSchemaList_.addElement(schema);
- }
- }
-
- public XSDNamedComponent getXSDType(Part part, String id) {
- XSDNamedComponent component = getXSDTypeFromCache(id);
- if (component != null)
- return component;
- component = getXSDTypeFromSchema(part);
- if (component != null)
- addToCache(id, component);
- return component;
- }
-
- public XSDNamedComponent getXSDTypeFromCache(String id) {
- return (XSDNamedComponent)partToXSDCache_.get(id);
- }
-
- public XSDNamedComponent getXSDTypeFromSchema(Part part) {
- boolean isElementDeclaration = (part.getTypeName() == null);
- QName qName = isElementDeclaration ? part.getElementName() : part.getTypeName();
- return getXSDTypeFromSchema(qName.getNamespaceURI(), qName.getLocalPart(), isElementDeclaration);
- }
-
- public XSDNamedComponent getXSDTypeFromSchema(String namespaceURI, String localName, boolean isElementDeclaration) {
- for (int i = 0; i < xsdSchemaList_.size(); i++) {
- XSDSchema xsdSchema = (XSDSchema)xsdSchemaList_.elementAt(i);
- Vector components = new Vector();
- if (isElementDeclaration)
- components.addAll(xsdSchema.getElementDeclarations());
- else
- components.addAll(xsdSchema.getTypeDefinitions());
- for (Iterator it = components.iterator(); it.hasNext(); ) {
- XSDNamedComponent component = (XSDNamedComponent)it.next();
- String compNSURI = component.getTargetNamespace();
- String compLocalname = component.getName();
- if (compNSURI != null && compLocalname != null && compNSURI.equals(namespaceURI) && compLocalname.equals(localName))
- return component;
- }
- }
- return null;
- }
-
- public XSDNamedComponent resolveXSDNamedComponent(XSDNamedComponent component)
- {
- if (component != null)
- {
- String uri = component.getURI();
- String qname = component.getQName();
- for (int i = 0; i < xsdSchemaList_.size(); i++)
- {
- XSDSchema xsdSchema = (XSDSchema)xsdSchemaList_.elementAt(i);
- if (xsdSchema != null)
- {
- String targetNS = xsdSchema.getTargetNamespace();
- if (targetNS != null && targetNS.equals(trimQName(uri, qname)))
- {
- XSDNamedComponent resolvedComponent = null;
- if (component instanceof XSDTypeDefinition)
- resolvedComponent = xsdSchema.resolveTypeDefinition(qname);
- else if (component instanceof XSDElementDeclaration)
- resolvedComponent = xsdSchema.resolveElementDeclaration(qname);
- else if (component instanceof XSDModelGroupDefinition)
- resolvedComponent = xsdSchema.resolveModelGroupDefinition(qname);
- if (isComponentResolvable(resolvedComponent))
- return resolvedComponent;
- }
- }
- }
- }
- return null;
- }
-
- private String trimQName(String uri, String qname)
- {
- int index = uri.indexOf(qname);
- if (index != -1)
- {
- String ns = uri.substring(0, index);
- if (ns.charAt(index-1) == POUND)
- return ns.substring(0, index-1);
- else
- return ns;
- }
- else
- return uri;
- }
-
- private void addToCache(String id, XSDNamedComponent component) {
- partToXSDCache_.put(id,component);
- }
-
- protected boolean isComponentResolvable(XSDComponent component)
- {
- if (component == null)
- return false;
- XSDSchema schema = component.getSchema();
- if (schema == null)
- return false;
- if (schema.getTargetNamespace() == null)
- return false;
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java
deleted file mode 100644
index 5b6d6f81b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddBusinessToFavoritesAction extends AddToFavoritesAction
-{
- public AddBusinessToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean favoriteExists()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- Object obj = selectedElement.getAllUDDILinks().getElementWithViewId(viewID).getObject();
- WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) obj;
- String businessName = wsilUddiBusinessElement.getName();
- String inquiryAPI = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
- String businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
- if (businessName == null)
- businessName = businessKey;
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME, businessName);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API, inquiryAPI);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
- return favoriteExists(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
- return transformers;
- }
-
- public boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- Object obj = selectedElement.getAllUDDILinks().getElementWithViewId(viewID).getObject();
- WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) obj;
- String businessName = wsilUddiBusinessElement.getName();
- String inquiryAPI = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
- String businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
- if (businessName == null)
- businessName = businessKey;
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME, businessName);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API, inquiryAPI);
- table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
- if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", businessName));
- return false;
- }
- if (addToFavorites(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", businessName));
- return true;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", businessName));
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java
deleted file mode 100644
index 68551253b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindBusinessUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddBusinessToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddBusinessToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
- return transformers;
- }
-
- public boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- String inquiryURL = null;
- String businessKey = null;
- String businessName = null;
- if (selectedElement instanceof WsilElement)
- {
- ListElement le = ((WsilElement) selectedElement).getAllUDDILinks().getElementWithViewId(viewID);
- WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) le.getObject();
- inquiryURL = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
- businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
- businessName = wsilUddiBusinessElement.getName();
- if (businessName == null)
- businessName = businessKey;
- }
- else
- return false;
- // return false if unable to find or create a registry node/element in the
- // UDDI perspective
- if (!createRegistryInUDDIPerspective(inquiryURL, null, inquiryURL))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", businessName));
- return false;
- }
- // prepare the action
- RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
- // populate property table
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY, businessKey);
- propertyTable.put(UDDIActionInputs.QUERY_NAME, businessName);
- // run the action
- if (!action.run())
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_BUSINESS_NOT_FOUND", businessName));
- return false;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", businessName));
- return true;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java
deleted file mode 100644
index efe5f2a7c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddServiceToFavoritesAction extends AddToFavoritesAction
-{
- public AddServiceToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean favoriteExists()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- Object obj = selectedElement.getAllUDDIServices().getElementWithViewId(viewID).getObject();
- WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) obj;
- String serviceName = wsilUddiServiceElement.getName();
- String inquiryAPI = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
- String serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
- if (serviceName == null)
- serviceName = serviceKey;
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME, serviceName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API, inquiryAPI);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY, serviceKey);
- return favoriteExists(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
- return transformers;
- }
-
- public boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- Object obj = selectedElement.getAllUDDIServices().getElementWithViewId(viewID).getObject();
- WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) obj;
- String serviceName = wsilUddiServiceElement.getName();
- String inquiryAPI = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
- String serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
- if (serviceName == null)
- serviceName = serviceKey;
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME, serviceName);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API, inquiryAPI);
- table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY, serviceKey);
- if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", serviceName));
- return false;
- }
- if (addToFavorites(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", serviceName));
- return true;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", serviceName));
- return false;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java
deleted file mode 100644
index fb86dc9dd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddServiceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
- public AddServiceToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
- return transformers;
- }
-
- public boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- String inquiryURL = null;
- String serviceKey = null;
- String serviceName = null;
- if (selectedElement instanceof WsilElement)
- {
- ListElement le = ((WsilElement) selectedElement).getAllUDDIServices().getElementWithViewId(viewID);
- WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) le.getObject();
- inquiryURL = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
- serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
- serviceName = wsilUddiServiceElement.getName();
- if (serviceName == null)
- serviceName = serviceKey;
- }
- else
- return false;
- // return false if unable to find or create a registry node/element in the
- // UDDI perspective
- if (!createRegistryInUDDIPerspective(inquiryURL, null, inquiryURL))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serviceName));
- return false;
- }
- // prepare the action
- RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
- // populate property table
- Hashtable propertyTable = action.getPropertyTable();
- propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY, serviceKey);
- propertyTable.put(UDDIActionInputs.QUERY_NAME, serviceName);
- // run the action
- if (!action.run())
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_SERVICE_NOT_FOUND", serviceName));
- return false;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serviceName));
- return true;
- }
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java
deleted file mode 100644
index a48b2952b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-
-public abstract class AddToFavoritesAction extends MultipleLinkAction {
- protected NodeManager nodeManager_;
-
- public AddToFavoritesAction(Controller controller)
- {
- super(controller);
- nodeManager_ = controller.getWSILPerspective().getNodeManager();
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink() {
- return "wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp";
- }
-
- public static AddToFavoritesAction newAction(HttpServletRequest request, Controller controller) {
- String nodeID = request.getParameter(ActionInputs.NODEID);
- NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
- Tool selectedTool = nodeManager.getNode(Integer.parseInt(nodeID)).getToolManager().getSelectedTool();
- if (selectedTool instanceof ListWSDLServicesTool)
- return new AddWSDLServiceToFavoritesAction(controller);
- else if (selectedTool instanceof ListUDDIServicesTool)
- return new AddServiceToFavoritesAction(controller);
- else if (selectedTool instanceof ListUDDIBusinessTool)
- return new AddBusinessToFavoritesAction(controller);
- else
- return new AddWSILToFavoritesAction(controller);
- }
-
- protected boolean addToFavorites(Hashtable table, String rel) {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favNodeManager = favPerspective.getNodeManager();
- TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
- Enumeration e = favRootElement.getElements(rel);
- if (!e.hasMoreElements()) return false;
- FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
- return favFolderElement.addFavorite(table);
- }
-
- protected boolean favoriteExists(Hashtable table, String rel) {
- FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
- NodeManager favNodeManager = favPerspective.getNodeManager();
- TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
- Enumeration e = favRootElement.getElements(rel);
- if (!e.hasMoreElements()) return false;
- FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
- return favFolderElement.favoriteExists(table);
- }
-
- public abstract boolean favoriteExists();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java
deleted file mode 100644
index c0017119b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-
-public abstract class AddToUDDIPerspectiveAction extends MultipleLinkAction
-{
- public AddToUDDIPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp";
- }
-
- public static Action newAction(HttpServletRequest request, Controller controller)
- {
- String nodeID = request.getParameter(ActionInputs.NODEID);
- NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
- Tool selectedTool = nodeManager.getNode(Integer.parseInt(nodeID)).getToolManager().getSelectedTool();
- if (selectedTool instanceof ListUDDIServicesTool)
- return new AddServiceToUDDIPerspectiveAction(controller);
- else if (selectedTool instanceof ListUDDIBusinessTool)
- return new AddBusinessToUDDIPerspectiveAction(controller);
- else
- return new NullAction();
- }
-
- protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName)
- {
- Vector registryNodes = getRegistryNodesByInquiryURL(inquiryAPI);
- if (registryNodes != null)
- {
- // Always attempt to use an existing registry.
- Node registryNode = (Node) registryNodes.elementAt(0);
- NodeManager nodeManager = registryNode.getNodeManager();
- nodeManager.setSelectedNodeId(registryNode.getNodeId());
- return true;
- }
- // open the registry if it is not already opened in the UDDI perspective
- OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
- // populate the property table
- Hashtable propertyTable = openRegAction.getPropertyTable();
- if (Validator.validateString(registryName))
- propertyTable.put(UDDIActionInputs.REGISTRY_NAME, registryName);
- else
- return false;
- if (Validator.validateURL(inquiryAPI))
- propertyTable.put(UDDIActionInputs.INQUIRY_URL, inquiryAPI);
- else
- return false;
- // run the action
- if (!openRegAction.run())
- return false;
- return true;
- }
-
- protected Vector getRegistryNodesByInquiryURL(String inquiryURL)
- {
- Vector registryNodes = null;
- NodeManager navigatorManager = controller_.getUDDIPerspective().getNavigatorManager();
- UDDIMainNode uddiMainNode = (UDDIMainNode) (navigatorManager.getRootNode());
- Vector childNodes = uddiMainNode.getChildNodes();
- for (int i = 0; i < childNodes.size(); i++)
- {
- Node childNode = (Node) childNodes.elementAt(i);
- if (childNode instanceof RegistryNode)
- {
- RegistryElement regElement = (RegistryElement) childNode.getTreeElement();
- if (regElement.getInquiryURL().equals(inquiryURL))
- {
- if (registryNodes == null)
- registryNodes = new Vector();
- registryNodes.addElement(childNode);
- }
- }
- }
- return registryNodes;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java
deleted file mode 100644
index 56d1c8a47..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class AddWSDLServiceToFavoritesAction extends AddToFavoritesAction
-{
- public AddWSDLServiceToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean favoriteExists()
- {
- String wsdlURL = getWsdlUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlURL);
- return favoriteExists(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSDL_SERVICE);
- return transformers;
- }
-
- public boolean executeSingleLinkAction()
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- String wsdlURL = getWsdlUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlURL);
- if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", wsdlURL));
- return false;
- }
- if (addToFavorites(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsdlURL));
- return true;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsdlURL));
- return false;
- }
- }
-
- private String getWsdlUrl()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- WsilWsdlServiceElement wsilWsdlServiceElement;
- Object obj = selectedElement.getAllWSDLServices().getElementWithViewId(viewID).getObject();
- wsilWsdlServiceElement = (WsilWsdlServiceElement) obj;
- return wsilWsdlServiceElement.getWSDLServiceURL();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java
deleted file mode 100644
index 3a9142eef..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class AddWSILToFavoritesAction extends AddToFavoritesAction
-{
- public AddWSILToFavoritesAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean favoriteExists()
- {
- String wsilURL = getWsilUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSIL_URL, wsilURL);
- return favoriteExists(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE);
- }
-
- public boolean executeSingleLinkAction()
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- String wsilURL = getWsilUrl();
- Hashtable table = new Hashtable();
- table.put(FavoritesModelConstants.PROP_WSIL_URL, wsilURL);
- if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", wsilURL));
- return false;
- }
- if (addToFavorites(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE))
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsilURL));
- return true;
- }
- else
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsilURL));
- return false;
- }
- }
-
- private String getWsilUrl()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
- return selectedElement.getWsilUrl();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java
deleted file mode 100644
index 9eafa3812..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class ClearWSILAction extends ClearNodeAction {
-
- public ClearWSILAction(Controller controller)
- {
- super(controller, controller.getWSILPerspective().getNodeManager());
- propertyTable_.put(ActionInputs.NODEID, String.valueOf(controller.getWSILPerspective().getNodeManager().getSelectedNodeId()));
- }
-
- public static String getActionLink(int nodeID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/ClearWSILActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- return actionLink.toString();
- }
-
- public String getTreeContentVar() {
- return "wsilNavigatorContent";
- }
-
- public String getTreeContentPage() {
- return "wsil/wsil_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar() {
- return "wsilPropertiesContainer";
- }
-
- public String getPropertiesContainerPage() {
- return "wsil/wsil_properties_container.jsp";
- }
-
- public String getStatusContentVar() {
- return "wsilStatusContent";
- }
-
- public String getStatusContentPage() {
- return "wsil/wsil_status_content.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java
deleted file mode 100644
index dcc0dc32f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.uddi4j.client.UDDIProxy;
-
-public class ImportWSDLToFileSystemAction extends ImportToFileSystemAction
-{
- private Definition def_;
- private String wsdlFileName_;
- private NodeManager nodeManager_;
-
- public ImportWSDLToFileSystemAction(Controller controller)
- {
- super(controller);
- nodeManager_ = controller.getWSILPerspective().getNodeManager();
- }
-
- public static final String getActionLink(int nodeId, int toolId, int viewId, int viewToolId)
- {
- return ImportToFileSystemAction.getActionLink(nodeId, toolId, viewId, viewToolId, "wsil/actions/ImportWSDLToFileSystemActionJSP.jsp");
- }
-
- public boolean write(OutputStream os)
- {
- if (def_ != null)
- {
- return writeWSDLDefinition(os, def_);
- }
- else
- {
- return false;
- }
- }
-
- public String getDefaultFileName()
- {
- return wsdlFileName_;
- }
-
- private boolean getWSDLFromURL()
- {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
- ListManager wsilServices = wsilElement.getAllWSDLServices();
- ListElement le = wsilServices.getElementWithViewId(viewID);
- WsilWsdlServiceElement service = (WsilWsdlServiceElement)le.getObject();
- String wsdlURL = service.getWSDLServiceURL();
- wsdlFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlURL);
- try
- {
- def_ = (new Uddi4jHelper()).getWSDLDefinition(wsdlURL);
- }
- catch (Exception e)
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- wsilPerspective.getMessageQueue().addMessage(e.getMessage());
- return false;
- }
- return true;
- }
-
- private boolean getWSDLFromUDDIRegistry()
- {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
- ListManager wsilServices = wsilElement.getAllUDDIServices();
- ListElement le = wsilServices.getElementWithViewId(viewID);
- WsilUddiServiceElement service = (WsilUddiServiceElement)le.getObject();
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- wsdlFileName_ = service.getName() + ".wsdl";
- Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
- try
- {
- UDDIProxy proxy = null;
- String inquiryURL = service.getUDDIServiceInquiryAPI();
- if (inquiryURL != null)
- {
- proxy = new UDDIProxy();
- proxy.setInquiryURL(inquiryURL);
- }
- def_ = uddi4jHelper.getWSDLDefinition(uddi4jHelper.getWSDL(service.getServiceDefinition(), proxy));
- }
- catch (Exception e)
- {
- // the wsdl representing this service is unreachable through the UDDI
- // registry. We will try using the discovery URL instead.
- try
- {
- def_ = uddi4jHelper.getWSDLDefinition(service.getUDDIServiceDiscoveryURL());
- return true;
- }
- catch (Exception e2)
- {
- }
- // if the discoveryURL also fails, return an error
- wsilPerspective.getMessageQueue().addMessage(e.getMessage());
- return false;
- }
- return true;
- }
-
- public boolean run()
- {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
- if (selectedTool instanceof ListWSDLServicesTool)
- return getWSDLFromURL();
- else if (selectedTool instanceof ListUDDIServicesTool)
- return getWSDLFromUDDIRegistry();
- else
- return false;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getWSILPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getWSILPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java
deleted file mode 100644
index 4175bcbb4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.io.OutputStream;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-
-public class ImportWSILToFileSystemAction extends ImportToFileSystemAction {
- private WSILDocument wsilDoc_;
- private WsilElement wsilElement_;
- private NodeManager nodeManager_;
-
- public ImportWSILToFileSystemAction(Controller controller) {
- super(controller);
- nodeManager_ = controller.getWSILPerspective().getNodeManager();
- }
-
- public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
- {
- return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"wsil/actions/ImportWSILToFileSystemActionJSP.jsp");
- }
-
- public boolean write(OutputStream os) {
- if (wsilDoc_ != null) {
- return writeWSILDocument(os, wsilDoc_);
- }
- else {
- return false;
- }
- }
-
- public String getDefaultFileName() {
- String wsilFileName = wsilElement_.getWsilUrl();
- return wsilFileName.substring(wsilFileName.lastIndexOf('/') + 1, wsilFileName.length());
- }
-
- public boolean run() {
- int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- if (selectedElement instanceof WsilElement) {
- wsilElement_ = (WsilElement)selectedElement;
- wsilDoc_ = ((WsilElement)selectedElement).getWSILDocument();
- return true;
- }
- else {
- return false;
- }
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getWSILPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getWSILPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java
deleted file mode 100644
index b64c49af5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-
-public abstract class MultipleLinkAction extends LinkAction
-{
- public MultipleLinkAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processLinkParameters(HttpServletRequest request)
- {
- String isMultipleLinkAction = request.getParameter(WsilActionInputs.MULTIPLE_LINK_ACTION);
- if (isMultipleLinkAction != null)
- {
- propertyTable_.put(WsilActionInputs.MULTIPLE_LINK_ACTION, isMultipleLinkAction);
- return processMultipleLinkActionParameters(request);
- }
- else
- {
- propertyTable_.remove(WsilActionInputs.MULTIPLE_LINK_ACTION);
- String nodeIDString = request.getParameter(ActionInputs.NODEID);
- String toolIDString = request.getParameter(ActionInputs.TOOLID);
- String viewIDString = request.getParameter(ActionInputs.VIEWID);
- String viewToolIDString = request.getParameter(ActionInputs.VIEWTOOLID);
- if (nodeIDString != null)
- propertyTable_.put(ActionInputs.NODEID, nodeIDString);
- if (toolIDString != null)
- propertyTable_.put(ActionInputs.TOOLID, toolIDString);
- if (viewIDString != null)
- propertyTable_.put(ActionInputs.VIEWID, viewIDString);
- if (viewToolIDString != null)
- propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolIDString);
- return true;
- }
- }
-
- protected boolean processMultipleLinkActionParameters(HttpServletRequest request)
- {
- String nodeID = request.getParameter(ActionInputs.NODEID);
- String[] viewIDs = request.getParameterValues(ActionInputs.VIEWID);
- propertyTable_.put(ActionInputs.NODEID, nodeID);
- propertyTable_.put(ActionInputs.VIEWID, viewIDs);
- if (viewIDs.length == 0)
- return false;
- else
- return true;
- }
-
- protected boolean isMultipleLinkAction()
- {
- return propertyTable_.containsKey(WsilActionInputs.MULTIPLE_LINK_ACTION);
- }
-
- protected String[] getViewIds()
- {
- Object object = propertyTable_.get(ActionInputs.VIEWID);
- if (object == null)
- return new String[0];
- else if (object.getClass().isArray())
- return (String[])object;
- else
- return new String[] {(String)object};
- }
-
- public boolean run()
- {
- return (isMultipleLinkAction()) ? executeMultipleLinkAction() : executeSingleLinkAction();
- }
-
- protected boolean executeMultipleLinkAction()
- {
- boolean result = false;
- String[] viewIds = getViewIds();
- if (viewIds != null && viewIds.length > 0)
- {
- for (int i = 0; i < viewIds.length; i++)
- {
- propertyTable_.put(ActionInputs.VIEWID, viewIds[i]);
- if (executeSingleLinkAction())
- result = true;
- }
- }
- propertyTable_.put(ActionInputs.VIEWID, viewIds);
- return result;
- }
-
- protected abstract boolean executeSingleLinkAction();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java
deleted file mode 100644
index 38cf56409..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-
-public class NullAction extends Action
-{
- public NullAction()
- {
- }
-
- public boolean populatePropertyTable(HttpServletRequest request)
- {
- return true;
- }
-
- public boolean run()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
deleted file mode 100644
index 1e3fe4b84..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class OpenWSILAction extends FormAction
-{
-
- public OpenWSILAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String wsilURL = parser.getParameter(WsilActionInputs.WSIL_URL);
- String inspectionType = parser.getParameter(WsilActionInputs.WSIL_INSPECTION_TYPE);
- FormTool formTool = getSelectedFormTool();
- propertyTable_.put(WsilActionInputs.WSIL_URL, wsilURL);
- if (inspectionType != null && inspectionType.length() > 0)
- propertyTable_.put(WsilActionInputs.WSIL_INSPECTION_TYPE, inspectionType);
- formTool.updatePropertyTable(propertyTable_);
- return true;
- }
-
- public FormTool getSelectedFormTool()
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public boolean run()
- {
- String wsilURL = (String)propertyTable_.get(WsilActionInputs.WSIL_URL);
- int inspectionType = Integer.parseInt((String)propertyTable_.get(WsilActionInputs.WSIL_INSPECTION_TYPE));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- MessageQueue msgQueue = wsilPerspective.getMessageQueue();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- TreeElement root = rootNode.getTreeElement();
- WsilElement wsilElement = getOpenedWSIL(root, wsilURL);
- if (wsilElement == null)
- {
- WebServicesParserExt parser = new WebServicesParserExt(wsilURL);
- try
- {
- parser.parse(WebServicesParser.PARSE_NONE);
- WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(wsilURL);
- int type = wsEntity.getType();
- if (type == WebServiceEntity.TYPE_HTML)
- return openHTML(wsEntity.getChildren(), inspectionType);
- else if (type == WebServiceEntity.TYPE_WSIL)
- return openWSIL(wsilURL, parser.getWSILDocument(wsilURL), inspectionType);
- else
- msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_INVALID_WSIL_URL", wsilURL));
- }
- catch (Throwable t)
- {
- msgQueue.addMessage(t.getMessage());
- }
- return false;
- }
- else
- {
- preselectWSILNode(nodeManager, rootNode.getChildNode(wsilElement).getNodeId(), inspectionType);
- msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_ALREADY_OPENED", wsilURL));
- return true;
- }
- }
-
- private boolean openHTML(List wsils, int inspectionType)
- {
- int nodeId = -1;
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- MessageQueue msgQueue = wsilPerspective.getMessageQueue();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- TreeElement root = rootNode.getTreeElement();
- for (Iterator it = wsils.iterator(); it.hasNext();)
- {
- WebServiceEntity wsilEntity = (WebServiceEntity)it.next();
- String wsilURL = wsilEntity.getURI();
- WsilElement wsilElement = getOpenedWSIL(root, wsilURL);
- if (wsilElement == null)
- {
- try
- {
- WSILDocument wsilDoc = WSILDocument.newInstance();
- wsilDoc.read(wsilURL);
- wsilElement = new WsilElement(wsilURL, root.getModel(), wsilDoc, wsilURL);
- root.connect(wsilElement, WsilModelConstants.REL_WSIL, ModelConstants.REL_OWNER);
- nodeId = rootNode.getChildNode(wsilElement).getNodeId();
- msgQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_OPEN_WSIL_SUCCESSFUL", wsilURL));
- }
- catch (Throwable t)
- {
- msgQueue.addMessage(t.getMessage());
- }
- }
- else
- {
- msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_ALREADY_OPENED", wsilURL));
- nodeId = rootNode.getChildNode(wsilElement).getNodeId();
- }
- }
- if (nodeId != -1)
- {
- preselectWSILNode(nodeManager, nodeId, inspectionType);
- return true;
- }
- else
- return false;
- }
-
- private boolean openWSIL(String wsilURL, WSILDocument wsilDoc, int inspectionType)
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- MessageQueue msgQueue = wsilPerspective.getMessageQueue();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node rootNode = nodeManager.getRootNode();
- TreeElement root = rootNode.getTreeElement();
- WsilElement wsilElement = new WsilElement(wsilURL, root.getModel(), wsilDoc, wsilURL);
- root.connect(wsilElement, WsilModelConstants.REL_WSIL, ModelConstants.REL_OWNER);
- int nodeId = rootNode.getChildNode(wsilElement).getNodeId();
- msgQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_OPEN_WSIL_SUCCESSFUL", wsilURL));
- preselectWSILNode(nodeManager, nodeId, inspectionType);
- return true;
- }
-
- private void preselectWSILNode(NodeManager nodeManager, int nodeId, int inspectionType)
- {
- nodeManager.setSelectedNodeId(nodeId);
- Node selectedNode = nodeManager.getNode(nodeId);
- selectedNode.setViewId(ActionInputs.VIEWTOOLID_DEFAULT);
- ToolManager toolManager = selectedNode.getToolManager();
- toolManager.setSelectedToolId(inspectionType);
- addToHistory(ActionInputs.PERSPECTIVE_WSIL, SelectWSILToolAction.getActionLink(nodeId, inspectionType, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, true));
- }
-
- private WsilElement getOpenedWSIL(TreeElement root, String wsilURL)
- {
- Enumeration e = root.getElements(WsilModelConstants.REL_WSIL);
- while (e.hasMoreElements())
- {
- WsilElement wsilElement = (WsilElement)e.nextElement();
- if (wsilElement.getWsilUrl().equals(wsilURL))
- return wsilElement;
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java
deleted file mode 100644
index 40db6eb83..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsilLinkElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class OpenWSILLinkAction extends MultipleLinkAction
-{
- public OpenWSILLinkAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/OpenWSILLinkActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "wsil/actions/OpenWSILLinkActionJSP.jsp";
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSIL_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSIL_LINK);
- return transformers;
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- if (!(selectedElement instanceof WsilElement))
- return false;
- ListElement le = ((WsilElement) selectedElement).getAllWSILLinks().getElementWithViewId(viewID);
- WsilWsilLinkElement link = (WsilWsilLinkElement) le.getObject();
- String wsilURL = link.getWSILLinkLocation();
- // populate and run the OpenWSILAction
- OpenWSILAction action = new OpenWSILAction(controller_);
- Hashtable table = action.getPropertyTable();
- table.put(WsilActionInputs.WSIL_URL, wsilURL);
- table.put(WsilActionInputs.WSIL_INSPECTION_TYPE, String.valueOf(WsilActionInputs.WSIL_DETAILS));
- return action.run();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java
deleted file mode 100644
index 7b60ea408..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WsilNode;
-
-public abstract class RefreshAction extends MultipleLinkAction
-{
- protected NodeManager nodeManager_;
-
- public RefreshAction(Controller controller)
- {
- super(controller);
- nodeManager_ = controller.getWSILPerspective().getNodeManager();
- }
-
- public static Action newAction(HttpServletRequest request, Controller controller)
- {
- NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
- String nodeIDString = request.getParameter(ActionInputs.NODEID);
- String viewIDString = request.getParameter(ActionInputs.VIEWID);
- int nodeID;
- try
- {
- nodeID = Integer.parseInt(nodeIDString);
- }
- catch (NumberFormatException nfe)
- {
- nodeID = nodeManager.getSelectedNodeId();
- }
- Node selectedNode = controller.getWSILPerspective().getNodeManager().getNode(nodeID);
- if (selectedNode == null || !(selectedNode instanceof WsilNode))
- return new NullAction();
- else
- {
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
- RefreshAction action;
- if (viewIDString == null)
- action = new RefreshWSILAction(controller);
- else if (selectedTool instanceof ListUDDIServicesTool)
- action = new RefreshUDDIServiceAction(controller);
- else if (selectedTool instanceof ListUDDIBusinessTool)
- action = new RefreshUDDIBusinessAction(controller);
- else
- return new NullAction();
- action.getPropertyTable().put(ActionInputs.NODEID, String.valueOf(nodeID));
- return action;
- }
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/RefreshActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "wsil/actions/RefreshActionJSP.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java
deleted file mode 100644
index fd8e3e191..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiBusinessElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class RefreshUDDIBusinessAction extends RefreshAction
-{
- public RefreshUDDIBusinessAction(Controller controller)
- {
- super(controller);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
- return transformers;
- }
-
- public boolean run()
- {
- return executeSingleLinkAction();
- }
-
- protected boolean executeMultipleLinkAction()
- {
- return executeSingleLinkAction();
- }
-
- public boolean executeSingleLinkAction()
- {
- boolean result = true;
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- MessageQueue messageQueue = wsilPerspective.getMessageQueue();
- if (selectedElement instanceof WsilElement)
- {
- WsilElement wsilElement = (WsilElement) selectedElement;
- ListManager lm = wsilElement.getAllUDDILinks();
- Vector uddiBusinessElements = new Vector();
- String[] viewIDs = getViewIds();
- for (int i = 0; i < viewIDs.length; i++)
- {
- int viewID = Integer.parseInt(viewIDs[i]);
- WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) lm.getElementWithViewId(viewID).getObject();
- uddiBusinessElements.add(uddiBusinessElement);
- }
- wsilElement.refreshServiceProvidersFromRegistry(uddiBusinessElements);
- for (Iterator it = uddiBusinessElements.iterator(); it.hasNext();)
- {
- WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) it.next();
- String name = uddiBusinessElement.getName();
- if (name == null || name.length() <= 0)
- name = uddiBusinessElement.getUDDILinkBusinessKey();
- if (uddiBusinessElement.getServiceProvider() != null)
- messageQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", name));
- else
- {
- messageQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_BUSINESS_NOT_FOUND", name));
- result = false;
- }
- }
- }
- else
- result = false;
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java
deleted file mode 100644
index 66377aa43..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class RefreshUDDIServiceAction extends RefreshAction
-{
- public RefreshUDDIServiceAction(Controller controller)
- {
- super(controller);
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
- return transformers;
- }
-
- public boolean run()
- {
- return executeSingleLinkAction();
- }
-
- protected boolean executeMultipleLinkAction()
- {
- return executeSingleLinkAction();
- }
-
- public boolean executeSingleLinkAction()
- {
- boolean result = true;
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- MessageQueue messageQueue = wsilPerspective.getMessageQueue();
- if (selectedElement instanceof WsilElement)
- {
- WsilElement wsilElement = (WsilElement) selectedElement;
- ListManager lm = wsilElement.getAllUDDIServices();
- Vector uddiServiceElements = new Vector();
- String[] viewIDs = getViewIds();
- for (int i = 0; i < viewIDs.length; i++)
- {
- int viewID = Integer.parseInt(viewIDs[i]);
- WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) lm.getElementWithViewId(viewID).getObject();
- uddiServiceElements.add(uddiServiceElement);
- }
- wsilElement.refreshServiceDefinitionsFromRegistry(uddiServiceElements);
- for (Iterator it = uddiServiceElements.iterator(); it.hasNext();)
- {
- WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) it.next();
- String name = uddiServiceElement.getName();
- if (name == null || name.length() <= 0)
- name = uddiServiceElement.getUDDIServiceKey();
- if (uddiServiceElement.getServiceDefinition() != null)
- messageQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", name));
- else
- {
- messageQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_SERVICE_NOT_FOUND", name));
- result = false;
- }
- }
- }
- else
- result = false;
- return result;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java
deleted file mode 100644
index 3911bd8c7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class RefreshWSILAction extends RefreshAction
-{
- public RefreshWSILAction(Controller controller)
- {
- super(controller);
- }
-
- public boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- Node selectedNode = nodeManager_.getNode(nodeID);
- TreeElement selectedElement = selectedNode.getTreeElement();
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- if (selectedElement instanceof WsilElement)
- {
- String wsilURL = ((WsilElement) selectedElement).getWsilUrl();
- if (((WsilElement) selectedElement).refresh())
- {
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", wsilURL));
- return true;
- }
- else
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_NOT_FOUND", wsilURL));
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java
deleted file mode 100644
index 9e0dbf830..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ResizeFramesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilFrameNames;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class ResizeWSILFramesAction extends ResizeFramesAction
-{
- public ResizeWSILFramesAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- // Save the current frameset sizes.
- String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
- String perspectiveContentFramesetCols = (String)propertyTable_.get(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-
- // Set the new frameset sizes.
- if (frameName.equals(WsilFrameNames.WSIL_NAVIGATOR_CONTAINER))
- {
- wsilPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- if (perspectiveContentFramesetCols.startsWith("100%"))
- {
- // Restore.
- wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
- }
- else
- {
- // Maximize.
- wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsilPerspective.setPerspectiveContentFramesetCols("100%,0%");
- }
- }
- else if (frameName.equals(WsilFrameNames.WSIL_PROPERTIES_CONTAINER))
- {
- if (actionsContainerFramesetRows.startsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
- wsilPerspective.setActionsContainerFramesetRows(wsilPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsilPerspective.setActionsContainerFramesetRows("100%,0%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- else if (frameName.equals(WsilFrameNames.WSIL_STATUS_CONTAINER))
- {
- if (actionsContainerFramesetRows.endsWith("100%"))
- {
- if (perspectiveContentFramesetCols.endsWith("100%"))
- {
- // Restore.
- wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
- wsilPerspective.setActionsContainerFramesetRows(wsilPerspective.getSavedActionsContainerFramesetRows());
- }
- else
- {
- // Maximize.
- wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- else
- {
- // Maximize.
- wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
- wsilPerspective.setActionsContainerFramesetRows("0%,100%");
- if (!perspectiveContentFramesetCols.endsWith("100%"))
- {
- wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
- wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
- }
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java
deleted file mode 100644
index 18858869c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-
-public class SelectWSILNodeAction extends SelectNodeAction
-{
- public SelectWSILNodeAction(Controller controller)
- {
- super(controller, controller.getWSILPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/SelectWSILNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- if (keepHistory) {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- Node selectedNode = getSelectedNode();
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
- else
- return getActionLink(selectedNode.getNodeId(), true);
- }
-
- public final String getTreeContentVar() {
- return "wsilNavigatorContent";
- }
-
- public final String getTreeContentPage() {
- return "wsil/wsil_navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar() {
- return "wsilPropertiesContainer";
- }
-
- public final String getPropertiesContainerPage() {
- return "wsil/wsil_properties_container.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSIL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java
deleted file mode 100644
index 447826fd3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class SelectWSILToolAction extends SelectNodeToolAction
-{
- public SelectWSILToolAction(Controller controller)
- {
- super(controller, controller.getWSILPerspective().getNodeManager());
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length - 1] = new WSILViewSelectionTransformer(controller_);
- return transformers;
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/SelectWSILToolActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- if (viewID != ActionInputs.VIEWID_DEFAULT)
- {
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- }
- if (keepHistory)
- {
- actionLink.append('&');
- actionLink.append(ActionInputs.ISHISTORY);
- actionLink.append("=1");
- }
- return actionLink.toString();
- }
-
- protected String getActionLinkForHistory()
- {
- boolean keepHistory = false;
- Node selectedNode = getSelectedNode();
- Tool selectedTool = getSelectedTool();
- int toolType = getSelectedTool().getToolType();
- if (toolType == ToolTypes.FORM)
- keepHistory = true;
- else if (toolType == ToolTypes.VIEW)
- {
- int viewID = selectedNode.getViewId();
- if (viewID == ActionInputs.VIEWID_DEFAULT)
- keepHistory = true;
- else
- {
- if (((ViewTool) selectedTool).getToolManager(viewID).getTool(selectedNode.getViewToolId()).getToolType() != ToolTypes.ACTION)
- keepHistory = true;
- }
- }
- if (keepHistory)
- {
- return getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
- }
- else
- return null;
- }
-
- public final String getTreeContentVar()
- {
- return "wsilNavigatorContent";
- }
-
- public final String getTreeContentPage()
- {
- return "wsil/wsil_navigator_content.jsp";
- }
-
- public final String getPropertiesContainerVar()
- {
- return "wsilPropertiesContainer";
- }
-
- public final String getPropertiesContainerPage()
- {
- return "wsil/wsil_properties_container.jsp";
- }
-
- public final String getPropertiesContentVar()
- {
- return "wsilPropertiesContent";
- }
-
- public final String getPropertiesContentPage()
- {
- return "wsil/wsil_properties_content.jsp";
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSIL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java
deleted file mode 100644
index 22b3098b2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public final class SwitchPerspectiveFromWSILAction extends ShowPerspectiveAction
-{
- public SwitchPerspectiveFromWSILAction(Controller controller)
- {
- super(controller);
- }
-
- protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
- {
- String perspectiveContentFramesetCols = parser.getParameter(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = parser.getParameter(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
- if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
- {
- propertyTable_.put(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
- propertyTable_.put(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
- return true;
- }
- return false;
- }
-
- public final boolean run()
- {
- String perspectiveContentFramesetCols = (String)propertyTable_.get(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
- String actionsContainerFramesetRows = (String)propertyTable_.get(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-
- // Save the frameset sizes iff no frame is maximized.
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
- wsilPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-
- if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
- wsilPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-
- return super.run();
- }
-
- public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- StringBuffer formLink = new StringBuffer("wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp?");
- formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
- if (forHistory)
- formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
- return formLink.toString();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java
deleted file mode 100644
index 7b9de303e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class WSILImportWSILToWorkbenchAction extends ImportToWorkbenchAction
-{
- public WSILImportWSILToWorkbenchAction(Controller controller)
- {
- super(controller);
- }
-
- public FormTool getSelectedFormTool()
- {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public ImportToFileSystemAction newImportToFileSystemAction()
- {
- ImportWSILToFileSystemAction action = new ImportWSILToFileSystemAction(controller_);
- Hashtable table = action.getPropertyTable();
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
- return action;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getWSILPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getWSILPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java
deleted file mode 100644
index 55ad48924..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class WsilAddToWSDLPerspectiveAction extends MultipleLinkAction
-{
- public WsilAddToWSDLPerspectiveAction(Controller controller)
- {
- super(controller);
- }
-
- public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
- {
- StringBuffer actionLink = new StringBuffer("wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeID);
- actionLink.append('&');
- actionLink.append(ActionInputs.TOOLID);
- actionLink.append('=');
- actionLink.append(toolID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWID);
- actionLink.append('=');
- actionLink.append(viewID);
- actionLink.append('&');
- actionLink.append(ActionInputs.VIEWTOOLID);
- actionLink.append('=');
- actionLink.append(viewToolID);
- return actionLink.toString();
- }
-
- public static String getBaseActionLink()
- {
- return "wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp";
- }
-
- public ITransformer[] getTransformers()
- {
- ITransformer[] parentTransformers = super.getTransformers();
- ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
- System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
- transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSDL_SERVICE);
- return transformers;
- }
-
- protected boolean executeSingleLinkAction()
- {
- int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
- int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
- WsilElement wsilElement = (WsilElement) selectedNode.getTreeElement();
- WsilWsdlServiceElement wsilWsdlServiceElement = (WsilWsdlServiceElement) wsilElement.getAllWSDLServices().getElementWithViewId(viewID).getObject();
- String wsdlUrl = wsilWsdlServiceElement.getWSDLServiceURL();
- OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
- Hashtable propertyTable = openWSDLAction.getPropertyTable();
- propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
- boolean actionResult = openWSDLAction.run();
- if (actionResult)
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL", wsdlUrl));
- else
- wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE", wsdlUrl));
- return actionResult;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java
deleted file mode 100644
index 01eaf9448..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class WsilImportWSDLToWorkbenchAction extends ImportToWorkbenchAction {
- public WsilImportWSDLToWorkbenchAction(Controller controller) {
- super(controller);
- }
-
- public FormTool getSelectedFormTool() {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public ImportToFileSystemAction newImportToFileSystemAction() {
- ImportWSDLToFileSystemAction action = new ImportWSDLToFileSystemAction(controller_);
- Hashtable table = action.getPropertyTable();
-
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
-
- table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
- table.put(ActionInputs.TOOLID, String.valueOf(selectedNode.getToolManager().getSelectedToolId()));
- table.put(ActionInputs.VIEWID, String.valueOf(selectedNode.getViewId()));
-
- return action;
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getWSILPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getWSILPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java
deleted file mode 100644
index 7ea1a73d5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilUddiServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class WsilLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
- public WsilLaunchWebServiceWizardAction(Controller controller) {
- super(controller);
- }
-
- public static LaunchWebServiceWizardAction newAction(Controller controller) {
- return new WsilLaunchWebServiceWizardAction(controller);
- }
-
- public FormTool getSelectedFormTool() {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
- }
-
- public boolean run() {
- WSILPerspective wsilPerspective = controller_.getWSILPerspective();
- NodeManager nodeManager = wsilPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
- Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
- int viewID = selectedNode.getViewId();
-
- ListElement le = null;
- String url = null;
- if (selectedTool instanceof ListWSDLServicesTool) {
- le = ((WsilElement)selectedElement).getAllWSDLServices().getElementWithViewId(viewID);
- url = ((WsilWsdlServiceElement)le.getObject()).getWSDLServiceURL();
- }
- else if (selectedTool instanceof ListUDDIServicesTool) {
- le = ((WsilElement)selectedElement).getAllUDDIServices().getElementWithViewId(viewID);
- url = ((WsilUddiServiceElement)le.getObject()).getWsdlUrl();
- }
- else
- return false;
- return launchWizard(url);
- }
-
- public final String getStatusContentVar()
- {
- return controller_.getWSILPerspective().getStatusContentVar();
- }
-
- public final String getStatusContentPage()
- {
- return controller_.getWSILPerspective().getStatusContentPage();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java
deleted file mode 100644
index d34d92087..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ToolTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WsilToggleNodeAction extends ToggleNodeAction {
- public WsilToggleNodeAction(Controller controller) {
- super(controller, controller.getFavoritesPerspective().getNodeManager());
- }
-
- public static String getActionLink(int nodeId, boolean open) {
- StringBuffer actionLink = new StringBuffer("wsil/actions/WsilToggleNodeActionJSP.jsp?");
- actionLink.append(ActionInputs.NODEID);
- actionLink.append('=');
- actionLink.append(nodeId);
- actionLink.append('&');
- actionLink.append(ActionInputs.OPEN);
- actionLink.append('=');
- if (open)
- actionLink.append(ActionInputs.OPEN_NODE);
- else
- actionLink.append(ActionInputs.CLOSE_NODE);
- return actionLink.toString();
- }
-
- public final String getActionLinkForHistory() {
- ToolManager toolManager = toggledNode_.getToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- int nodeId = toggledNode_.getNodeId();
- int toolId = selectedTool.getToolId();
- int viewId = toggledNode_.getViewId();
- int viewToolId = toggledNode_.getViewToolId();
- if (selectedTool.getToolType() != ToolTypes.ACTION)
- return SelectWSILToolAction.getActionLink(nodeId, toolId, viewId, viewToolId, true);
- else
- return SelectWSILNodeAction.getActionLink(nodeId, true);
- }
-
- public final String getTreeContentVar()
- {
- return controller_.getWSILPerspective().getTreeContentVar();
- }
-
- public final String getTreeContentPage()
- {
- return controller_.getWSILPerspective().getTreeContentPage();
- }
-
- public final String getPropertiesContainerVar()
- {
- return controller_.getWSILPerspective().getPropertiesContainerVar();
- }
-
- public final String getPropertiesContainerPage()
- {
- return controller_.getWSILPerspective().getPropertiesContainerPage();
- }
-
- public final int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSIL;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java
deleted file mode 100644
index af59916b9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilActionInputs
-{
- // open WSIL form
- public final static String WSIL_URL = "wsilURL";
- public final static String WSIL_INSPECTION_TYPE = "wsilInspectionType";
- public final static int WSIL_DETAILS = 0;
- public final static int WSDL_SERVICES = 1;
- public final static int UDDI_SERVICES = 2;
- public final static int UDDI_BUSINESSES = 3;
- public final static int WSIL_LINKS = 4;
-
- // mass action
- public final static String MULTIPLE_LINK_ACTION = "multipleLinkAction";
-
- // resize WSIL frames action
- public final static String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
- public final static String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java
deleted file mode 100644
index 3735a23b7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilFrameNames
-{
- public final static String WSIL_NAVIGATOR_CONTAINER = "wsil_navigator_container";
- public final static String WSIL_NAVIGATOR_TOOLBAR = "wsil_navigator_toolbar";
- public final static String WSIL_NAVIGATOR_CONTENT = "wsil_navigator_content";
- public final static String WSIL_ACTIONS_CONTAINER = "wsil_actions_container";
- public final static String WSIL_PROPERTIES_CONTAINER = "wsil_properties_container";
- public final static String WSIL_PROPERTIES_TOOLBAR = "wsil_properties_toolbar";
- public final static String WSIL_PROPERTIES_CONTENT = "wsil_properties_content";
- public final static String WSIL_STATUS_CONTAINER = "wsil_status_container";
- public final static String WSIL_STATUS_TOOLBAR = "wsil_status_toolbar";
- public final static String WSIL_STATUS_CONTENT = "wsil_status_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java
deleted file mode 100644
index 5aa8fa5f6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilModelConstants
-{
- // Relation
- public final static String REL_WSIL = "relWSIL";
-
- // List Managers for WsilElement
- public final static String LIST_MANAGER_WSDL_SERVICES = "wsdlServices";
- public final static String LIST_MANAGER_UDDI_SERVICES = "uddiServices";
- public final static String LIST_MANAGER_UDDI_LINKS = "uddiLinks";
- public final static String LIST_MANAGER_WSIL_LINKS = "wsilLinks";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java
deleted file mode 100644
index 14e01aa96..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class WsilCommonElement extends BasicElement
-{
- private String baseWsilURL;
- private String relativeURIBase;
-
- public WsilCommonElement(String name, Model model)
- {
- super(name, model);
- }
-
- public String getBaseWsilURL()
- {
- return baseWsilURL;
- }
-
- public void setBaseWsilURL(String baseWsilURL)
- {
- this.baseWsilURL = baseWsilURL;
- }
-
- private final char FWD_SLASH = '/';
- private final char BWD_SLASH = '\\';
- private final char PROTOCOL_INDICATOR = ':';
-
- public String makeAbsolute(String uri)
- {
- if (baseWsilURL != null && uri != null && uri.indexOf(PROTOCOL_INDICATOR) == -1)
- {
- if (relativeURIBase == null)
- {
- relativeURIBase = baseWsilURL.replace(BWD_SLASH, FWD_SLASH);
- int index = relativeURIBase.lastIndexOf(FWD_SLASH);
- relativeURIBase = baseWsilURL.substring(0, index + 1);
- }
- StringBuffer sb = new StringBuffer(relativeURIBase);
- sb.append(uri);
- return sb.toString();
- }
- return uri;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java
deleted file mode 100644
index a74761384..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Vector;
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Description;
-import org.apache.wsil.Inspection;
-import org.apache.wsil.Link;
-import org.apache.wsil.Service;
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-
-/**
- * The data model element that represents a WSIL document
- */
-public class WsilElement extends TreeElement
-{
- private WSILDocument wsilDoc_;
- private String thisWsilUrl_;
- /** ****************** Namespace ********** */
- private static final String NAMESPACE_WSDL = "http://schemas.xmlsoap.org/wsdl/";
- private static final String NAMESPACE_UDDI_V1 = "urn:uddi-org:api";
- private static final String NAMESPACE_UDDI_V2 = "urn:uddi-org:api_v2";
- //private static final String NAMESPACE_UDDI_BINDING = "http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/";
- private static final String NAMESPACE_WSIL_INSPECTION = "http://schemas.xmlsoap.org/ws/2001/10/inspection/";
- /** ****************** Rels **************** */
- // Relation for a WSIL doucment and its link nodes
- public static final String REL_WSIL_LINK = "wsil link nodes";
-
- public WsilElement(String name, Model model, WSILDocument wsilDocument, String wsilURL)
- {
- super(name, model);
- wsilDoc_ = wsilDocument;
- thisWsilUrl_ = wsilURL;
- ListManager wsdlServices_ = null;
- ListManager uddiServices_ = null;
- ListManager wsilLinks_ = null;
- ListManager uddiLinks_ = null;
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, wsilLinks_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, uddiLinks_);
- }
-
- /*
- * Refresh the WSIL document
- */
- public boolean refresh()
- {
- try
- {
- WSILDocument newWSILDoc = WSILDocument.newInstance();
- newWSILDoc.read(getWsilUrl());
- wsilDoc_ = newWSILDoc;
- ListManager wsdlServices_ = null;
- ListManager uddiServices_ = null;
- ListManager wsilLinks_ = null;
- ListManager uddiLinks_ = null;
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, wsilLinks_);
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, uddiLinks_);
- return true;
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
- /*
- * Returns the WSIL's URL
- */
- public String getWsilUrl()
- {
- return thisWsilUrl_;
- }
-
- /*
- * Returns the WSIL document
- */
- public WSILDocument getWSILDocument()
- {
- return wsilDoc_;
- }
-
- /*
- * Returns all abstract languages
- */
- public Vector getWSILAbstractLangs()
- {
- Vector v = new Vector();
- Abstract[] abstracts = wsilDoc_.getInspection().getAbstracts();
- for (int i = 0; i < abstracts.length; i++)
- {
- v.add(abstracts[i].getLang());
- }
- return v;
- }
-
- /*
- * Returns all abstracts
- */
- public Vector getWSILAbstracts()
- {
- Vector v = new Vector();
- Abstract[] abstracts = wsilDoc_.getInspection().getAbstracts();
- for (int i = 0; i < abstracts.length; i++)
- {
- v.add(abstracts[i].getText());
- }
- return v;
- }
-
- public ListManager getAllWSDLServices()
- {
- ListManager wsdlServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES);
- if (wsdlServices_ == null)
- {
- initAllWSDLServices();
- wsdlServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES);
- }
- return wsdlServices_;
- }
-
- public ListManager getAllUDDIServices()
- {
- ListManager uddiServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES);
- if (uddiServices_ == null)
- {
- initAllUDDIServices();
- uddiServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES);
- }
- return uddiServices_;
- }
-
- private void initAllWSDLServices()
- {
- ListManager wsdlServices_ = new ListManager();
- Inspection inspection = wsilDoc_.getInspection();
- Service[] serviceList = inspection.getServices();
- for (int i = 0; i < serviceList.length; i++)
- {
- // skip any service without a wsdl namespace
- // and invalid descriptions
- Description[] descList = serviceList[i].getDescriptions();
- if (descList.length < 1)
- continue;
- String namespace = descList[0].getReferencedNamespace();
- if (namespace == null)
- continue;
- else if (namespace.equals(NAMESPACE_WSDL))
- {
- WsilWsdlServiceElement wsdlServiceElement = new WsilWsdlServiceElement(namespace, getModel(), serviceList[i]);
- wsdlServiceElement.setBaseWsilURL(getWsilUrl());
- if (wsdlServiceElement.validateWSDLService())
- {
- wsdlServiceElement.setName(wsdlServiceElement.getWSDLServiceURL());
- wsdlServices_.add(new ListElement(wsdlServiceElement));
- }
- }
- }
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
- }
-
- private void initAllUDDIServices()
- {
- ListManager uddiServices_ = new ListManager();
- Inspection inspection = wsilDoc_.getInspection();
- Service[] serviceList = inspection.getServices();
- Vector uddiServiceElements = new Vector();
- for (int i = 0; i < serviceList.length; i++)
- {
- // skip any service without a wsdl namespace
- // and invalid descriptions
- Description[] descList = serviceList[i].getDescriptions();
- if (descList.length < 1)
- continue;
- String namespace = descList[0].getReferencedNamespace();
- if (namespace == null)
- continue;
- else if ((namespace.equals(NAMESPACE_UDDI_V1) || namespace.equals(NAMESPACE_UDDI_V2)))
- {
- WsilUddiServiceElement uddiServiceElement = new WsilUddiServiceElement(namespace, getModel(), serviceList[i]);
- uddiServiceElement.setBaseWsilURL(getWsilUrl());
- if (uddiServiceElement.validateUDDIService())
- {
- uddiServiceElement.setName(uddiServiceElement.getName());
- uddiServiceElements.add(uddiServiceElement);
- }
- }
- }
- refreshServiceDefinitionsFromRegistry(uddiServiceElements);
- for (Iterator it = uddiServiceElements.iterator(); it.hasNext();)
- {
- uddiServices_.add(new ListElement(it.next()));
- }
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
- }
-
- public void refreshServiceDefinitionsFromRegistry(Vector uddiServiceElements)
- {
- HashMap inquiryAPIToServices = new HashMap();
- for (int i = 0; i < uddiServiceElements.size(); i++)
- {
- WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) uddiServiceElements.get(i);
- String inquiryAPI = uddiServiceElement.getUDDIServiceInquiryAPI();
- if (Validator.validateURL(inquiryAPI))
- {
- Vector services = (Vector) inquiryAPIToServices.get(inquiryAPI);
- if (services == null)
- {
- services = new Vector();
- inquiryAPIToServices.put(inquiryAPI, services);
- }
- services.add(uddiServiceElement);
- }
- else
- uddiServiceElement.setServiceDefinition(null);
- }
- for (Iterator it = inquiryAPIToServices.keySet().iterator(); it.hasNext();)
- {
- String inquiryAPI = (String) it.next();
- Vector services = (Vector) inquiryAPIToServices.get(inquiryAPI);
- UDDIProxy proxy;
- try
- {
- Properties props = new Properties();
- props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
- proxy = new UDDIProxy(props);
- proxy.setInquiryURL(new URL(inquiryAPI));
- }
- catch (Throwable t)
- {
- for (int j = 0; j < services.size(); j++)
- {
- WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) services.get(j);
- uddiServiceElement.setServiceDefinition(null);
- }
- continue;
- }
- Vector serviceKeys = new Vector();
- for (int j = 0; j < services.size(); j++)
- {
- serviceKeys.add(((WsilUddiServiceElement) services.get(j)).getUDDIServiceKey());
- }
- Vector businessServices;
- try
- {
- businessServices = proxy.get_serviceDetail(serviceKeys).getBusinessServiceVector();
- }
- catch (Exception ex)
- {
- businessServices = new Vector();
- if (serviceKeys.size() > 1)
- {
- for (int k = 0; k < serviceKeys.size(); k++)
- {
- try
- {
- businessServices.add((BusinessService) proxy.get_serviceDetail((String) serviceKeys.get(k)).getBusinessServiceVector().get(0));
- }
- catch (Exception exception)
- {
- businessServices.add(null);
- }
- }
- }
- else
- businessServices.add(null);
- }
- for (int k = 0; k < services.size(); k++)
- {
- BusinessService bs = (BusinessService) businessServices.get(k);
- WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) services.get(k);
- uddiServiceElement.setServiceDefinition(bs);
- }
- }
- }
-
- public ListManager getAllWSILLinks()
- {
- ListManager wsilLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS);
- if (wsilLinks_ == null)
- {
- initAllWSILLinks();
- wsilLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS);
- }
- return wsilLinks_;
- }
-
- public ListManager getAllUDDILinks()
- {
- ListManager uddiLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS);
- if (uddiLinks_ == null)
- {
- initAllUDDILinks();
- uddiLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS);
- }
- return uddiLinks_;
- }
-
- private void initAllUDDILinks()
- {
- ListManager uddiLinks_ = new ListManager();
- Inspection inspection = wsilDoc_.getInspection();
- Link[] linkList = inspection.getLinks();
- Vector uddiBusinessElements = new Vector();
- for (int i = 0; i < linkList.length; i++)
- {
- // process any links with UDDI namespace
- String namespace = linkList[i].getReferencedNamespace();
- if (namespace == null)
- continue;
- else if ((namespace.equals(NAMESPACE_UDDI_V1) || namespace.equals(NAMESPACE_UDDI_V2)))
- {
- WsilUddiBusinessElement uddiBusinessElement = new WsilUddiBusinessElement(namespace, getModel(), linkList[i]);
- uddiBusinessElement.setBaseWsilURL(getWsilUrl());
- if (uddiBusinessElement.validateUDDILink())
- {
- uddiBusinessElement.setName(uddiBusinessElement.getName());
- uddiBusinessElements.add(uddiBusinessElement);
- }
- }
- }
- refreshServiceProvidersFromRegistry(uddiBusinessElements);
- for (Iterator it = uddiBusinessElements.iterator(); it.hasNext();)
- {
- uddiLinks_.add(new ListElement(it.next()));
- }
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, uddiLinks_);
- }
-
- public void refreshServiceProvidersFromRegistry(Vector uddiBusinessElements)
- {
- HashMap inquiryAPIToBusinesses = new HashMap();
- for (int i = 0; i < uddiBusinessElements.size(); i++)
- {
- WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) uddiBusinessElements.get(i);
- String inquiryAPI = uddiBusinessElement.getUDDILinkInquiryAPI();
- if (Validator.validateURL(inquiryAPI))
- {
- Vector businesses = (Vector) inquiryAPIToBusinesses.get(inquiryAPI);
- if (businesses == null)
- {
- businesses = new Vector();
- inquiryAPIToBusinesses.put(inquiryAPI, businesses);
- }
- businesses.add(uddiBusinessElement);
- }
- else
- uddiBusinessElement.setServiceProvider(null);
- }
- for (Iterator it = inquiryAPIToBusinesses.keySet().iterator(); it.hasNext();)
- {
- String inquiryAPI = (String) it.next();
- Vector businesses = (Vector) inquiryAPIToBusinesses.get(inquiryAPI);
- UDDIProxy proxy;
- try
- {
- Properties props = new Properties();
- props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
- proxy = new UDDIProxy(props);
- proxy.setInquiryURL(new URL(inquiryAPI));
- }
- catch (Exception e)
- {
- for (int j = 0; j < businesses.size(); j++)
- {
- WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) businesses.get(j);
- uddiBusinessElement.setServiceProvider(null);
- }
- continue;
- }
- Vector businessKeys = new Vector();
- for (int j = 0; j < businesses.size(); j++)
- {
- businessKeys.add(((WsilUddiBusinessElement) businesses.get(j)).getUDDILinkBusinessKey());
- }
- Vector businessEntities;
- try
- {
- businessEntities = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
- }
- catch (Exception ex)
- {
- businessEntities = new Vector();
- if (businessKeys.size() > 1)
- {
- for (int k = 0; k < businessKeys.size(); k++)
- {
- try
- {
- businessEntities.add((BusinessEntity) proxy.get_businessDetail((String) businessKeys.get(k)).getBusinessEntityVector().get(0));
- }
- catch (Exception exception)
- {
- businessEntities.add(null);
- }
- }
- }
- else
- businessEntities.add(null);
- }
- for (int k = 0; k < businesses.size(); k++)
- {
- BusinessEntity be = (BusinessEntity) businessEntities.get(k);
- WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) businesses.get(k);
- uddiBusinessElement.setServiceProvider(be);
- }
- }
- }
-
- private void initAllWSILLinks()
- {
- ListManager wsilLinks_ = new ListManager();
- Inspection inspection = wsilDoc_.getInspection();
- Link[] linkList = inspection.getLinks();
- for (int i = 0; i < linkList.length; i++)
- {
- // process any links with UDDI namespace
- String namespace = linkList[i].getReferencedNamespace();
- if (namespace == null)
- continue;
- else if (namespace.equals(NAMESPACE_WSIL_INSPECTION))
- {
- WsilWsilLinkElement wsilLinkElement = new WsilWsilLinkElement(namespace, getModel(), linkList[i]);
- wsilLinkElement.setBaseWsilURL(getWsilUrl());
- if (wsilLinkElement.validateWSILLink())
- {
- wsilLinkElement.setName(wsilLinkElement.getWSILLinkLocation());
- wsilLinks_.add(new ListElement(wsilLinkElement));
- }
- }
- }
- setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, wsilLinks_);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java
deleted file mode 100644
index 96b594e90..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents
-* a WSIL Link
-*/
-public class WsilLinkElement extends WsilCommonElement
-{
- protected Link link_;
-
- public WsilLinkElement(String name, Model model, Link link)
- {
- super(name, model);
- link_ = link;
- }
-
- public Vector getLinkAbstractLangs()
- {
- Vector v = new Vector();
- Abstract[] abstracts = link_.getAbstracts();
- for (int i = 0; i < abstracts.length; i++)
- {
- v.add(abstracts[i].getLang());
- }
- return v;
- }
-
- public Vector getLinkAbstracts()
- {
- Vector v = new Vector();
- Abstract[] abstracts = link_.getAbstracts();
- for (int i = 0; i < abstracts.length; i++)
- {
- v.add(abstracts[i].getText());
- }
- return v;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java
deleted file mode 100644
index b8935d319..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-import org.apache.wsil.Abstract;
-import org.apache.wsil.Service;
-import org.apache.wsil.ServiceName;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents
-* a WSIL Service
-*/
-public class WsilServiceElement extends WsilCommonElement
-{
- protected Service service_;
-
- public WsilServiceElement(String name, Model model, Service service) {
- super(name, model);
- service_ = service;
- }
-
- public Vector getServiceNameLangs() {
- Vector v = new Vector();
- ServiceName[] serviceNames = service_.getServiceNames();
- for (int i = 0; i < serviceNames.length; i++) {
- v.add(serviceNames[i].getLang());
- }
- return v;
- }
-
- public Vector getServiceNames() {
- Vector v = new Vector();
- ServiceName[] serviceNames = service_.getServiceNames();
- for (int i = 0; i < serviceNames.length; i++) {
- v.add(serviceNames[i].getText());
- }
- return v;
- }
-
- public Vector getServiceAbstractLangs() {
- Vector v = new Vector();
- Abstract[] abstracts = service_.getAbstracts();
- for (int i = 0; i < abstracts.length; i++) {
- v.add(abstracts[i].getLang());
- }
- return v;
- }
-
- public Vector getServiceAbstracts() {
- Vector v = new Vector();
- Abstract[] abstracts = service_.getAbstracts();
- for (int i = 0; i < abstracts.length; i++) {
- v.add(abstracts[i].getText());
- }
- return v;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java
deleted file mode 100644
index 23e500017..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.apache.wsil.Link;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.uddi.BusinessDescription;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.util.DiscoveryURL;
-
-/**
-* The data model element that represents
-* a UDDI service in a WSIL document
-*/
-public class WsilUddiBusinessElement extends WsilLinkElement
-{
- private BusinessEntity busEntity_;
-
- public WsilUddiBusinessElement(String name, Model model, Link link) {
- super(name, model, link);
- busEntity_ = null;
- }
-
- public void setServiceProvider(BusinessEntity be) {
- busEntity_ = be;
- }
-
- public BusinessEntity getServiceProvider() {
- return busEntity_;
- }
-
- public String getName() {
- return (busEntity_ == null) ? null : busEntity_.getDefaultNameString();
- }
-
- public String getDescription() {
- return (busEntity_ == null) ? null : busEntity_.getDefaultDescriptionString();
- }
-
- public String getUDDILinkInquiryAPI() {
- BusinessDescription bd = getValidUDDIBusinessDescription();
- return (bd == null) ? null : bd.getLocation();
- }
-
- public String getUDDILinkBusinessKey() {
- BusinessDescription bd = getValidUDDIBusinessDescription();
- return (bd == null) ? null : bd.getBusinessKey().getText();
- }
-
- public String getUDDILinkDiscoveryURL() {
- BusinessDescription bd = getValidUDDIBusinessDescription();
- if (bd == null)
- return null;
- else {
- DiscoveryURL discoveryURL = bd.getDiscoveryURL();
- return (discoveryURL == null) ? null : discoveryURL.getText();
- }
- }
-
- public boolean validateUDDILink() {
- BusinessDescription bd = getValidUDDIBusinessDescription();
- return (bd != null);
- }
-
- private BusinessDescription getValidUDDIBusinessDescription() {
- ExtensionElement extElement = link_.getExtensionElement();
- // The extension element of a UDDI link
- // must be a BusinessDescription element
- if (!(extElement instanceof BusinessDescription))
- return null;
- // A valid BusinessDescription must have an inquiry API
- String inquiryAPI = ((BusinessDescription)extElement).getLocation();
- if (!Validator.validateURL(inquiryAPI))
- return null;
- // A valid BusinessDescription must have a business key
- String businessKey = ((BusinessDescription)extElement).getBusinessKey().getText();
- if (businessKey == null || businessKey.length() <= 0)
- return null;
- return (BusinessDescription)extElement;
- }
-
- public String toString() {
- return getName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java
deleted file mode 100644
index 2418dc9a5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.apache.wsil.Description;
-import org.apache.wsil.Service;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.uddi.ServiceDescription;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.util.DiscoveryURL;
-
-/**
-* The data model element that represents
-* a UDDI service in a WSIL document
-*/
-public class WsilUddiServiceElement extends WsilServiceElement
-{
- private BusinessService busService_;
-
- public WsilUddiServiceElement(String name, Model model, Service service) {
- super(name, model, service);
- busService_ = null;
- }
-
- public void setServiceDefinition(BusinessService busService) {
- busService_ = busService;
- }
-
- public BusinessService getServiceDefinition() {
- return busService_;
- }
-
- public String getName() {
- return (busService_ == null) ? null : busService_.getDefaultNameString();
- }
-
- public String getDescription() {
- return (busService_ == null) ? null : busService_.getDefaultDescriptionString();
- }
-
- public String getUDDIServiceInquiryAPI() {
- ServiceDescription sd = getValidUDDIServiceDescription();
- return (sd == null) ? null : sd.getLocation();
- }
-
- public String getUDDIServiceKey() {
- ServiceDescription sd = getValidUDDIServiceDescription();
- return (sd == null) ? null : sd.getServiceKey().getText();
- }
-
- public String getUDDIServiceDiscoveryURL() {
- ServiceDescription sd = getValidUDDIServiceDescription();
- if (sd == null)
- return null;
- else {
- DiscoveryURL discoveryURL = sd.getDiscoveryURL();
- return (discoveryURL == null) ? null : discoveryURL.getText();
- }
- }
-
- private ServiceDescription getValidUDDIServiceDescription() {
- Description[] descList = service_.getDescriptions();
- for (int i = 0; i < descList.length; i++) {
- ExtensionElement extElement = descList[i].getExtensionElement();
- // The extension element of a UDDI service description
- // must be a ServiceDescription element
- if (!(extElement instanceof ServiceDescription))
- continue;
- // A valid ServiceDescription must have an inquiry API
- if (!Validator.validateURL(((ServiceDescription)extElement).getLocation()))
- continue;
- // A valid ServiceDescription must have a service key
- String serviceKey = ((ServiceDescription)extElement).getServiceKey().getText();
- if (serviceKey == null || serviceKey.length() <= 0)
- continue;
- return (ServiceDescription)extElement;
- }
- return null;
- }
-
- public boolean validateUDDIService() {
- ServiceDescription sd = getValidUDDIServiceDescription();
- return (sd != null);
- }
-
- public String getWsdlUrl() {
- return (new Uddi4jHelper()).getWSDL(getServiceDefinition(), null);
- }
-
- public String toString() {
- return getName();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java
deleted file mode 100644
index d3bad3342..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-import org.apache.wsil.Description;
-import org.apache.wsil.Service;
-import org.apache.wsil.extension.ExtensionElement;
-import org.apache.wsil.extension.wsdl.ImplementedBinding;
-import org.apache.wsil.extension.wsdl.Reference;
-import org.apache.wsil.extension.wsdl.ReferencedService;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents
-* a WSDL service in a WSIL document
-*/
-public class WsilWsdlServiceElement extends WsilServiceElement
-{
- public WsilWsdlServiceElement(String name, Model model, Service service) {
- super(name, model, service);
- }
-
- public String getWSDLServiceURL() {
- Description desc = getValidWSDLDescription();
- return (desc == null) ? null : makeAbsolute(desc.getLocation());
- }
-
- public Vector getWSDLBinding() {
- Vector v = new Vector();
- Description[] descList = service_.getDescriptions();
- for (int i = 0; i < descList.length; i++) {
- ExtensionElement extElement = descList[i].getExtensionElement();
- if (extElement != null && extElement instanceof Reference) {
- ReferencedService refService = ((Reference)extElement).getReferencedService();
- if (refService != null) {
- v.add(refService.getReferencedServiceName());
- }
- ImplementedBinding[] implBindingList = ((Reference)extElement).getImplementedBindings();
- for (int j = 0; j < implBindingList.length; j++) {
- v.add(implBindingList[j].getBindingName());
- }
- }
- }
- return v;
- }
-
- private Description getValidWSDLDescription() {
- Description[] descList = service_.getDescriptions();
- for (int i = 0; i < descList.length; i++) {
- // skip this description if the locatioin attribute is a malformed URL
- String location = descList[i].getLocation();
- if (location == null || location.length() <= 0)
- continue;
- // skip this description if the extension element indicates
- // that the description's location contains only the wsdl binding
- ExtensionElement extElement = descList[i].getExtensionElement();
- if (extElement != null && extElement instanceof Reference) {
- Boolean endpointPresent = ((Reference)extElement).getEndpointPresent();
- if (endpointPresent != null && endpointPresent.booleanValue() == false)
- continue;
- }
- // a valid description is found
- return descList[i];
- }
- // no valid description is found for this service
- return null;
- }
-
- public boolean validateWSDLService() {
- Description desc = getValidWSDLDescription();
- return (desc != null);
- }
-
- public String toString() {
- return getWSDLServiceURL();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java
deleted file mode 100644
index c94a57335..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* The data model element that represents
-* a WSIL link in a WSIL document
-*/
-public class WsilWsilLinkElement extends WsilLinkElement
-{
- public WsilWsilLinkElement(String name, Model model, Link link)
- {
- super(name, model, link);
- }
-
- public String getWSILLinkLocation()
- {
- return makeAbsolute(link_.getLocation());
- }
-
- public boolean validateWSILLink()
- {
- return (link_.getLocation() != null);
- }
-
- public String toString()
- {
- return getWSILLinkLocation();
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java
deleted file mode 100644
index a7b5329f5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddBusinessToFavoritesTool extends ActionTool {
- public AddBusinessToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java
deleted file mode 100644
index b4f2d586f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddBusinessToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddBusinessToUDDIPerspectiveTool extends ActionTool {
- public AddBusinessToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/add_to_UDDI_perspective_enabled.gif", "wsil/images/add_to_UDDI_perspective_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddBusinessToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java
deleted file mode 100644
index 299e3e52b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddServiceToFavoritesTool extends ActionTool {
- public AddServiceToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java
deleted file mode 100644
index e98beb0dc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddServiceToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddServiceToUDDIPerspectiveTool extends ActionTool {
- public AddServiceToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/add_to_UDDI_perspective_enabled.gif", "wsil/images/add_to_UDDI_perspective_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddServiceToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java
deleted file mode 100644
index e9d0a4787..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddWSDLServiceToFavoritesTool extends ActionTool {
- public AddWSDLServiceToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java
deleted file mode 100644
index b180ad0a3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddWSILToFavoritesTool extends ActionTool {
- public AddWSILToFavoritesTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java
deleted file mode 100644
index d3580ffcf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ClearWSILAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ClearWSILTool extends ActionTool {
- public ClearWSILTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/clear_enabled.gif", "images/clear_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- return ClearWSILAction.getActionLink(toolManager_.getNode().getNodeId());
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java
deleted file mode 100644
index 06f386682..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ImportWSDLToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ImportWSDLToFileSystemTool extends ImportToFileSystemTool {
- public ImportWSDLToFileSystemTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return ImportWSDLToFileSystemAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java
deleted file mode 100644
index 8aca2d16b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ImportWSILToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ImportWSILToFileSystemTool extends ImportToFileSystemTool {
- public ImportWSILToFileSystemTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- return ImportWSILToFileSystemAction.getActionLink(toolManager_.getNode().getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java
deleted file mode 100644
index 2bee56d8a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListUDDIBusinessTool extends ViewTool {
- public ListUDDIBusinessTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/list_business_enabled.gif", "wsil/images/list_business_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
- new WsilSetDefaultViewTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
- }
-
- protected void addTools(ToolManager viewToolManager, int index) {
- new UddiBusinessDetailsTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_UDDI_LINK_DETAILS"));
- new AddBusinessToUDDIPerspectiveTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_ADD_BUSINESS_TO_UDDI_PERSPECTIVE"));
- new AddBusinessToFavoritesTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_ADD_UDDI_BUSINESS_TO_FAVORITES"));
- new RefreshUDDIBusinessTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_REFRESH_UDDI_BUSINESS"));
- }
-
- public String getFormLink() {
- return ProxyLoadPageAction.getActionLink("wsil/views/UddiBusinessView.jsp");
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java
deleted file mode 100644
index 8bb069584..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListUDDIServicesTool extends ViewTool {
- public ListUDDIServicesTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/list_UDDI_service_enabled.gif", "wsil/images/list_UDDI_service_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
- new WsilSetDefaultViewTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
- }
-
- protected void addTools(ToolManager viewToolManager, int index) {
- Controller controller = toolManager_.getNode().getNodeManager().getController();
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- new UddiServiceDetailsTool(viewToolManager, wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS"));
- new WsilImportWSDLToWorkbenchTool(viewToolManager, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new ImportWSDLToFileSystemTool(viewToolManager, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new WsilLaunchWebServiceWizardTool(viewToolManager, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new AddServiceToUDDIPerspectiveTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_SERVICE_TO_UDDI_PERSPECTIVE"));
- new AddServiceToFavoritesTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_SERVICE_TO_FAVORITES"));
- new RefreshUDDIServiceTool(viewToolManager, wsilPerspective.getMessage("ALT_REFRESH_UDDI_SERVICE"));
- }
-
- public String getFormLink() {
- return ProxyLoadPageAction.getActionLink("wsil/views/UddiServicesView.jsp");
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java
deleted file mode 100644
index 76b9ed6fc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListWSDLServicesTool extends ViewTool {
- public ListWSDLServicesTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/list_WSDL_service_enabled.gif", "wsil/images/list_WSDL_service_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
- new WsilSetDefaultViewTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
- }
-
- protected void addTools(ToolManager viewToolManager, int index) {
- Controller controller = toolManager_.getNode().getNodeManager().getController();
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- new WsdlServiceDetailsTool(viewToolManager, wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS"));
- new WsilImportWSDLToWorkbenchTool(viewToolManager, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
- new ImportWSDLToFileSystemTool(viewToolManager, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
- new WsilLaunchWebServiceWizardTool(viewToolManager, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
- new WsilAddToWSDLPerspectiveTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE"));
- new AddWSDLServiceToFavoritesTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_WSDL_SERVICE_TO_FAVORITES"));
- }
-
- public String getFormLink() {
- return "wsil/views/WsdlServicesView.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java
deleted file mode 100644
index c45b82fd7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListWSILLinksTool extends ViewTool {
- public ListWSILLinksTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/list_WSIL_enabled.gif", "wsil/images/list_WSIL_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
- new WsilSetDefaultViewTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
- }
-
- protected void addTools(ToolManager viewToolManager, int index) {
- new WsilLinkDetailsTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_WSIL_LINK_DETAILS"));
- new OpenWSILLinkTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_OPEN_WSIL_LINK"));
- }
-
- public String getFormLink() {
- return "wsil/views/WsilLinksView.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java
deleted file mode 100644
index 5e51cee42..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILLinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class OpenWSILLinkTool extends ActionTool {
- public OpenWSILLinkTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/open_wsil_enabled.gif", "wsil/images/open_wsil_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return OpenWSILLinkAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java
deleted file mode 100644
index 2191a47b6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class OpenWSILTool extends FormTool {
- public OpenWSILTool(ToolManager toolManager, String alt) {
- super(toolManager, "wsil/images/open_wsil_enabled.gif", "wsil/images/open_wsil_highlighted.gif", alt);
- }
-
- protected void initDefaultProperties() {
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/OpenWSILForm.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java
deleted file mode 100644
index c6f73b009..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshUDDIBusinessTool extends ActionTool {
- public RefreshUDDIBusinessTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return RefreshAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java
deleted file mode 100644
index b8c82a748..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshUDDIServiceTool extends ActionTool {
- public RefreshUDDIServiceTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return RefreshAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java
deleted file mode 100644
index fce8a51e7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshWSILTool extends ActionTool {
- public RefreshWSILTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getActionLink() {
- return RefreshAction.getActionLink(toolManager_.getNode().getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java
deleted file mode 100644
index 964611a78..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class UddiBusinessDetailsTool extends FormTool {
- public UddiBusinessDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/UddiBusinessDetailsPage.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java
deleted file mode 100644
index 844003299..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class UddiServiceDetailsTool extends FormTool {
- public UddiServiceDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/UddiServiceDetailsPage.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java
deleted file mode 100644
index c977d0c8b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WSILImportWSILToWorkbenchTool extends ImportToWorkbenchTool
-{
- public WSILImportWSILToWorkbenchTool(ToolManager toolManager, String alt)
- {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory)
- {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public final String getFormLink()
- {
- return "wsil/forms/WSILImportWSILToWorkbenchForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java
deleted file mode 100644
index 5ae81f8e8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SwitchPerspectiveFromWSILAction;
-
-public class WSILPerspective extends Perspective
-{
- private BasicModel model_;
- private NodeManager nodeManager_;
- private String perspectiveContentFramesetCols_;
- private String savedPerspectiveContentFramesetCols_;
- private String actionsContainerFramesetRows_;
- private String savedActionsContainerFramesetRows_;
-
- public WSILPerspective(Controller controller)
- {
- super("wsil",controller);
- }
-
- public final void initPerspective(ServletContext application)
- {
- model_ = new BasicModel("WsilModel");
- TreeElement treeElement = new TreeElement(getMessage("WSIL_MAIN_NODE"), model_);
- model_.setRootElement(treeElement);
- nodeManager_ = new NodeManager(controller_);
- WsilMainNode wsilMainNode = new WsilMainNode(treeElement, nodeManager_);
- nodeManager_.setRootNode(wsilMainNode);
-
- // Starting frameset sizes.
- if (!DirUtils.isRTL())
- perspectiveContentFramesetCols_ = "30%,*";
- else
- perspectiveContentFramesetCols_ = "*,30%";
- savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
- actionsContainerFramesetRows_ = "75%,*";
- savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
- }
-
- public NodeManager getNodeManager() {
- return nodeManager_;
- }
-
- public String getPerspectiveContentPage()
- {
- return "wsil/wsil_perspective_content.jsp";
- }
-
- public int getPerspectiveId()
- {
- return ActionInputs.PERSPECTIVE_WSIL;
- }
-
- public String getPanesFile() {
- return "wsil/scripts/wsilPanes.jsp";
- }
-
- public String getFramesetsFile()
- {
- return "wsil/scripts/wsilframesets.jsp";
- }
-
- public String getProcessFramesetsForm()
- {
- return "wsil/forms/ProcessWSILFramesetsForm.jsp";
- }
-
- public String getTreeContentVar() {
- return "wsilNavigatorContent";
- }
-
- public String getTreeContentPage() {
- return "wsil/wsil_navigator_content.jsp";
- }
-
- public String getPropertiesContainerVar() {
- return "wsilPropertiesContainer";
- }
-
- public String getPropertiesContainerPage() {
- return "wsil/wsil_properties_container.jsp";
- }
-
- public String getStatusContentVar() {
- return "wsilStatusContent";
- }
-
- public String getStatusContentPage() {
- return "wsil/wsil_status_content.jsp";
- }
-
- public final String getPerspectiveContentFramesetCols()
- {
- return perspectiveContentFramesetCols_;
- }
-
- public final void setPerspectiveContentFramesetCols(String cols)
- {
- perspectiveContentFramesetCols_ = cols;
- }
-
- public final String getSavedPerspectiveContentFramesetCols()
- {
- return savedPerspectiveContentFramesetCols_;
- }
-
- public final void setSavedPerspectiveContentFramesetCols(String cols)
- {
- savedPerspectiveContentFramesetCols_ = cols;
- }
-
- public final String getActionsContainerFramesetRows()
- {
- return actionsContainerFramesetRows_;
- }
-
- public final void setActionsContainerFramesetRows(String rows)
- {
- actionsContainerFramesetRows_ = rows;
- }
-
- public final String getSavedActionsContainerFramesetRows()
- {
- return savedActionsContainerFramesetRows_;
- }
-
- public final void setSavedActionsContainerFramesetRows(String rows)
- {
- savedActionsContainerFramesetRows_ = rows;
- }
-
- public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
- {
- return SwitchPerspectiveFromWSILAction.getFormActionLink(targetPerspectiveId,forHistory);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java
deleted file mode 100644
index a35922ced..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsdlServiceDetailsTool extends FormTool {
- public WsdlServiceDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/WsdlServiceDetailsPage.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java
deleted file mode 100644
index 4fa0fdc54..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.AddToWSDLPerspectiveTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilAddToWSDLPerspectiveAction;
-
-public class WsilAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
-
- public WsilAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
- super(toolManager,alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return WsilAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java
deleted file mode 100644
index 7c4d40978..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilDetailsTool extends FormTool {
- public WsilDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/WsilDetailsPage.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java
deleted file mode 100644
index 8b1eda4c5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilImportWSDLToWorkbenchTool extends ImportToWorkbenchTool {
- public WsilImportWSDLToWorkbenchTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public final String getFormLink()
- {
- return "wsil/forms/WsilImportWSDLToWorkbenchForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java
deleted file mode 100644
index 1c5d75d1f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
- public WsilLaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public final String getFormLink()
- {
- return "wsil/forms/WsilLaunchWebServiceWizardForm.jsp";
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java
deleted file mode 100644
index 3d7819741..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilLinkDetailsTool extends FormTool {
- public WsilLinkDetailsTool(ToolManager toolManager, String alt) {
- super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
- }
-
- public String getFormLink() {
- return "wsil/forms/WsilLinkDetailsPage.jsp";
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java
deleted file mode 100644
index d57d5c82b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.ElementAdapter;
-import org.eclipse.wst.ws.internal.datamodel.RelAddEvent;
-import org.eclipse.wst.ws.internal.datamodel.RelRemoveEvent;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-
-public class WsilMainNode extends WsilNavigatorNode {
-
- public WsilMainNode(TreeElement treeElement, NodeManager nodeManager) {
- super(treeElement, nodeManager, 1, "images/root_main.gif");
- treeElement.addListener(new ElementAdapter() {
- public void relAdded(RelAddEvent event) {
- String rel = event.getOutBoundRelName();
- if (rel.equals(WsilModelConstants.REL_WSIL)) {
- WsilNode wsilNode = new WsilNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
- addChild(wsilNode);
- }
- }
-
- public void relRemoved(RelRemoveEvent event) {
- TreeElement childElement = null;
- if (event.getInBoundRelName().equals(WsilModelConstants.REL_WSIL)) {
- childElement = (TreeElement)event.getInboundElement();
- }
- if (event.getOutBoundRelName().equals(WsilModelConstants.REL_WSIL)) {
- childElement = (TreeElement)event.getOutBoundElement();
- }
- removeChildNode(childElement);
- }
- });
- }
-
- protected void initTools() {
- WSILPerspective wsilPerspective = nodeManager_.getController().getWSILPerspective();
- new OpenWSILTool(toolManager_, wsilPerspective.getMessage("ALT_OPEN_WSIL"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java
deleted file mode 100644
index 07c34d738..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilToggleNodeAction;
-
-public abstract class WsilNavigatorNode extends Node {
-
- public WsilNavigatorNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath) {
- super(treeElement, nodeManager, nodeDepth, imagePath);
- }
-
- protected String getToggleNodeActionHref() {
- return WsilToggleNodeAction.getActionLink(nodeId_,isOpen_);
- }
-
- protected String getLinkActionHref() {
- return SelectWSILNodeAction.getActionLink(nodeId_, false);
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java
deleted file mode 100644
index 2f6459e7a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class WsilNode extends WsilNavigatorNode {
-
- public WsilNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
- super(treeElement, nodeManager, nodeDepth, "wsil/images/wsil_node.gif");
- }
-
- protected void initTools() {
- Controller controller = nodeManager_.getController();
- WSILPerspective wsilPerspective = controller.getWSILPerspective();
- new WsilDetailsTool(toolManager_, wsilPerspective.getMessage("ALT_WSIL_DETAILS"));
- new ListWSDLServicesTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_WSDL_SERVICES"));
- new ListUDDIServicesTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_UDDI_SERVICES"));
- new ListUDDIBusinessTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_UDDI_LINKS"));
- new ListWSILLinksTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_WSIL_LINKS"));
- new WSILImportWSILToWorkbenchTool(toolManager_, wsilPerspective.getMessage("ATL_IMPORT_WSIL_TO_WORKBENCH"));
- new ImportWSILToFileSystemTool(toolManager_, controller.getMessage("ALT_WSIL_IMPORT_TO_FS"));
- new AddWSILToFavoritesTool(toolManager_, wsilPerspective.getMessage("ALT_ADD_WSIL_TO_FAVORITES"));
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java
deleted file mode 100644
index d7c1130ea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.SetDefaultViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilSetDefaultViewTool extends SetDefaultViewTool {
- public WsilSetDefaultViewTool(ToolManager toolManager, String alt) {
- super(toolManager, alt);
- }
-
- public String getSelectToolActionHref(boolean forHistory) {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, forHistory);
- }
-
- public String getActionLink() {
- Node selectedNode = toolManager_.getNode();
- return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, false);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java
deleted file mode 100644
index d25fa2e34..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ViewSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSILLinksTool;
-
-public class WSILViewSelectionTransformer extends ViewSelectionTransformer
-{
- public static final byte NONE = 0;
- public static final byte WSDL_SERVICE = 1;
- public static final byte UDDI_SERVICE = 2;
- public static final byte UDDI_BUSINESS = 3;
- public static final byte WSIL_LINK = 4;
- public static final byte FROM_TOOLID = 5;
- private byte type;
-
- public WSILViewSelectionTransformer(Controller controller)
- {
- this(controller, "", ActionInputs.VIEWID, FROM_TOOLID);
- }
-
- public WSILViewSelectionTransformer(Controller controller, String listManagerKey, String viewKey, byte type)
- {
- super(controller, listManagerKey, viewKey);
- this.type = type;
- }
-
- public Hashtable normalize(Hashtable properties)
- {
- if (type == FROM_TOOLID)
- {
- Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
- if (currNode != null)
- {
- try
- {
- int toolId = Integer.parseInt((String) properties.get(ActionInputs.TOOLID));
- ToolManager toolManager = currNode.getToolManager();
- Tool tool = toolManager.getTool(toolId);
- if (tool instanceof ListWSDLServicesTool)
- listManagerKey = WsilModelConstants.LIST_MANAGER_WSDL_SERVICES;
- else if (tool instanceof ListUDDIServicesTool)
- listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_SERVICES;
- else if (tool instanceof ListUDDIBusinessTool)
- listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_LINKS;
- else if (tool instanceof ListWSILLinksTool)
- listManagerKey = WsilModelConstants.LIST_MANAGER_WSIL_LINKS;
- }
- catch (NumberFormatException nfe)
- {
- }
- }
- }
- return super.normalize(properties);
- }
-
- public Hashtable deNormalize(Hashtable properties)
- {
- Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
- if (currNode != null)
- {
- TreeElement currElement = currNode.getTreeElement();
- if (currElement instanceof WsilElement)
- {
- WsilElement wsilElement = (WsilElement) currElement;
- switch (type)
- {
- case WSDL_SERVICE :
- wsilElement.getAllWSDLServices();
- break;
- case UDDI_SERVICE :
- wsilElement.getAllUDDIServices();
- break;
- case UDDI_BUSINESS :
- wsilElement.getAllUDDILinks();
- break;
- case WSIL_LINK :
- wsilElement.getAllWSILLinks();
- break;
- case FROM_TOOLID :
- try
- {
- int toolId = Integer.parseInt((String) properties.get(ActionInputs.TOOLID));
- ToolManager toolManager = currNode.getToolManager();
- Tool tool = toolManager.getTool(toolId);
- if (tool instanceof ListWSDLServicesTool)
- {
- listManagerKey = WsilModelConstants.LIST_MANAGER_WSDL_SERVICES;
- wsilElement.getAllWSDLServices();
- }
- else if (tool instanceof ListUDDIServicesTool)
- {
- listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_SERVICES;
- wsilElement.getAllUDDIServices();
- }
- else if (tool instanceof ListUDDIBusinessTool)
- {
- listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_LINKS;
- wsilElement.getAllUDDILinks();
- }
- else if (tool instanceof ListWSILLinksTool)
- {
- listManagerKey = WsilModelConstants.LIST_MANAGER_WSIL_LINKS;
- wsilElement.getAllWSILLinks();
- }
- }
- catch (NumberFormatException nfe)
- {
- }
- break;
- default :
- break;
- }
- }
- }
- return super.deNormalize(properties);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java
deleted file mode 100644
index 77c3e6e18..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Hashtable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.ws.internal.explorer.LaunchWizardTask;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeDefault;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * This is the plugin class for the Web Services Explorer.
- */
-public class ExplorerPlugin extends AbstractUIPlugin
-{
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.wst.ws.explorer";
- public static final String CHARSET = "UTF-8";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static ExplorerPlugin instance_;
- private BundleContext context;
- /**
- * Constructs a runtime plugin object for this plugin. The "plugin" element
- * in plugin.xml should include the attribute class =
- * "org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin".
- *
- * @param descriptor
- * The descriptor of this plugin.
- */
- public ExplorerPlugin()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (ExplorerPlugin)Platform.getPlugin("org.eclipse.wst.ws.explorer");
- *
- * @return The ExplorerPlugin singleton.
- */
- static public ExplorerPlugin getInstance()
- {
- return instance_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- */
- public void start(BundleContext bundle) throws Exception
- {
- super.start(bundle);
- // init the shell of LaunchWizardTask
- this.context = bundle;
- LaunchWizardTask.getInstance();
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- */
- public void stop(BundleContext bundle) throws Exception
- {
- super.stop(bundle);
- }
-
- /**
- * Returns the message string identified by the given key from the
- * plugin.properties file for the appropriate locale.
- *
- * @param key
- * The message key string prefixed by a "%" symbol. That is, the
- * string passed in must be of the form "%KEY" where the
- * plugin.properties file contains a line of the form: "KEY =
- * value".
- * @return The locale-specific message.
- */
- public static String getMessage(String key)
- {
- return Platform.getResourceString(instance_.getBundle(), key);
- }
-
- /**
- * Returns the message string identified by the given key from the
- * plugin.properties file for the appropriate locale. Substitution sequences
- * in the message string are replaced by the given array of substitution
- * objects (which are most frequently strings). See java.text.MessageFormat
- * for further details on substitution.
- *
- * @param key
- * The message key string prefixed by a "%" symbol. That is, the
- * string passed in must be of the form "%KEY" where the
- * plugin.properties file contains a line of the form: "KEY =
- * value".
- * @param args
- * The substitution values for the message as required by the
- * message in plugin.properties and by the rules of class
- * java.text.MessageFormat.
- * @return The locale-specific message.
- */
- public static String getMessage(String key, Object[] args)
- {
- return MessageFormat.format(getMessage(key), args);
- }
-
- /**
- * Returns an image descriptor for the named resource as relative to the
- * plugin install location.
- *
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor(String name)
- {
- try
- {
- URL installURL = instance_.getBundle().getEntry("/");
- URL imageURL = new URL(installURL, name);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- }
-
- /**
- * See IPluginHelper.
- */
- public void setMsgLoggerConfig(Hashtable msgLoggerConfig)
- {
- }
-
- /**
- * See IPluginHelper.
- */
- public Hashtable getMsgLoggerConfig(Plugin plugin)
- {
- return new Hashtable();
- }
-
- /**
- * See IPluginHelper.
- */
- public Hashtable getMsgLoggerConfig()
- {
- return getMsgLoggerConfig(this);
- }
-
- public String getPluginStateLocation()
- {
- return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
- }
-
- public String getDefaultFavoritesLocation()
- {
- // TODO: getPluginInstallLocation can return null and cause trouble for the WSE's favourites mechanism. 89101 should correct this.
- return getPluginInstallLocation()+FavoritesRegistryTypeDefault.FAVORITES_DEFAULT;
- }
-
- public String getPluginInstallLocation()
- {
- try
- {
- return Platform.resolve(instance_.getBundle().getEntry("/")).getFile();
- }
- catch (Exception e)
- {
- return null;
- }
- }
-
- public static BundleContext getBundleContext() {
- return getInstance().context;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java
deleted file mode 100644
index 026e76f70..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060606 105069 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060803 152790 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070327 172339 kathy@ca.ibm.com - Kathy Chan
- * 20080123 216372 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.popup;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.monitor.GetMonitorCommand;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class PopupTestWSDL extends Action implements IActionDelegate
-{
- protected IStructuredSelection selection = null;
-
- public PopupTestWSDL()
- {
- super(ExplorerPlugin.getMessage("%POPUP_TEST_WSDL"));
- }
-
- public void run()
- {
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- WSExplorerLauncherCommand command = new WSExplorerLauncherCommand();
- command.setForceLaunchOutsideIDE(false);
- Vector launchOptions = new Vector();
- if (selection != null)
- {
- for (Iterator it = selection.iterator(); it.hasNext();)
- {
- String wsdlURL = null;
- Object object = it.next();
- if (object instanceof IResource)
- {
- File wsdlFile = ((IResource)object).getLocation().toFile();
- try
- {
- wsdlURL = wsdlFile.toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- wsdlURL = wsdlFile.toString();
- }
- } else if (object instanceof ServiceImpl)
- {
- ServiceImpl serviceImpl = (ServiceImpl)object;
- Definition definition = serviceImpl.getEnclosingDefinition();
- wsdlURL = definition.getLocation();
- } else if (object instanceof WSDLResourceImpl)
- {
- WSDLResourceImpl WSDLRImpl = (WSDLResourceImpl)object;
- Definition definition = WSDLRImpl.getDefinition();
- wsdlURL = definition.getLocation();
- } else if (object instanceof String) {
- wsdlURL = (String) object;
- } else {
- // Object is not any types we recognized, wsdlURL is still null.
- // Try looking up an adapter for the object.
- // If found, update wsdlURL contains the adapted WSDL string.
- // If not found, wsdlURL would still be null.
- wsdlURL = AdapterUtils.getAdaptedWSDL(object);
- }
-
- addLaunchOptions(launchOptions, wsdlURL, stateLocation, defaultFavoritesLocation);
- }
- }
- command.setLaunchOptions((LaunchOption[])launchOptions.toArray(new LaunchOption[0]));
- command.execute();
- }
-
- /**
- * Set and add the WEB_SERVICE_ENDPOINT, WSDL_URL, STATE_LOCATIION and
- * DEFAULT_FAVORITES_LOCATION LaunchOptions to the launchOptions vector
- *
- * @param launchOptions - vector of launchOptions to add to
- * @param wsdlURL
- * @param stateLocation
- * @param defaultFavoritesLocation
- */
- protected void addLaunchOptions(Vector launchOptions, String wsdlURL, String stateLocation, String defaultFavoritesLocation)
- {
- GetMonitorCommand getMonitorCmd = new GetMonitorCommand();
- getMonitorCmd.setMonitorService(true);
- getMonitorCmd.setCreate(false);
- getMonitorCmd.setWebServicesParser(new WebServicesParser());
- getMonitorCmd.setWsdlURI(wsdlURL);
- getMonitorCmd.execute(null, null);
- List endpoints = getMonitorCmd.getEndpoints();
- for (Iterator endpointsIt = endpoints.iterator(); endpointsIt.hasNext();)
- {
- launchOptions.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, (String)endpointsIt.next()));
- }
- launchOptions.add(new LaunchOption(LaunchOptions.WSDL_URL, wsdlURL));
- launchOptions.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
- launchOptions.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
- }
-
- public void run(IAction action)
- {
- run();
- }
-
- public void selectionChanged(IAction action, ISelection selection)
- {
- if (selection instanceof IStructuredSelection)
- this.selection = (IStructuredSelection) selection;
- else
- this.selection = null;
- }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/HTTPTransportException.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/HTTPTransportException.java
deleted file mode 100644
index c424c359a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/HTTPTransportException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-import java.util.Map;
-
-/**
- * A type of TransportException that can be thrown when the transport protocol
- * is HTTP. The status code of the HTTP response is captured in this
- * exception and passed up to the Web Services Explorer.
- */
-public class HTTPTransportException extends TransportException {
-
- private static final long serialVersionUID = 8277180731798858877L;
-
- private int statusCode;
- private Map headers;
-
- /**
- * Constructor.
- *
- * @param statusCode The HTTP status code.
- * @param message A message about the problem that occurred.
- * @param headers A map of the HTTP headers.
- */
- public HTTPTransportException(int statusCode, String message, Map headers) {
- super(message);
- this.statusCode = statusCode;
- this.headers = headers;
- }
-
- /**
- * Returns the HTTP status code used to create this exception.
- *
- * @return The HTTP status code.
- */
- public int getStatusCode() {
- return statusCode;
- }
-
- /**
- * Retrieve the HTTP header for the given key
- *
- * @param key The key value.
- * @return The HTTP header value for key, or null if there is no such header.
- */
- public String getHeader(String key) {
- Object value = headers.get(key);
- if (value != null)
- return value.toString();
- else
- return null;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/IDeserializer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/IDeserializer.java
deleted file mode 100644
index 248a20a35..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/IDeserializer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-/**
- * The IDeserializer is responsible for taking an XML string and deserializing it
- * into values to populate an ISOAPMessage.
- */
-public interface IDeserializer {
-
- /**
- * Deserialize the XML string into the ISOAPMessage. The part parameter tells the method
- * which part of the message (the envelope or the contents of the header or body) the XML
- * string represents. Note that "contents" refers to the list of elements inside the header
- * or body, and not the header or body element itself.
- *
- * @param part One of {@link ISOAPMessage#ENVELOPE}, {@link ISOAPMessage#HEADER_CONTENT}, or
- * {@link ISOAPMessage#BODY_CONTENT}.
- * @param xml The XML string to deserialize.
- * @param message The ISOAPMessage to deserialize into.
- * @throws TransportException
- */
- public void deserialize(int part, String xml, ISOAPMessage message) throws TransportException;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPMessage.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPMessage.java
deleted file mode 100644
index 6cd0ad6ad..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPMessage.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-import java.util.Map;
-
-import org.w3c.dom.Element;
-
-/**
- * The ISOAPMessage represents a SOAP message in a web service invocation made by the
- * Web Services Explorer's transport stack.
- * <br/>
- * <br/>
- * The setters of ISOAPMessage are called by Web Services Explorer to populate the
- * message before sending. WSE does not guarantee that all message elements it sets
- * will have the same owner document.
- */
-public interface ISOAPMessage {
-
- /**
- * ISOAPMessage defines this property for storing the SOAP action value in
- * a web service invocation. This property will be set by Web Services Explorer
- * prior to passing the message to {@link ISOAPTransport#send(String, String, String, ISOAPMessage)}
- */
- String PROP_SOAP_ACTION = "prop_soap_action";
-
- /**
- * This value is used when serializing and deserializing a message. It indicates the operation
- * is working with the entire SOAP envelope element.
- */
- int ENVELOPE = 0;
-
- /**
- * This value is used when serializing and deserializing a message. It indicates the operation
- * is working with the elements inside the SOAP header element.
- */
- int HEADER_CONTENT = 1;
-
- /**
- * This value is used when serializing and deserializing a message. It indicates the operation
- * is working with the elements inside the SOAP body element.
- */
- int BODY_CONTENT = 2;
-
- /**
- * Returns the MessageContext associated with this message. The MessageContext is created
- * by the Web Services Explorer and passed to the transport stack during message creation.
- * Implementers of ISOAPMessage should store a reference to the MessageContext.
- *
- * @return The MessageContext encasulating information about the web service operation.
- * @see ISOAPTransport#newMessage(MessageContext)
- */
- public MessageContext getMessageContext();
-
- /**
- * Sets a property in this ISOAPMessage.
- *
- * @param key The key (name) of the property
- * @param value The value of the property.
- */
- public void setProperty(String key, Object value);
-
- /**
- * Retrieves a property from this ISOAPMessage.
- *
- * @param key The key (name) of the property to retrieve.
- * @return The value assoicated with the given key, or null if there's no such property.
- */
- public Object getProperty(String key);
-
- /**
- * The namespace table holds the namespace declaraions that are on the envelope element
- * of the SOAP message. The table's keys are the namespace URIs and the values are the
- * associated namespace prefixes.
- * <br/>
- * <br/>
- * The effect of calling this method is that the declarations in the namespace table
- * argument should add to or replace the declarations on the envelope. This API does
- * not specify what happens to existing declarations on the envelope which are not
- * in the namespace table passed in.
- *
- * @param namespaceTable The namespace table
- */
- public void setNamespaceTable(Map namespaceTable);
-
- /**
- * Returns a table of the namespace declarations that are on the envelope element of the
- * SOAP message. The table's keys are the namespace URIs and the values are the
- * associated namespace prefixes.
- * <br/>
- * <br/>
- * The namespace table returned by this method may be modified by the Web Services
- * Explorer and later updated back to the message via the setNamesapceTable() method.
- *
- * @return A table of namespace URIs to prefixes on the SOAP envelope.
- */
- public Map getNamespaceTable();
-
- /**
- * Sets the envelope element of this message.
- *
- * @param envelope The envelope element.
- */
- public void setEnvelope(Element envelope);
-
- /**
- * Returns the envelope element of this message. The deep parameter dictates whether
- * the method returns the whole envelope with all its descendants or just the envelope
- * element itself.
- *
- * @param deep If true, the envelope and its descendants are returned, otherwise only
- * the envelope element itself is returned.
- * @return An element.
- */
- public Element getEnvelope(boolean deep);
-
- /**
- * Sets the header element of this message.
- *
- * @param header The header element.
- */
- public void setHeader(Element header);
-
- /**
- * Returns the header element of this message. The deep parameter dictates whether
- * the method returns the whole header with all its descendants or just the header
- * element itself.
- *
- * @param deep If true, the header and its descendants are returned, otherwise only
- * the header element itself is returned.
- * @return An element.
- */
- public Element getHeader(boolean deep);
-
- /**
- * Sets an array of elements that goes into the message's header.
- *
- * @param headerContent An array of elements.
- */
- public void setHeaderContent(Element[] headerContent);
-
- /**
- * Returns the array of elements that are inside the message's header.
- *
- * @return An array of elements.
- */
- public Element[] getHeaderContent();
-
- /**
- * Sets the body element of this message. For an RPC style message, the first child
- * element of the body should be the RPC wrapper element.
- *
- * @param body The body element.
- */
- public void setBody(Element body);
-
- /**
- * Returns the body of this message. The deep parameter dictates whether
- * the method returns the whole body with all its descendants elements or just the
- * body. For an RPC style message, the first child element of the
- * body should be the RPC wrapper element, regardless of the value of the deep
- * parameter.
- *
- * @param deep If true, the body and its descendants are returned, otherwise only
- * the body (and the RPC wrapper element if the message is RPC style) is returned.
- * @return An element.
- */
- public Element getBody(boolean deep);
-
- /**
- * Sets an array of elements that goes into the message's body. For an RPC style
- * message, the body contents are the elements inside the RPC wrapper element.
- *
- * @param bodyContent An array of elements.
- */
- public void setBodyContent(Element[] bodyContent);
-
- /**
- * Returns the array of elements that are inside the message's body. For an RPC style
- * message, the body contents are the elements inside the RPC wrapper element.
- *
- * @return An array of elements.
- */
- public Element[] getBodyContent();
-
- /**
- * Set the fault element for this message, if any.
- *
- * @param fault A fault element.
- */
- public void setFault(Element fault);
-
- /**
- * Returns the fault element, if any.
- *
- * @return The fault element or null if no fault has occurred.
- */
- public Element getFault();
-
- /**
- * Returns the XML serialized form of this ISOAPMessage.
- *
- * @return An XML string.
- * @see ISerializer
- * @throws TransportException
- */
- public String toXML() throws TransportException;
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransport.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransport.java
deleted file mode 100644
index 7d2a3f9c9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransport.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-/**
- * The ISOAPTransport is the core piece of the Web Services Explorer transport stack.
- * It is responsible for invoking the web service and it also acts as the factory for
- * creating ISerialier, IDeserializer, and ISOAPMessage instances which make up the
- * rest of the WSE transport.
- */
-public interface ISOAPTransport {
-
- /**
- * Factory method for ISerializer.
- *
- * @return An instance of ISerializer.
- */
- public ISerializer newSerializer();
-
- /**
- * Factory method for IDeserializer.
- *
- * @return An instance of IDeserializer.
- */
- public IDeserializer newDeserializer();
-
- /**
- * Factory method for ISOAPMessage.
- *
- * @param context MessageContext encapsulating information about the web service operation.
- * @return An instance of ISOAPMessage.
- * @throws TransportException
- */
- public ISOAPMessage newMessage(MessageContext context) throws TransportException;
-
- /**
- * Invokes the web service operation by sending the SOAP message, then parsing the results
- * into a response ISOAPMessage.
- *
- * @param url The endpoint URL.
- * @param username Username to use for basic auth protected endpoints. Set to null if not required.
- * @param password Password to use for basic auth protected endpoints. Set to null if not required.
- * @param message The SOAP request message.
- * @return An ISOAPMesage representing the response from the web service invocation.
- * @throws TransportException
- */
- public ISOAPMessage send(String url, String username, String password, ISOAPMessage message) throws TransportException;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransportProvider.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransportProvider.java
deleted file mode 100644
index 1de3dc2e2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISOAPTransportProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-/**
- * ISOAPTransportProvider is a factory for creating ISOAPTransport objects.
- * Anyone who wishes to extend the org.eclipse.wst.ws.explorer.wseTransportProvider
- * extension-point must provide an implementation for this interface.
- */
-public interface ISOAPTransportProvider {
-
- /**
- * Method for obtaining a new ISOAPTransport from this provider.
- * This method should never return null.
- *
- * @return A new ISOAPTransport object.
- */
- public ISOAPTransport newTransport();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISerializer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISerializer.java
deleted file mode 100644
index 5db69fb6d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/ISerializer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-/**
- * The ISerializer is responsible for taking an ISOAPMessage and serializing it
- * into an XML string.
- */
-public interface ISerializer {
-
- /**
- * Serialize the ISOAPMessage into an XML string. The part parameter tells the method
- * which part of the message (the envelope or the contents of the header or body) to
- * serialize. Note that "contents" refers to the list of elements inside the header
- * or body, and not the header or body element itself.
- *
- * @param part One of {@link ISOAPMessage#ENVELOPE}, {@link ISOAPMessage#HEADER_CONTENT}, or
- * {@link ISOAPMessage#BODY_CONTENT}.
- * @param message The ISOAPMessage to serialize.
- * @return An XML string.
- * @throws TransportException
- */
- public String serialize(int part, ISOAPMessage message) throws TransportException;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/MessageContext.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/MessageContext.java
deleted file mode 100644
index 3e327cbab..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/MessageContext.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.extensions.ExtensibilityElement;
-
-/**
- * A MessageContext object holds information about the message that is to be
- * sent on a web service invocation. This information is passed to the
- * ISOAPTransport so that it can construct an appropriate ISOAPMessage to
- * handle the invocation.
- */
-public class MessageContext {
-
- private Definition definition;
- private ExtensibilityElement bindingProtocol;
- private BindingOperation bindingOperation;
- private boolean documentStyle;
-
- /**
- * Sets a reference to the WSDL definition.
- *
- * @param definition The WSDL definition.
- */
- public void setDefinition(Definition definition) {
- this.definition = definition;
- }
-
- /**
- * Returns the WSDL definition.
- *
- * @return The WSDL definition.
- */
- public Definition getDefinition() {
- return definition;
- }
-
- /**
- * Sets a reference to the binding extensibility element in the WSDL document.
- * For a web service that uses the SOAP protocol, this will be an instance of
- * javax.wsdl.extensions.soap.SOAPBinding
- *
- * @param bindingProtocol The binding extensibility element.
- */
- public void setBindingProtocol(ExtensibilityElement bindingProtocol) {
- this.bindingProtocol = bindingProtocol;
- }
-
- /**
- * Returns the binding extensibility element.
- *
- * @return The binding extensibility element.
- */
- public ExtensibilityElement getBindingProtocol() {
- return bindingProtocol;
- }
-
- /**
- * Sets a reference to the binding operation element in the WSDL document.
- *
- * @param bindingOperation The binding operation element.
- */
- public void setBindingOperation(BindingOperation bindingOperation) {
- this.bindingOperation = bindingOperation;
- }
-
- /**
- * Returns the binding operation element.
- *
- * @return The binding operation element.
- */
- public BindingOperation getBindingOperation() {
- return bindingOperation;
- }
-
- /**
- * Sets the flag on whether the message created from this MessageContext
- * is document style or not.
- *
- * @param documentStyle True for document style, false otherwise.
- */
- public void setDocumentStyle(boolean documentStyle) {
- this.documentStyle = documentStyle;
- }
-
- /**
- * Returns the document style property.
- *
- * @return The document style property.
- */
- public boolean isDocumentStyle() {
- return documentStyle;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/SOAPMessage.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/SOAPMessage.java
deleted file mode 100644
index b9a41f4a8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/SOAPMessage.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * This is a default implementation of the ISOAPMessage interface that extenders of the Web
- * Services Explorer transport can use if they do not wish to implement their own message.
- * This class is implemented as a collection of loose pieces of the SOAP message, and each
- * piece must be set individually (for example, setting the envelope element will not
- * automatically populate the header or body elements).
- * <br/>
- * <br/>
- * This class does not know how to serialize itself. It depends on an ISerializer provided by
- * the transport extender.
- */
-public final class SOAPMessage implements ISOAPMessage {
-
- private MessageContext context;
- private ISerializer serializer;
-
- private Map properties = new Hashtable();
-
- private Element envelope = null;
-
- private Element header = null;
- private Element[] headerContent = null;
-
- private Element body = null;
- private Element[] bodyContent = null;
-
- private Element fault = null;
-
- private String xml = null;
-
- /**
- * Constructor.
- *
- * @param context The MessageContext.
- * @param serializer An ISerializer to use to serialize this message.
- */
- public SOAPMessage(MessageContext context, ISerializer serializer) {
- this.context = context;
- this.serializer = serializer;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getMessageContext()
- */
- public MessageContext getMessageContext() {
- return context;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setProperty(java.lang.String, java.lang.Object)
- */
- public void setProperty(String key, Object value) {
- properties.put(key, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getProperty(java.lang.String)
- */
- public Object getProperty(String key) {
- return properties.get(key);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setNamespaceTable(java.util.Map)
- */
- public synchronized void setNamespaceTable(Map namespaceTable) {
- if (namespaceTable == null || envelope == null)
- return;
-
- Iterator iter = namespaceTable.entrySet().iterator();
-
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- String name = "xmlns:" + entry.getValue();
- envelope.setAttribute(name, entry.getKey().toString());
- }
-
- xml = null;
- }
-
- /*
- * If the attribute is a namespace declaration, the namespace prefix is returned.
- * Otherwise null is returned.
- */
- private String getNSPrefix(Attr attribute) {
- String name = attribute.getName();
- if (name.startsWith("xmlns:"))
- return name.substring(6);
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getNamespaceTable()
- */
- public Map getNamespaceTable() {
-
- Hashtable namespaceTable = new Hashtable();
-
- if (envelope != null) {
- NamedNodeMap attributes = envelope.getAttributes();
- for (int i = 0; i < attributes.getLength(); i++) {
- Attr attribute = (Attr) attributes.item(i);
- String prefix = getNSPrefix(attribute);
- if (prefix != null)
- namespaceTable.put(attribute.getValue(), prefix);
- }
- }
-
- return namespaceTable;
- }
-
- /*
- * Appends a child node to a parent node, takes care of importing
- * the child node if neccessary.
- */
- private void appendNode(Node parent, Node child) {
- if (parent == null || child == null)
- return;
-
- Document owner = parent.getOwnerDocument();
-
- if (!owner.equals(child.getOwnerDocument()))
- child = owner.importNode(child, true);
-
- parent.appendChild(child);
- }
-
- /*
- * Adds an array of elements to the parent element as child elements.
- */
- private void appendChildren(Element parent, Element[] children) {
- if (parent == null || children == null)
- return;
-
- for (int i = 0; i < children.length; i++) {
- if (children[i] == null)
- continue;
- appendNode(parent, children[i]);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setEnvelope(org.w3c.dom.Element)
- */
- public synchronized void setEnvelope(Element envelope) {
- if (envelope == null)
- this.envelope = envelope;
- else
- this.envelope = (Element) envelope.cloneNode(false);
-
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getEnvelope(boolean)
- */
- public Element getEnvelope(boolean deep) {
- if (!deep)
- return envelope;
-
- synchronized (this) {
- if (envelope == null)
- return null;
-
- Element clonedEnvelope = (Element) envelope.cloneNode(false);
-
- if (headerContent != null && headerContent.length > 0)
- appendNode(clonedEnvelope, getHeader(true));
-
- appendNode(clonedEnvelope, getBody(true));
-
- return clonedEnvelope;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setHeader(org.w3c.dom.Element)
- */
- public synchronized void setHeader(Element header) {
- if (header == null)
- this.header = null;
- else
- this.header = (Element) header.cloneNode(false);
-
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getHeader(boolean)
- */
- public Element getHeader(boolean deep) {
- if (!deep)
- return header;
-
- synchronized (this) {
- if (header == null)
- return null;
-
- Element clonedHeader = (Element) header.cloneNode(false);
- appendChildren(clonedHeader, headerContent);
- return clonedHeader;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setHeaderContent(org.w3c.dom.Element[])
- */
- public synchronized void setHeaderContent(Element[] headerContent) {
- this.headerContent = headerContent;
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getHeaderContent()
- */
- public Element[] getHeaderContent() {
- return headerContent;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setBody(org.w3c.dom.Element)
- */
- public synchronized void setBody(Element body) {
- if (body == null)
- this.body = null;
- else {
- this.body = (Element) body.cloneNode(false);
-
- if (!context.isDocumentStyle() && fault == null) {
- NodeList childElements = body.getElementsByTagName("*");
- if (childElements.getLength() > 0)
- this.body.appendChild(childElements.item(0).cloneNode(false));
- }
- }
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getBody(boolean)
- */
- public Element getBody(boolean deep) {
- if (!deep)
- return body;
-
- synchronized (this) {
- if (body == null)
- return null;
-
- // copy the rpc wrapper element as well, if any
- Element clonedBody = (Element) body.cloneNode(true);
-
- if (fault != null)
- appendNode(clonedBody, fault);
- else {
- Element target = clonedBody;
-
- // check for rpc wrapper
- if (clonedBody.getFirstChild() != null)
- target = (Element) clonedBody.getFirstChild();
-
- appendChildren(target, bodyContent);
- }
-
- return clonedBody;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setBodyContent(org.w3c.dom.Element[])
- */
- public synchronized void setBodyContent(Element[] bodyContent) {
- this.bodyContent = bodyContent;
- if (bodyContent != null)
- fault = null;
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getBodyContent()
- */
- public Element[] getBodyContent() {
- return bodyContent;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#setFault(org.w3c.dom.Element)
- */
- public synchronized void setFault(Element fault) {
- this.fault = fault;
- if (fault != null) {
- if (body != null && body.getFirstChild() != null)
- body.removeChild(body.getFirstChild());
- bodyContent = null;
- }
- xml = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#getFault()
- */
- public Element getFault() {
- return fault;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.ws.internal.explorer.transport.ISOAPMessage#toXML()
- */
- public synchronized String toXML() throws TransportException {
- if (xml == null)
- xml = serializer.serialize(ENVELOPE, this);
- return xml;
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/TransportException.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/TransportException.java
deleted file mode 100644
index 2cac2fd17..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/transport/TransportException.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.transport;
-
-/**
- * An general purpose exception to indicate a problem has occurred when
- * invoking a web service.
- */
-public class TransportException extends RuntimeException {
-
- private static final long serialVersionUID = -1502247230726021403L;
-
- /**
- * Constructor.
- *
- * @param message A message about the problem that occurred.
- */
- public TransportException(String message) {
- super(message);
- }
-
- /**
- * Constructor that accepts a message and a cause.
- *
- * @param message A message about the problem that occurred.
- * @param cause The cause for this exception.
- */
- public TransportException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * Constructor that accepts a cause.
- *
- * @param cause The cause for this exception.
- */
- public TransportException(Throwable cause) {
- super(cause);
- }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties
deleted file mode 100644
index 5492c6c79..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties
+++ /dev/null
@@ -1,188 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-
-TITLE_WSEXPLORER=Web Services Explorer
-
-# Tree Nodes
-ALT_OPEN=Open
-ALT_CLOSE=Close
-
-# Perspective Toolbar
-ALT_BACK=Back
-ALT_FORWARD=Forward
-ALT_ACTION_ENGINE=Action Recorder
-ALT_UDDI_PERSPECTIVE=UDDI Page
-ALT_WSIL_PERSPECTIVE=WSIL Page
-ALT_WSDL_PERSPECTIVE=WSDL Page
-ALT_FAVORITES_PERSPECTIVE=Favorites
-
-# Toolbars
-ALT_DOUBLE_CLICK_TO_MAXIMIZE=Double Click to Maximize
-ALT_DOUBLE_CLICK_TO_RESTORE=Double Click to Restore
-
-# SetDefaultViewTool
-ALT_BACK_TO_TOP=Back to top
-
-# Common Actions
-ALT_REFRESH=Refresh
-ALT_CLEAR=Clear
-ALT_RESULTS=Results
-
-# Common Labels
-ALT_NAVIGATOR=Navigator
-ALT_ACTIONS=Actions
-ALT_STATUS=Status
-ALT_OTHER_ACTIONS=Other Actions
-FORM_BUTTON_GO=&nbsp;&nbsp;Go&nbsp;&nbsp;
-FORM_BUTTON_RESET=Reset
-FORM_BUTTON_CANCEL=Cancel
-FORM_LABEL_ACTIONS=Actions
-FORM_LABEL_ACTIONS_NONE=None
-
-# Placeholder for blank table entries
-TABLE_BLANK_PLACEHOLDER=--
-
-# Common Form Control Titles
-FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX=Select all
-FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX=Select row
-
-# Common Messages
-MSG_ERROR_UNEXPECTED=IWAB0135E An unexpected error has occurred.
-MSG_ERROR_NO_ACTION_SELECTED=IWAB0124E Select an action.
-MSG_ERROR_NO_NODE_SELECTED=IWAB0125E Select a node.
-MSG_SUBMIT_IN_PROGRESS=Please wait. The operation is still in progress.
-MSG_LOAD_IN_PROGRESS=Please wait while the form loads...
-
-#LaunchWebServiceWizardAction
-ALT_LAUNCH_WEB_SERVICE_WIZARD=Launch Web Service Wizard
-FORM_LABEL_CHOOSE_WIZARD=Select a wizard to launch:
-FORM_RADIO_WEB_SERVICE_CLIENT_WIZARD=Web Service Client
-FORM_RADIO_WEB_SERVICE_SKELETON_WIZARD=Web Service Skeleton
-MSG_ERROR_WIZARD_ALREADY_RUNNING=IWAB0126E A Web service wizard is already in progress. Finish with the existing wizard before launching a new one.
-MSG_ERROR_WSDL_URL_IS_UNREACHABLE=IWAB0127E The WSDL document is unreachable.
-
-# ImportToFileSystemAction
-ALT_WSIL_IMPORT_TO_FS=Import WSIL To File System
-ALT_WSDL_IMPORT_TO_FS=Import WSDL To File System
-MSG_ERROR_RETRIEVING_WSDL_DOC=IWAB0128E Unable to retrieve WSDL document.
-MSG_ERROR_RETRIEVING_WSIL_DOC=IWAB0129E Unable to retrieve WSIL document.
-MSG_IMPORT_WSDL_SUCCESSFUL=WSDL document successfully imported.
-MSG_IMPORT_WSIL_SUCCESSFUL=WSIL document successfully imported.
-
-# ImportToWorkbenchAction
-ALT_IMPORT_WSDL_TO_WORKBENCH=Import WSDL To workbench
-FORM_LABEL_IMPORT_TO_WORKBENCH_DESC=Select a workbench project to save the WSDL file into. You may also change the name of the WSDL file.
-WEB_PROJECT_NAME=Web project:
-WORKBENCH_PROJECT_NAME=Workbench project:
-LABEL_IMPORT_WSDL=Import WSDL document
-LABEL_IMPORT_TO_WSIL=Import as a service reference to a WSIL document
-IMPORTED_WSDL_FILE_NAME=WSDL file name:
-WSIL_FILE_NAME=WSIL file name:
-MSG_ERROR_FILE_OVERWRITE_DISABLED=Cannot create the file "%2" relative to the path "%1" because automatic file overwriting has not been enabled. Do you want to enable it for this file?
-MSG_ERROR_INVALID_WORKBENCH_PROJECT=IWAB0130E Select a workbench project.
-MSG_ERROR_INVALID_WSDL_FILE_NAME=IWAB0131E Invalid file name.
-MSG_ERROR_INVALID_WSIL_FILE_NAME=IWAB0470E Invalid WSIL file name.
-MSG_ERROR_NO_IMPORT_OPTION_SELECTED=IWAB0471E No import option is selected. Please choose at least one import option.
-MSG_ERROR_WRITING_TEMP_FILE_TO_FS=IWAB0132E Unable to write temporary file.
-MSG_INFO_IMPORT_TO_WORKBENCH_SUCCESSFUL=IWAB0314I %1 was successfully imported to the workbench.
-MSG_INFO_IMPORT_SERVICE_REF_TO_WSIL_SUCCESSFUL=IWAB0472I Service reference was successfully imported to %1.
-
-# CheckWorkbenchFileReadOnlyAction
-MSG_ERROR_FILE_CHECKOUT_DISABLED=Cannot create the file "%2" relative to the path "%1" because automatic file check out has not been enabled. Do you want to enable it for this file?
-
-# ClearNodeAction
-MSG_INFO_NODE_CLEARED=IWAB0133I %1 cleared.
-
-# Table twistees
-ALT_TWIST_OPENED=Hide
-ALT_TWIST_CLOSED=Expand
-
-# WSDL Browser
-FORM_LINK_BROWSE=Browse...
-TITLE_WSDL_BROWSER=WSDL Browser - %1
-FORM_LABEL_WSDL_SOURCE=Select a WSDL source:
-FORM_LABEL_WSDL_CATEGORY=Category
-FORM_LABEL_WSDL_All=All
-FORM_LABEL_WSDL_SOURCE_WEBPROJECTS=Workspace Projects
-FORM_LABEL_WSDL_SOURCE_FAVORITES=Favorites
-FORM_LABEL_WEB_PROJECT=Workspace Project
-FORM_LABEL_WSDL_URL=WSDL URL
-FORM_BUTTON_REFRESH=Refresh
-ALT_WSDL_BROWSER=WSDL Browser
-WSDL_TYPE_SERVICE_INTERFACES=Service Interfaces
-WSDL_TYPE_SERVICES=Services
-
-# Calendar Browser
-TITLE_CALENDAR_BROWSER=Calendar Browser
-# 2 character abbreviations for days of the week.
-FORM_LABEL_SH_SUNDAY=Su
-FORM_LABEL_SH_MONDAY=Mo
-FORM_LABEL_SH_TUESDAY=Tu
-FORM_LABEL_SH_WEDNESDAY=We
-FORM_LABEL_SH_THURSDAY=Th
-FORM_LABEL_SH_FRIDAY=Fr
-FORM_LABEL_SH_SATURDAY=Sa
-# Months of the year
-FORM_LABEL_MONTH=Month:
-FORM_LABEL_JANUARY=January
-FORM_LABEL_FEBRUARY=February
-FORM_LABEL_MARCH=March
-FORM_LABEL_APRIL=April
-FORM_LABEL_MAY=May
-FORM_LABEL_JUNE=June
-FORM_LABEL_JULY=July
-FORM_LABEL_AUGUST=August
-FORM_LABEL_SEPTEMBER=September
-FORM_LABEL_OCTOBER=October
-FORM_LABEL_NOVEMBER=November
-FORM_LABEL_DECEMBER=December
-FORM_LABEL_YEAR=Year:
-FORM_LABEL_TIME=Time:
-FORM_LINK_TODAY=Today
-FORM_LINK_PREVIOUS_YEAR=<<
-FORM_LINK_PREVIOUS_MONTH=<
-FORM_LINK_NEXT_MONTH=>
-FORM_LINK_NEXT_YEAR=>>
-ALT_PREVIOUS_YEAR=Previous Year
-ALT_PREVIOUS_MONTH=Previous Month
-ALT_NEXT_MONTH=Next Month
-ALT_NEXT_YEAR=Next Year
-ALT_TODAY=Today
-ALT_CALENDAR_BROWSER=Calendar Browser
-MSG_ERROR_INVALID_TIME_FORMAT=IWAB0368E Time was not formatted as HH:MM:SS[.SSS]. Do you wish to use the current time instead?
-
-# Action engine
-TITLE_ACTION_RECORDER=Action Recorder
-FORM_LABEL_MODE=Mode:
-FORM_LABEL_MODE_PLAY=Play
-FORM_LABEL_MODE_STOP=Stop
-FORM_LABEL_MODE_RECORD=Record
-FORM_LABEL_SAVE=Save
-FORM_LABEL_PLAY_FILE=Play file:
-MSG_ERROR_INVALID_PLAY_FILE=IWAB0362E Enter a play file.
-
-# Frame titles
-FRAME_TITLE_PERSPECTIVE_WORKAREA=Web Services Explorer Internal Work Area
-FRAME_TITLE_PERSPECTIVE_TOOLBAR=Web Services Explorer Toolbar
-FRAME_TITLE_PERSPECTIVE_CONTENT=Web Services Explorer Page Content
-FRAME_TITLE_WSDL_TOOLBAR=WSDL Browser Toolbar
-FRAME_TITLE_WSDL_CONTENT=WSDL Browser Content
-
-# Form titles
-FORM_TITLE_PAGE_LOADER=Page Loader
-FORM_TITLE_PAGE_CONTENT=Loaded Page Content
-FORM_TITLE_LAUNCH_WEBSERVICE_WIZARD=Launch Web Service Wizard Form
-FORM_TITLE_IMPORT_TO_WORKBENCH=Import to Workbench Form
-
-# SessionTimedOut message
-MSG_ERROR_SESSION_TIMED_OUT=This session of Web Service Explorer has timed out after 30 minutes of inactivity to free up memory resources.
-MSG_ERROR_RESTART_SESSION=Relaunch the Web Service Explorer to test your Web service.
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties
deleted file mode 100644
index f3988f57f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties
+++ /dev/null
@@ -1,164 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 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
-###############################################################################
-
-title=Favorites
-
-# Navigator
-FAVORITES_MAIN_NODE=Favorites Main
-FAVORITES_WSIL_FOLDER_NODE=Favorite WSILs
-FAVORITES_WSDL_SERVICE_FOLDER_NODE=Favorite WSDL Services
-FAVORITES_UDDI_SERVICE_FOLDER_NODE=Favorite UDDI Services
-FAVORITES_UDDI_BUSINESSES_FOLDER_NODE=Favorite UDDI Businesses
-FAVORITES_UDDI_SERVICE_INTERFACES_FOLDER_NODE=Favorite UDDI Service Interfaces
-FAVORITES_UDDI_REGISTRIES_FOLDER_NODE=Favorite UDDI Registries
-FAVORITES_USER_DEF_UDDI_REGISTRIES_FOLDER_NODE=Favorite User Defined UDDI Registries
-
-# Form
-FORM_LABEL_FAVORITE_WSIL=Favorite WSILs
-FORM_LABEL_FAVORITE_WSDL=Favorite WSDLs
-FORM_LABEL_FAVORITE_UDDI_REGISTRY=Favorite UDDI Registries
-FORM_LABEL_FAVORITE_USER_DEF_UDDI_REGISTRY=Favorite User Defined UDDI Registries
-FORM_LABEL_FAVORITE_UDDI_SERVICE=Favorite UDDI Services
-FORM_LABEL_FAVORITE_UDDI_BUSINESS=Favorite UDDI Business Entities
-FORM_LABEL_FAVORITE_UDDI_SERVICE_INTERFACE=Favorite UDDI Service Interfaces
-FORM_LABEL_REMOVE=Remove
-FORM_LABEL_IMPORT_TO_WSIL_PERSPECTIVE=Add To WSIL Page
-FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE=Add To UDDI Page
-FORM_LABEL_IMPORT_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-FORM_LABEL_URL=URL
-FORM_LABEL_ITEM_NUMBER=Item #
-FORM_LABEL_UDDI_VERSION=UDDI Version
-FORM_LABEL_NAME=Name
-FORM_LABEL_DESC=Description
-FORM_LABEL_DEFAULT_LOGIN=Default Login
-FORM_LABEL_DEFAULT_PASSWORD=Default Password
-FORM_LABEL_INQUIRY_URL=Inquiry URL
-FORM_LABEL_PUBLISH_URL=Publish URL
-FORM_LABEL_SECURE_INQUIRY_URL=Secure Inquiry URL
-FORM_LABEL_SECURE_PUBLISH_URL=Secure Publish URL
-FORM_LABEL_TAXONOMY=Taxonomy
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_REGISTRY_NAME=Registry Name
-FORM_LABEL_BUSINESS_NAME=Business Name
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_SERVICE_NAME=Service Name
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_SERVICE_INTERFACE_NAME=Service Interface Name
-FORM_LABEL_SERVICE_INTERFACE_KEY=Service Interface Key
-FORM_LABEL_REGISTRY_URL=<a href="%1" target="_blank">Click here</a> to obtain a user ID and password for this registry.
-FORM_LABEL_USER_DEFINED_CATEGORY_DATA_FILES=Data files for User Defined Categories
-MSG_ERROR_NOTHING_SELECTED=IWAB0315E Select at least one item.
-
-# ListFavoriteWSILAction
-ALT_LIST_FAVORITE_WSIL=List Favorite WSILs
-FORM_LABEL_LIST_FAVORITE_WSIL_DESC=Select a set of favorite WSIL links and press <strong>Add to WSIL Page</strong> to open them in the WSIL navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteWSDLServiceAction
-ALT_LIST_FAVORITE_WSDL_SERVICE=List Favorite WSDL Services
-FORM_LABEL_LIST_FAVORITE_WSDL_SERVICE_DESC=Select a set of favorite WSDL services and press <strong>Remove</strong> to remove them.
-
-# ListFavoriteUDDIServiceAction
-ALT_LIST_FAVORITE_UDDI_SERVICE=List Favorite UDDI Services
-FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_DESC=Select a set of favorite UDDI services and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUDDIBusinessAction
-ALT_LIST_FAVORITE_UDDI_BUSINESS=List Favorite UDDI Businesses
-FORM_LABEL_LIST_FAVORITE_UDDI_BUSINESS_DESC=Select a set of favorite UDDI businesses and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUDDIRegistryAction
-ALT_LIST_FAVORITE_UDDI_REGISTRY=List Favorite UDDI Registries
-FORM_LABEL_LIST_FAVORITE_UDDI_REGISTRY_DESC=Select a set of favorite UDDI registries and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUserDefUDDIRegistryAction
-ALT_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY=List Favorite User Defined UDDI Registries
-FORM_LABEL_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY_DESC=Select a set of favorite UDDI registries and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator.
-
-# ListFavoriteUDDIServiceInterfaceAction
-ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE=List Favorite UDDI Service Interfaces
-FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_INTERFACE_DESC=Select a set of favorite UDDI service interfaces and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# FavoritesWSILDetailsAction
-ALT_FAVORITES_WSIL_DETAILS=Favorite WSIL Details
-
-# FavoritesWSDLDetailsAction
-ALT_FAVORITES_WSDL_DETAILS=Favorite WSDL Details
-
-# FavoritesUDDIRegistryDetailsAction
-ALT_FAVORITES_UDDI_REGISTRY_DETAILS=Favorite UDDI Registry Details
-
-# FavoritesUserDefUDDIRegistryDetailsAction
-ALT_FAVORITES_USER_DEF_UDDI_REGISTRY_DETAILS=Favorite User Defined UDDI Registry Details
-
-# FavoritesUDDIBusinessDetailsAction
-ALT_FAVORITES_UDDI_BUSINESS_DETAILS=Favorite UDDI Business Details
-
-# FavoritesUDDIServiceDetailsAction
-ALT_FAVORITES_UDDI_SERVICE_DETAILS=Favorite UDDI Service Details
-
-# FavoritesUDDIServiceInterfaceDetailsAction
-ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS=Favorite UDDI Service Interface Details
-
-# AddWSILToWSILPerspectiveAction
-ALT_ADD_WSIL_TO_WSIL_PERSPECTIVE=Add to WSIL Page
-MSG_ERROR_WSIL_ALREADY_OPENED=IWAB0316E %1 is already opened in WSIL Page.
-MSG_INFO_ADD_WSIL_TO_WSIL_PERSPECTIVE_SUCCESSFUL=IWAB0317I %1 is added to WSIL Page.
-MSG_ERROR_ADD_WSIL_TO_WSIL_PERSPECTIVE=IWAB0318E WSIL %1 could not be loaded.
-
-# AddToUDDIPerspectiveAction
-ALT_ADD_TO_UDDI_PERSPECTIVE=Add to UDDI Page
-MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE=IWAB0320E %1 could not be found in the registry.
-MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL=IWAB0321I %1 is added to UDDI Page.
-
-# FavoritesAddToWSDLPerspectiveAction
-ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE=Add to WSDL Page
-MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL=IWAB0369I %1 is added to WSDL Page.
-MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE=IWAB0370E WSDL %1 could not be loaded.
-
-# RemoveFavoriteAction
-ALT_REMOVE_FAVORITE=Remove Favorite
-MSG_CONFIRM_REMOVE_NODE=%1 is no longer resolvable. Do you wish to clear it?
-
-# FavoritesRestoreDefaultFavoritesAction
-ALT_RESTORE_DEFAULT_FAVORITES=Restore Default Favorites
-MSG_CONFIRM_RESTORE_DEFAULT_FAVORITES=This operation will overwrite the current favorites. Do you wish to continue?
-MSG_ERROR_OPEN_FAVORITES_BACKUP=IWAB0134E Unable to load the default favorites.
-MSG_INFO_FAVORITES_RESTORED_TO_DEFAULT=IWAB0322I Default Favorites are restored.
-MSG_ERROR_SAVE_FAVORITES_WSIL=IWAB0186E Unable to save favorites to %1.
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-
-# Form titles
-FORM_TITLE_UDDI_BUSINESS_DETAILS=UDDI Business Details Form
-FORM_TITLE_UDDI_REGISTRY_DETAILS=UDDI Registry Details Form
-FORM_TITLE_USER_DEF_UDDI_REGISTRY_DETAILS=User Defined UDDI Registry Details Form
-FORM_TITLE_UDDI_SERVICE_DETAILS=UDDI Service Details Form
-FORM_TITLE_UDDI_SERVICE_INTERFACE_DETAILS=UDDI Service Interface Details Form
-FORM_TITLE_WSDL_DETAILS=WSDL Details Form
-FORM_TITLE_WSIL_DETAILS=WSIL Details Form
-
-# View titles
-VIEW_TITLE_UDDI_BUSINESS_LIST=UDDI Businesses List View
-VIEW_TITLE_UDDI_REGISTRY_LIST=UDDI Registries List View
-VIEW_TITLE_USER_DEF_UDDI_REGISTRY_LIST=User Defined UDDI Registries List View
-VIEW_TITLE_UDDI_SERVICE_INTERFACE_LIST=UDDI Service Interfaces List View
-VIEW_TITLE_UDDI_SERVICE_LIST=UDDI Services List View
-VIEW_TITLE_WSDL_SERVICE_LIST=WSDL Services List View
-VIEW_TITLE_WSIL_LIST=WSIL Links List View
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties
deleted file mode 100644
index 093a61444..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties
+++ /dev/null
@@ -1,496 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-
-title=UDDI
-
-# Nodes
-NODE_NAME_UDDI_MAIN=UDDI Main
-NODE_NAME_QUERIES_FOLDER=Executed Queries
-NODE_NAME_PUBLISHED_BUSINESSES_FOLDER=Published Businesses
-NODE_NAME_PUBLISHED_SERVICES_FOLDER=Published Services
-NODE_NAME_PUBLISHED_SERVICE_INTERFACES_FOLDER=Published Service Interfaces
-
-# OpenRegistryAction
-ALT_OPEN_REGISTRY=Open Registry
-FORM_LABEL_OPEN_REGISTRY_DESC=Specify the name and inquiry URL of the registry to be opened. Selecting a favorite registry will automatically fill in the required information. Press <strong>Go</strong> to open the registry.
-FORM_LABEL_FAVORITE_REGISTRY=Favorite Registry
-FORM_LABEL_REGISTRY_NAME=Registry Name
-FORM_LABEL_INQUIRY_URL=Inquiry URL
-MSG_ERROR_INVALID_REGISTRY_NAME=IWAB0136E Enter a valid registry name.
-MSG_ERROR_INVALID_INQUIRY_URL=IWAB0138E Enter a valid inquiry URL.
-MSG_INFO_REGISTRY_OPENED=IWAB0139I The registry named %1 located at %2 was opened successfully.
-
-# User-defined Categories
-FORM_LABEL_ADD_CATEGORY_DATA=<a href="%1">Click here</a> to load this category's data.
-FORM_CONTROL_TITLE_CATEGORY_FILE=Category data file name
-MSG_INFO_NO_USER_DEFINED_CATEGORIES_FOUND=IWAB0371I No user defined categories detected.
-MSG_INFO_NO_CATEGORY_DATA=IWAB0372I Category data for %1 is not available or is invalid.
-MSG_INFO_USER_DEFINED_CATEGORY_DATA_LOADED=IWAB0373I Data for user defined category %1 was successfully loaded.
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_KEY=IWAB0374E Invalid data file for user defined category %1. A category key '%2' was found but '%3' was expected.
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_FORMAT=IWAB0473E Unknown format in line: %1 of the data file for user defined category %2. The line is: "%3"
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE=IWAB0375E Invalid data file for user defined category %1.
-MSG_ERROR_SAVING_CATEGORY_DATA=IWAB0474E An error occured while saving data for category %1. Exception text: %2
-
-# UDDI Category Browser
-TITLE_CATEGORY_BROWSER=Category Browser
-ALT_CATEGORIES=Categories
-
-# Details
-ALT_REGISTRY_DETAILS=Registry Details
-ALT_BUSINESS_DETAILS=Business Details
-ALT_SERVICE_DETAILS=Service Details
-ALT_SERVICE_INTERFACE_DETAILS=Service Interface Details
-FORM_LABEL_DETAILS_EDITABLE=Details for <strong>%1</strong> are shown below. Some items may be added, removed, or changed. Authentication may be required for changes. Other actions are listed at the bottom of this page.
-
-# Get
-ALT_GET=Get
-
-# Common Form Control Title
-FORM_CONTROL_TITLE_NAME_TEXT_VALUE=Name value
-FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE=Description value
-FORM_CONTROL_TITLE_CATEGORY_KEY_NAME=Category key name
-FORM_CONTROL_TITLE_CATEGORY_KEY_VALUE=Category key value
-FORM_CONTROL_TITLE_IDENTIFIER_KEY_NAME=Identifier key name
-FORM_CONTROL_TITLE_IDENTIFIER_KEY_VALUE=Identifier key value
-FORM_CONTROL_TITLE_DISCOVERY_URL=Discovery URL
-FORM_CONTROL_TITLE_INPUT_TEXT_VALUE=UDDI registry name
-
-# Find actions
-ALT_FIND=Find
-ALT_SUBQUERY=Find %1 Subquery
-FORM_LABEL_QUERY_NAME=Name of this query
-DEFAULT_QUERY_NAME=query results
-DEFAULT_SUBQUERY_NAME=%1 - %2 subquery
-FORM_LABEL_SEARCH_FOR=Search for
-FORM_OPTION_BUSINESSES=Businesses
-FORM_OPTION_SERVICES=Services
-FORM_OPTION_SERVICE_INTERFACES=Service Interfaces
-FORM_LABEL_SEARCH_TYPE=Type of search
-FORM_RADIO_SIMPLE=Simple
-FORM_RADIO_ADVANCED=Advanced
-FORM_RADIO_UUID=UUID
-FORM_LABEL_FIND_BUSINESSES_SIMPLE_DESC=Enter the partial or complete name of a business to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_ADVANCED_DESC=Enter values for one or more of the parameters listed below. The '%' symbol can be used as a wildcard that matches any character in the Name field of the Names table. Authentication may be required. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_BUSINESS_UUID_DESC=Enter the UUID of the business to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_NAMES=Names
-FORM_LINK_ADD=Add
-FORM_LINK_GET=Get
-FORM_LINK_FIND=Find
-FORM_LINK_REMOVE=Remove
-FORM_LABEL_OWNED=Owned
-FORM_LABEL_PUBLISH_URL=Publish URL
-FORM_LABEL_USERID=User ID
-FORM_LABEL_PASSWORD=Password
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_NAME=Name
-FORM_LABEL_DESCRIPTION=Description
-FORM_OPTION_LANGUAGE_EN=English
-FORM_OPTION_LANGUAGE_AA=Afar
-FORM_OPTION_LANGUAGE_AB=Abkhazian
-FORM_OPTION_LANGUAGE_AF=Afrikaans
-FORM_OPTION_LANGUAGE_AM=Amharic
-FORM_OPTION_LANGUAGE_AR=Arabic
-FORM_OPTION_LANGUAGE_AS=Assamese
-FORM_OPTION_LANGUAGE_AY=Aymara
-FORM_OPTION_LANGUAGE_AZ=Azerbaijani
-FORM_OPTION_LANGUAGE_BA=Bashkir
-FORM_OPTION_LANGUAGE_BE=Byelorussian
-FORM_OPTION_LANGUAGE_BG=Bulgarian
-FORM_OPTION_LANGUAGE_BH=Bihari
-FORM_OPTION_LANGUAGE_BI=Bislama
-FORM_OPTION_LANGUAGE_BN=Bengali; Bangla
-FORM_OPTION_LANGUAGE_BO=Tibetan
-FORM_OPTION_LANGUAGE_BR=Breton
-FORM_OPTION_LANGUAGE_CA=Catalan
-FORM_OPTION_LANGUAGE_CO=Corsican
-FORM_OPTION_LANGUAGE_CZ=Czech
-FORM_OPTION_LANGUAGE_CY=Welsh
-FORM_OPTION_LANGUAGE_DA=Danish
-FORM_OPTION_LANGUAGE_DE=German
-FORM_OPTION_LANGUAGE_DZ=Bhutani
-FORM_OPTION_LANGUAGE_EL=Greek
-FORM_OPTION_LANGUAGE_EO=Esperanto
-FORM_OPTION_LANGUAGE_ES=Spanish
-FORM_OPTION_LANGUAGE_ET=Estonian
-FORM_OPTION_LANGUAGE_EU=Basque
-FORM_OPTION_LANGUAGE_FA=Persian
-FORM_OPTION_LANGUAGE_FI=Finnish
-FORM_OPTION_LANGUAGE_FJ=Fiji
-FORM_OPTION_LANGUAGE_FO=Faeroese
-FORM_OPTION_LANGUAGE_FR=French
-FORM_OPTION_LANGUAGE_FY=Frisian
-FORM_OPTION_LANGUAGE_GA=Irish
-FORM_OPTION_LANGUAGE_GD=Scots Gaelic
-FORM_OPTION_LANGUAGE_GL=Galician
-FORM_OPTION_LANGUAGE_GN=Guarani
-FORM_OPTION_LANGUAGE_GU=Gujarati
-FORM_OPTION_LANGUAGE_HA=Hausa
-FORM_OPTION_LANGUAGE_HI=Hindi
-FORM_OPTION_LANGUAGE_HR=Croatian
-FORM_OPTION_LANGUAGE_HU=Hungarian
-FORM_OPTION_LANGUAGE_HY=Armenian
-FORM_OPTION_LANGUAGE_IA=Interlingua
-FORM_OPTION_LANGUAGE_IE=Interlingue
-FORM_OPTION_LANGUAGE_IK=Inupiak
-FORM_OPTION_LANGUAGE_IN=Indonesian
-FORM_OPTION_LANGUAGE_IS=Icelandic
-FORM_OPTION_LANGUAGE_IT=Italian
-FORM_OPTION_LANGUAGE_IW=Hebrew
-FORM_OPTION_LANGUAGE_JA=Japanese
-FORM_OPTION_LANGUAGE_JI=Yiddish
-FORM_OPTION_LANGUAGE_JW=Javanese
-FORM_OPTION_LANGUAGE_KA=Georgian
-FORM_OPTION_LANGUAGE_KK=Kazakh
-FORM_OPTION_LANGUAGE_KL=Greenlandic
-FORM_OPTION_LANGUAGE_KM=Cambodian
-FORM_OPTION_LANGUAGE_KN=Kannada
-FORM_OPTION_LANGUAGE_KO=Korean
-FORM_OPTION_LANGUAGE_KS=Kashmiri
-FORM_OPTION_LANGUAGE_KU=Kurdish
-FORM_OPTION_LANGUAGE_KY=Kirghiz
-FORM_OPTION_LANGUAGE_LA=Latin
-FORM_OPTION_LANGUAGE_LN=Lingala
-FORM_OPTION_LANGUAGE_LO=Laothian
-FORM_OPTION_LANGUAGE_LT=Lithuanian
-FORM_OPTION_LANGUAGE_LV=Latvian, Lettish
-FORM_OPTION_LANGUAGE_MG=Malagasy
-FORM_OPTION_LANGUAGE_MI=Maori
-FORM_OPTION_LANGUAGE_MK=Macedonian
-FORM_OPTION_LANGUAGE_ML=Malayalam
-FORM_OPTION_LANGUAGE_MN=Mongolian
-FORM_OPTION_LANGUAGE_MO=Moldavian
-FORM_OPTION_LANGUAGE_MR=Marathi
-FORM_OPTION_LANGUAGE_MS=Malay
-FORM_OPTION_LANGUAGE_MT=Maltese
-FORM_OPTION_LANGUAGE_MY=Burmese
-FORM_OPTION_LANGUAGE_NA=Nauru
-FORM_OPTION_LANGUAGE_NE=Nepali
-FORM_OPTION_LANGUAGE_NL=Dutch
-FORM_OPTION_LANGUAGE_NO=Norwegian
-FORM_OPTION_LANGUAGE_OC=Occitan
-FORM_OPTION_LANGUAGE_OM=(Afan) Oromo
-FORM_OPTION_LANGUAGE_OR=Oriya
-FORM_OPTION_LANGUAGE_PA=Punjabi
-FORM_OPTION_LANGUAGE_PL=Polish
-FORM_OPTION_LANGUAGE_PS=Pashto, Pushto
-FORM_OPTION_LANGUAGE_PT=Portuguese
-FORM_OPTION_LANGUAGE_QU=Quechua
-FORM_OPTION_LANGUAGE_RM=Rhaeto-Romance
-FORM_OPTION_LANGUAGE_RN=Kirundi
-FORM_OPTION_LANGUAGE_RO=Romanian
-FORM_OPTION_LANGUAGE_RU=Russian
-FORM_OPTION_LANGUAGE_RW=Kinyarwanda
-FORM_OPTION_LANGUAGE_SA=Sanskrit
-FORM_OPTION_LANGUAGE_SD=Sindhi
-FORM_OPTION_LANGUAGE_SG=Sangro
-FORM_OPTION_LANGUAGE_SH=Serbo-Croatian
-FORM_OPTION_LANGUAGE_SI=Singhalese
-FORM_OPTION_LANGUAGE_SK=Slovak
-FORM_OPTION_LANGUAGE_SL=Slovenian
-FORM_OPTION_LANGUAGE_SM=Samoan
-FORM_OPTION_LANGUAGE_SN=Shona
-FORM_OPTION_LANGUAGE_SO=Somali
-FORM_OPTION_LANGUAGE_SQ=Albanian
-FORM_OPTION_LANGUAGE_SR=Serbian
-FORM_OPTION_LANGUAGE_SS=Siswati
-FORM_OPTION_LANGUAGE_ST=Sesotho
-FORM_OPTION_LANGUAGE_SU=Sundanese
-FORM_OPTION_LANGUAGE_SV=Swedish
-FORM_OPTION_LANGUAGE_SW=Swahili
-FORM_OPTION_LANGUAGE_TA=Tamil
-FORM_OPTION_LANGUAGE_TE=Tegulu
-FORM_OPTION_LANGUAGE_TG=Tajik
-FORM_OPTION_LANGUAGE_TH=Thai
-FORM_OPTION_LANGUAGE_TI=Tigrinya
-FORM_OPTION_LANGUAGE_TK=Turkmen
-FORM_OPTION_LANGUAGE_TL=Tagalog
-FORM_OPTION_LANGUAGE_TN=Setswana
-FORM_OPTION_LANGUAGE_TO=Tonga
-FORM_OPTION_LANGUAGE_TR=Turkish
-FORM_OPTION_LANGUAGE_TS=Tsonga
-FORM_OPTION_LANGUAGE_TT=Tatar
-FORM_OPTION_LANGUAGE_TW=Twi
-FORM_OPTION_LANGUAGE_UK=Ukrainian
-FORM_OPTION_LANGUAGE_UR=Urdu
-FORM_OPTION_LANGUAGE_UZ=Uzbek
-FORM_OPTION_LANGUAGE_VI=Vietnamese
-FORM_OPTION_LANGUAGE_VO=Volapuk
-FORM_OPTION_LANGUAGE_WO=Wolof
-FORM_OPTION_LANGUAGE_XH=Xhosa
-FORM_OPTION_LANGUAGE_YO=Yoruba
-FORM_OPTION_LANGUAGE_ZH=Chinese
-FORM_OPTION_LANGUAGE_ZU=Zulu
-FORM_LABEL_EXACT_NAME_MATCH=Exact match
-FORM_LABEL_CASE_SENSITIVE_MATCH=Case sensitive
-FORM_LABEL_SOUNDEX=Sound alike
-FORM_LABEL_IDENTIFIERS=Identifiers
-FORM_LABEL_IDENTIFIER_TYPE=Type
-
-# Do not translate the two items below.
-FORM_OPTION_IDENTIFIER_DUNS=D-U-N-S
-FORM_OPTION_IDENTIFIER_THOMAS_REGISTRY=Thomas Registry
-
-FORM_LABEL_KEY_NAME=Key name
-FORM_LABEL_KEY_VALUE=Key value
-FORM_LABEL_CATEGORIES=Categories
-FORM_LABEL_CATEGORY_TYPE=Type
-FORM_OPTION_CATEGORY_NAICS=NAICS
-FORM_OPTION_CATEGORY_UNSPSC_73=UNSPSC 7.3
-FORM_OPTION_CATEGORY_GEO=GEO
-FORM_LABEL_BUSINESS_CATEGORIES=Compare with:
-FORM_OPTION_BUSINESSES_ONLY=Businesses only
-FORM_OPTION_SERVICES_ONLY=Services only
-FORM_OPTION_BOTH=Businesses and Services
-FORM_LABEL_DISCOVERYURLS=Discovery URLs
-FORM_LABEL_DISCOVERYURL=Discovery URL
-FORM_LABEL_FINDQUALIFIERS=Find Qualifiers
-FORM_LABEL_COMBINE_KEYS=Combine keys:
-FORM_OPTION_ANDALLKEYS=And
-FORM_OPTION_ORALLKEYS=Or
-FORM_OPTION_ORLIKEKEYS=Or Like
-FORM_LABEL_SORT_BY_NAME=Sort by name:
-FORM_RADIO_SORT_ASC=Ascending
-FORM_RADIO_SORT_DESC=Descending
-FORM_LABEL_SORT_BY_DATE=Sort by date:
-FORM_LABEL_MAX_SEARCH_SET=Maximum size of search set:
-FORM_LABEL_MAX_RESULTS=Maximum number of results:
-FORM_LABEL_FIND_SERVICES_SIMPLE_DESC=Enter the partial or complete name of a service to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_UUID_DESC=Enter the UUID of the service to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_INTERFACES_SIMPLE_DESC=Enter the partial or complete name of a service interface to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_INTERFACE_UUID_DESC=Enter the UUID of the service interface to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_SERVICE_INTERFACES=Service Interfaces
-FORM_LABEL_UUID_KEY=UUID Key:
-FORM_LABEL_USE_SERVICE=Use service
-FORM_LABEL_SERVICE=Service
-FORM_LABEL_BUSINESS=Business
-FORM_LABEL_PUBLISH_ASSERTIONS=Publisher Assertions
-FORM_LABEL_DIRECTION=Direction
-FORM_LABEL_FROM_KEY=From Key
-FORM_LABEL_TO_KEY=To Key
-FORM_LABEL_STATUS=Status
-FORM_LABEL_ASSERTION_TYPE=Assertion Type
-FORM_OPTION_ASSERTION_TYPE_PARENT_CHILD=Parent-Child
-FORM_OPTION_ASSERTION_TYPE_PEER_TO_PEER=Peer-Peer
-FORM_OPTION_ASSERTION_TYPE_IDENTITY=Identity
-FORM_LABEL_ASSERTION_DIRETION_DESC=Direction <strong>From</strong> will create a publisher assertion from this business to the businesses above. Direction <strong>To</strong> will create a publisher assertion from the above businesses to this business.
-FORM_OPTION_ASSERTION_DIRECTION_FROM=--->
-FORM_OPTION_ASSERTION_DIRECTION_TO=<---
-FORM_LABEL_THIS_BUSINESS=This
-MSG_ERROR_INVALID_QUERY_NAME=IWAB0140E Enter a valid name for the query.
-MSG_ERROR_INVALID_NAMES=IWAB0141E Enter a series of valid names.
-MSG_ERROR_INVALID_PUBLISH_URL=IWAB0142E Enter a valid publish URL.
-MSG_ERROR_INVALID_USERID=IWAB0143E Enter a valid user ID.
-MSG_ERROR_INVALID_MAX_SEARCH_SET=IWAB0145E Enter a valid size for the maximum search set.
-MSG_ERROR_INVALID_MAX_RESULTS=IWAB0146E Enter a valid size for the maximum number of results.
-MSG_INFO_BUSINESSES_FOUND=IWAB0147I Number of businesses found: %1
-MSG_ERROR_NO_BUSINESSES_FOUND=IWAB0148E No businesses found.
-MSG_INFO_SERVICES_FOUND=IWAB0149I Number of services found: %1
-MSG_ERROR_NO_SERVICES_FOUND=IWAB0150E No services found.
-MSG_ERROR_SINGLE_ITEM=IWAB0151E Select just one item.
-MSG_QUESTION_ITEM_REPLACEMENT=The selection will replace an item already in the target. Do you wish to proceed?
-MSG_INFO_SERVICE_INTERFACES_FOUND=IWAB0152I Number of service interfaces found: %1
-MSG_ERROR_NO_SERVICE_INTERFACES_FOUND=IWAB0153E No service interfaces found.
-MSG_ERROR_NOTHING_SELECTED=IWAB0154E Select at least one item.
-MSG_ERROR_INVALID_UUID_KEY=IWAB0155E Enter a valid UUID key.
-MSG_ERROR_QUERY_NAME_CONFLICT=IWAB0156E The subquery's query name cannot be the same as the originator.
-MSG_ERROR_NO_ITEMS_TO_GET=IWAB0157E No items of the specified type have been published or discovered yet.
-MSG_INFO_NO_BUSINESSES_OR_SERVICE_INTERFACES_FOUND=IWAB0162I No Businesses, Services or Service Interfaces found.
-
-# Results
-ALT_QUERY_RESULTS=Query Results
-FORM_LABEL_SUBQUERY=The results may be used as inputs of another operation. Click the <strong>target</strong> link at the top to see the operation. Selected results can be used in the operation by clicking the <strong>Transfer</strong> button.
-FORM_LABEL_QUERY=Select a result to see more details or select a set of results and click a button to perform an operation.
-FORM_LINK_TARGET=target
-FORM_BUTTON_TRANSFER=Transfer
-FORM_BUTTON_REFRESH=Refresh
-FORM_BUTTON_ADD_TO_FAVORITES=Add to favorites
-FORM_BUTTON_UNPUBLISH=Unpublish
-FORM_BUTTON_CLEAR=Clear
-
-# Publish actions
-ALT_PUBLISH=Publish
-FORM_LABEL_PUBLISH=Publish:
-FORM_OPTION_BUSINESS=Business
-FORM_OPTION_SERVICE=Service
-FORM_OPTION_SERVICE_INTERFACE=Service Interface
-FORM_LABEL_PUBLISH_BUSINESS_SIMPLE_DESC=Enter a name and an optional description for the business to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_BUSINESS_ADVANCED_DESC=Provide a name for the business to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_SIMPLE_DESC=Get or find a business and then provide the WSDL URL, name and an optional description for the service to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_ADVANCED_DESC=Get or find a business and then provide the WSDL URL and a name for the service to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_BUSINESS_PUBLISH_SERVICE_SIMPLE_DESC=Provide the WSDL URL, name and an optional description for the service to be published. Authentication may be required.
-FORM_LABEL_BUSINESS_PUBLISH_SERVICE_ADVANCED_DESC=Provide the WSDL URL and a name for the service to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_INTERFACE_SIMPLE_DESC=Enter a WSDL URL, name and an optional description for the service interface to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_INTERFACE_ADVANCED_DESC=Provide the WSDL URL and name for the service interface to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_FORM=Publication format
-FORM_LABEL_DESCRIPTION=Description
-FORM_LABEL_DESCRIPTIONS=Descriptions
-MSG_INFO_BUSINESS_PUBLISHED=IWAB0158I Business %1 was successfully published.
-MSG_INFO_SERVICE_PUBLISHED=IWAB0159I Service %1 was successfully published.
-MSG_INFO_SERVICE_INTERFACE_PUBLISHED=IWAB0160I Service interface %1 was successfully published.
-MSG_ERROR_INVALID_NAME=IWAB0161E Enter a valid name.
-MSG_ERROR_ROW_BLANK_LANGUAGE=IWAB0250E Select a non-blank language for the %1 in row %2. Only the first row can have a blank language.
-MSG_ERROR_ROW_DUPLICATE_LANGUAGE=IWAB0251E Change the language for the %1 in row %2. The current one is already in use.
-MSG_ERROR_ROW_INVALID_TEXT=IWAB0252E Enter a valid %1 in row %2
-MSG_ERROR_INVALID_WSDL_URL=IWAB0253E Enter a valid WSDL URL.
-MSG_ERROR_NO_NAMES=IWAB0254E Add at least one name.
-MSG_ERROR_INVALID_SERVICE=IWAB0255E Provide a valid service.
-MSG_ERROR_INVALID_BUSINESS=IWAB0256E Provide a valid business.
-
-# Business Publish Service action
-ALT_PUBLISH_SERVICE=Publish Service
-
-# Login actions
-ALT_LOGIN=Login
-ALT_LOGOUT=Logout
-MSG_INFO_NO_MULTIPLE_LOGIN=Multiple logins with same ID not allowed
-MSG_INFO_LOGGED_IN_NODE=%1 - logged in as %2
-
-# WSDL Browser
-TITLE_WSDL_BROWSER=WSDL Browser - %1
-FORM_LABEL_WSDL_SOURCE=Select a WSDL source:
-FORM_LABEL_WSDL_SOURCE_WEBPROJECTS=Web Projects
-FORM_LABEL_WSDL_SOURCE_FAVORITES=Favorites
-FORM_LABEL_WEB_PROJECT=Web Project
-FORM_LABEL_WSDL_URL=WSDL URL
-ALT_WSDL_BROWSER=WSDL Browser
-
-# Details
-FORM_LINK_EDIT=Edit
-FORM_LINK_CANCEL=Cancel
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_SERVICE_INTERFACE_KEY=TModel Key
-FORM_LABEL_USER_DEFINED_CATEGORIES=User Defined Categories
-FORM_LABEL_CHECKED=Checked
-FORM_LABEL_FILE=File
-MSG_QUESTION_PUBLISH_ITEM=The item could not be found in the registry. Do you wish to publish it?
-MSG_QUESTION_SERVICE_PUBLISH_BUSINESS=The service and its business could not be found in the registry. Proceed to publish?
-MSG_INFO_BUSINESS_UPDATED=IWAB0257I Business %1 was successfully updated.
-MSG_INFO_SERVICE_UPDATED=IWAB0258I Service %1 was successfully updated.
-MSG_INFO_SERVICE_INTERFACE_UPDATED=IWAB0259I Service Interface %1 was successfully updated.
-MSG_INFO_REGISTRY_UPDATED=IWAB0323I Registry %1 was successfully updated.
-
-# UnpublishAction
-ALT_UNPUBLISH_BUSINESS=Unpublish Business
-ALT_UNPUBLISH_SERVICE=Unpublish Service
-ALT_UNPUBLISH_SERVICE_INTERFACE=Unpublish Service Interface
-FORM_LABEL_UNPUBLISH_DESC=Press <strong>Go</strong> to unpublish this object. Authentication may be required.
-MSG_INFO_BUSINESS_UNPUBLISHED=IWAB0260I Business %1 was successfully unpublished.
-MSG_INFO_SERVICE_UNPUBLISHED=IWAB0261I Service %1 was successfully unpublished.
-MSG_INFO_SERVICE_INTERFACE_UNPUBLISHED=IWAB0262I Service Interface %1 was successfully unpublished.
-
-# Add to WSDL Perspective
-ALT_ADD_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-MSG_INFO_WSDL_ADDED_TO_WSDL_PERSPECTIVE=IWAB0376I %1 was successfully added to WSDL page.
-MSG_ERROR_WSDL_NOT_ADDED_TO_WSDL_PERSPECTIVE=IWAB0377E %1 could not be added to WSDL page.
-
-# Add to Favorites
-ALT_ADD_TO_FAVORITES=Add To Favorites
-MSG_INFO_FAVORITE_ADDED=IWAB0263I %1 was successfully added to favorites.
-MSG_ERROR_FAVORITE_NOT_ADDED=IWAB0264E %1 could not be added to favorites.
-MSG_ERROR_FAVORITE_ALREADY_EXISTS=IWAB0324E %1 already exists in favorties.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists. Do you wish to overwrite?
-
-# Refresh
-MSG_INFO_NODE_REFRESHED=IWAB0265I %1 refreshed.
-MSG_QUESTION_REMOVE_NODE=%1 could not be found in the registry. Do you wish to clear it?
-
-# ManageReferencedServices
-ALT_MANAGE_REFERENCED_SERVICES=Manage Referenced Services
-FORM_LABEL_MANAGE_REFERENCED_SERVICES_DESC=Add discovered or published services to the list of referenced services by clicking the <strong>Add Services</strong> button. Remove selected references by clicking the <strong>Remove References</strong> button. Authentication may be required for changes.
-FORM_LABEL_REFERENCED_SERVICES=Referenced Services
-FORM_BUTTON_ADD_SERVICES=Add Services
-FORM_BUTTON_REMOVE_REFERENCES=Remove References
-MSG_ERROR_NO_REFERENCE_SELECTED=IWAB0266E Select at least one referenced service before proceeding.
-MSG_ERROR_NO_SERVICES=IWAB0267E Get or find at least one service before proceeding.
-MSG_ERROR_SERVICE_NOT_REFERENCED=IWAB0268E Service %1 could not be referenced.
-MSG_ERROR_REFERENCE_NOT_REMOVED=IWAB0269E Service reference %1 could not be removed.
-MSG_INFO_SERVICE_REFERENCED=IWAB0270I Service %1 was successfully referenced.
-MSG_INFO_SERVICE_REFERENCE_REMOVED=IWAB0271I Service reference %1 was successfully removed.
-
-# ManagePublisherAssertions
-ALT_MANAGE_PUBLISHER_ASSERTIONS=Manage Publisher Assertions
-FORM_LABEL_MANAGE_PUBLISHER_ASSERTIONS_DESC=Add discovered or published businesses to the list of publisher assertions by clicking <strong>Add Assertions</strong>. Remove selected assertions by clicking <strong>Remove Assertions</strong>. Complete selected assertions by clicking <strong>Complete Assertions</strong>. Click <strong>Refresh Assertions</strong> to refresh the list of assertions.
-FORM_LABEL_INCOMPLETE_ASSERTIONS_VISIBILITY_DESC=Please note that incomplete publisher assertions are visible only to the owner of the business.
-FORM_LABEL_BUSINESSES=Businesses
-FORM_BUTTON_SHOW_ALL_PUBLISHER_ASSERTIONS=Refresh Assertions
-FORM_BUTTON_COMPLETE_PUBLISHER_ASSERTIONS=Complete Assertions
-FORM_BUTTON_ADD_PUBLISHER_ASSERTIONS=Add Assertions
-FORM_BUTTON_REMOVE_PUBLISHER_ASSERTIONS=Remove Assertions
-MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED=IWAB0325I Publisher Assertions are refreshed.
-MSG_ERROR_NO_INCOMPLETE_ASSERTION_SELECTED=IWAB0326E Select at least one incomplete publisher assertion.
-MSG_ERROR_NOT_OWNED_BUSINESS=IWAB0327E This operation cannot be performed on a business owned by another party.
-
-# GetBusinesses
-ALT_GET_BUSINESS=Get Business
-ALT_GET_BUSINESSES=Get Businesses
-NODE_NAME_SERVICE_BUSINESS=Business for service %1
-NODE_NAME_SI_BUSINESSES=Businesses for service interface %1
-MSG_QUESTION_REMOVE_SERVICE_NODE=The service could not be found in the registry. Do you wish to remove this node?
-
-# GetServiceInterfaces
-ALT_GET_SERVICE_INTERFACES=Get Service Interfaces
-NODE_NAME_SERVICE_SERVICE_INTERFACES=Service interfaces for service %1
-MSG_QUESTION_GET_SI_REMOVE_SERVICE_NODE=The service could not be found in the registry. Do you wish to remove this node?
-
-# GetServices
-ALT_GET_SERVICES=Get Services
-NODE_NAME_SI_SERVICES=Services for service interface %1
-NODE_NAME_BUSINESS_SERVICES=Services for business %1
-MSG_QUESTION_REMOVE_SI_NODE=The service interface could not be found in the registry. Do you wish to remove this node?
-MSG_QUESTION_REMOVE_BUSINESS_NODE=The business could not be found in the registry. Do you wish to remove this node?
-
-# RefreshUDDINodesAction
-MSG_ERROR_NODE_DATA_VALIDATION_FAILED=IWAB0272E %1 could not be found in the registry.
-
-# Summaries
-ALT_SUMMARY_QUERIES=Summary of Queries
-ALT_SUMMARY_BUSINESSES=Summary of Businesses
-ALT_SUMMARY_SERVICES=Summary of Services
-ALT_SUMMARY_SERVICE_INTERFACES=Summary of Service Interfaces
-FORM_LABEL_QUERIES=Queries
-
-# SelectSubQueryItemAction
-MSG_QUESTION_ITEM_VALIDATION_FAILED=%1 could not be found in the registry. Do you wish to remove it?
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_UDDI_PERSPECTIVE_CONTENT=UDDI Page Content
-FRAME_TITLE_CATEGORIES_WORKAREA=Categories Work Area
-FRAME_TITLE_CATEGORIES_TOOLBAR=Categories Toolbar
-FRAME_TITLE_CATEGORIES_CONTENT=Categories Content
-FRAME_TITLE_WSDL_TOOLBAR=WSDL Browser Toolbar
-FRAME_TITLE_WSDL_CONTENT=WSDL Browser Content
-
-# Form titles
-FORM_TITLE_BUSINESS_DETAILS=Business Details Form
-FORM_TITLE_BUSINESS_PUBLISH_SERVICE=Business Publish Service Form
-FORM_TITLE_GET_FORM=Select from Discovered and Published Objects Form
-FORM_TITLE_ITEMS_SUMMARY=Summary of Items Form
-FORM_TITLE_MANAGE_PUBLISHER_ASSERTIONS=Manage Publisher Assertions Form
-FORM_TITLE_MANAGE_REFERENCED_SERVICES=Manage Referenced Services Form
-FORM_TITLE_OPEN_REGISTRY=Open Registry Form
-FORM_TITLE_REGISTRY_DETAILS=Registry Details Form
-FORM_TITLE_REGISTRY_PUBLISH=Registry Publish Form
-FORM_TITLE_REGISTRY_FIND=Registry Find Form
-FORM_TITLE_RESULTS=Results Form
-FORM_TITLE_SERVICE_DETAILS=Service Details Form
-FORM_TITLE_SERVICE_INTERFACE_DETAILS=Service Interface Details Form
-FORM_TITLE_UNPUBLISH=Unpublish Form
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties
deleted file mode 100644
index 3c9f22575..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties
+++ /dev/null
@@ -1,172 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 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
-# yyyymmdd bug Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070413 176493 makandre@ca.ibm.com - Andrew Mak, WSE: Make message/transport stack pluggable
-# 20070507 185600 makandre@ca.ibm.com - Andrew Mak, WSE status pane's "header" twistie should not appear for responses without headers
-###############################################################################
-
-title=WSDL
-
-# Nodes
-NODE_NAME_WSDL_MAIN=WSDL Main
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_WSDL_PERSPECTIVE_CONTENT=WSDL Page Content
-FRAME_TITLE_XSD_INFORMATION_TOOLBAR=XSD Information Dialog Toolbar
-FRAME_TITLE_XSD_INFORMATION_CONTENT=XSD Information Dialog Content
-
-# OpenWSDLAction
-ALT_OPEN_WSDL=Open WSDL
-MSG_ERROR_INVALID_WSDL_URL=IWAB0378E Enter a valid WSDL URL.
-MSG_ERROR_OPEN_WSDL=IWAB0379E Unable to open %1.
-MSG_ERROR_XSD_VALIDATION=IWAB0380E Errors were encountered while validating XML schemas.
-MSG_INFO_OPEN_WSDL_SUCCESSFUL=IWAB0381I %1 was successfully opened.
-
-# WSDL Element details
-ALT_WSDL_DETAILS=WSDL Details
-FORM_LABEL_WSDL_DETAILS_DESC=Shown below are the details for this WSDL document. Click on a service or binding to see its details.
-
-# WSDL Service Element details
-ALT_WSDL_SERVICE_DETAILS=WSDL Service Details
-FORM_LABEL_SERVICE_DETAILS_DESC=Shown below are the details for this &lt;service&gt; element. Click on a binding to see its operations.
-
-ALT_NIL=nil?
-
-# WSDL Binding Element details
-ALT_WSDL_BINDING_DETAILS=WSDL Binding Details
-FORM_LABEL_BINDING_DETAILS_DESC=Shown below are the details for this <strong>%1</strong> &lt;binding&gt; element. Click on an operation to fill in its parameters and invoke it or specify additional endpoints.
-
-# InvokeWSDLOperationAction
-ALT_INVOKE_WSDL_OPERATION=Invoke a WSDL Operation
-MSG_ERROR_UNABLE_TO_CONNECT=IWAB0382E Unable to connect to %1
-MSG_ERROR_VALIDATING_PARAMETER=IWAB0383E Error validating %1
-
-# WSDLAddToFavoritesAction
-ALT_ADD_WSDL_TO_FAVORITES=Add WSDL To Favorites
-MSG_ERROR_FAVORITES_ALREADY_EXISTS=IWAB0384E %1 already exists in favorites.
-MSG_ERROR_ADD_TO_FAVORITES=IWAB0385E Unable to add %1 to favorites.
-MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL=IWAB0386I %1 is added to favorites.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists. Do you wish to overwrite?
-
-# RefreshWSDLAction
-MSG_INFO_REFRESH_WSDL_SUCCESSFUL=IWAB0387I %1 is refreshed.
-MSG_QUESTION_REMOVE_WSDL_NODE=%1 is no longer resolvable. Do you wish to clear it?
-
-# UpdateWSDLBindingAction
-MSG_INFO_UPDATE_WSDL_BINDING_SUCCESSFUL=IWAB0388I Endpoints were successfully updated.
-
-# Form titles
-FORM_TITLE_OPEN_WSDL=Open WSDL Form
-FORM_TITLE_WSDL_DETAILS=WSDL Details Form
-FORM_TITLE_WSDL_SERVICE_DETAILS=WSDL Service Details Form
-FORM_TITLE_WSDL_BINDING_DETAILS=WSDL Binding Details Form
-FORM_TITLE_INVOKE_WSDL_OPERATION=WSDL Operation Form
-
-# Form Labels
-FORM_LABEL_OPEN_WSDL_DESC=Enter the URL of a WSDL document and click <strong>Go</strong> to explore.
-FORM_LABEL_SERVICES=Services
-FORM_LABEL_BINDINGS=Bindings
-FORM_LABEL_OPERATIONS=Operations
-FORM_LABEL_BINDING_TYPE=Type
-FORM_LABEL_BINDING_TYPE_UNSUPPORTED=Unsupported
-FORM_LABEL_BINDING_TYPE_SOAP=SOAP
-FORM_LABEL_BINDING_TYPE_HTTP_GET=HTTP GET
-FORM_LABEL_BINDING_TYPE_HTTP_POST=HTTP POST
-FORM_LABEL_NAME=Name
-FORM_LABEL_DOCUMENTATION=Documentation
-FORM_LABEL_ENDPOINT=Endpoint
-FORM_LABEL_INVOKE_WSDL_OPERATION_DESC=Enter the parameters of this WSDL operation and click <strong>Go</Strong> to invoke.
-FORM_LABEL_INVOKE_WSDL_OPERATION_DESC_NO_INPUT=There are no input parameters for the WSDL operation "%1". Click <strong>Go</Strong> to invoke.
-FORM_LINK_ADD=Add
-FORM_LINK_REMOVE=Remove
-FORM_LABEL_VALUES=Values
-FORM_LABEL_ENABLE_DISABLE_GROUP=Enable/Disable group
-FORM_LABEL_UNION_TYPE=Union types
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_XSD_APPLICATION_INFORMATION=Application Information
-FORM_LABEL_XSD_DOCUMENTATION=Documentation
-FORM_LABEL_SOAP_REQUEST_ENVELOPE=SOAP Request Envelope:
-FORM_LABEL_SOAP_RESPONSE_ENVELOPE=SOAP Response Envelope:
-FORM_LABEL_GROUP_ALL_ORDERING_MOVE_UP=Move element up
-FORM_LABEL_GROUP_ALL_ORDERING_MOVE_DOWN=Move element down
-FORM_LABEL_BASE_TYPE=Base type
-FORM_LABEL_UNBOUNDED=Unbounded
-FORM_LABEL_LENGTH=Length
-FORM_LABEL_LENGTH_VALUE=[%1..%2]
-FORM_LABEL_PATTERN=Pattern
-FORM_LABEL_WHITESPACE=Whitespace
-FORM_LABEL_RANGE_OF_VALUES=Range of values
-FORM_LABEL_MIN_EXCLUSIVE=(%1..
-FORM_LABEL_MIN_INCLUSIVE=[%1..
-FORM_LABEL_MAX_EXCLUSIVE=%1)
-FORM_LABEL_MAX_INCLUSIVE=%1]
-FORM_LABEL_TOTAL_DIGITS=Total digits
-FORM_LABEL_FRACTION_DIGITS=Fraction digits
-FORM_LABEL_OCCURANCE=Occurance of
-FORM_LABEL_UNION_MEMBERS=Union Members
-FORM_LABEL_LIST_ITEMS=List items
-FORM_LABEL_ELEMENTS=Elements
-FORM_LABEL_SOAP_ENC_ARRAYS=SOAP Arrays
-FORM_LABEL_CONTENT=Content
-FORM_LABEL_ATOMIC_NAME_TYPE=%1 (%2):
-FORM_LABEL_NULL=null
-FORM_LABEL_GROUP_NUMBER=Group %1
-FORM_LABEL_CHOICES=Choices
-FORM_LABEL_NOTHING_TO_DISPLAY_IN_FORM_VIEW=There is nothing to be displayed in the form view. Please switch to the source view for the SOAP request and response.
-FORM_LABEL_SOAP_RESPONSE_FAILED_VALIDATION_IN_FORM_VIEW=The SOAP response failed schema validation. Please switch to the source view for the SOAP response in XML format.
-FORM_LABEL_CANNOT_DISPLAY_HEADER_IN_FORM_VIEW=The content of the header cannot be displayed in the form view. Please switch to the source view to examine the raw content.
-FORM_LABEL_CANNOT_DISPLAY_BODY_IN_FORM_VIEW=The content of the body cannot be displayed in the form view. Please switch to the source view to examine the raw content.
-FORM_LABEL_BODY_IS_EMPTY=The body is empty.
-FORM_LABEL_END_POINTS=Endpoints
-FORM_LABEL_HEADER=Header
-FORM_LABEL_BODY=Body
-FORM_LABEL_MUSTUNDERSTAND=mustUnderstand
-FORM_LABEL_ACTOR=actor
-
-# Source/Form views
-FORM_LINK_FORM=Form
-ALT_SWITCH_TO_FORM_VIEW=Switch to form view
-FORM_LINK_SOURCE=Source
-ALT_SWITCH_TO_SOURCE_VIEW=Switch to source view
-FORM_LABEL_FRAGMENT_SOAP_VIEW_CONTENT=Soap Body:
-BUTTON_LABEL_LOAD=Load
-BUTTON_LABEL_SAVE_AS=Save As...
-MSG_QUESTION_SYNC_VIEWS=Format of the source content may be altered as a result of switching to the form view. Do you wish to process?
-MSG_QUESTION_SYNC_VIEWS_DESPITE_INVALID_SOURCE_CONTENT=Content of the source view failed schema validation. Synchronize anyways? (Content of the source view may be modified)
-
-# Form control titles
-FORM_CONTROL_TITLE_ENABLE_DISABLE_GROUP=Enable/Disable group
-FORM_CONTROL_TITLE_SELECT_ELEMENT_IN_GROUP=Select element in group
-FORM_CONTROL_TITLE_SELECT_UNION_TYPE=Select union type
-FORM_CONTROL_TITLE_SOAP_FILE=SOAP data file
-
-# XSD Information Dialog
-TITLE_XSD_INFORMATION_DIALOG=XSD Information Dialog
-
-# Error messages
-MSG_ERROR_NOTHING_SELECTED=IWAB0389E Select at least one item.
-MSG_ERROR_MAX_OCCURS_VIOLATION=IWAB0390E Maximum occurance is reached.
-MSG_ERROR_MIN_OCCURS_VIOLATION=IWAB0391E Minimum occurance is reached.
-MSG_ERROR_CANNOT_MOVE_FIRST_ELEMENT_UP=IWAB0392E Selected element is already the first in the group.
-MSG_ERROR_CANNOT_MOVE_LAST_ELEMENT_DOWN=IWAB0393E Selected element is already the last in the group.
-
-# SOAP transport messages
-MSG_ERROR_NO_SUITABLE_TRANSPORT=Failed to invoke operation, a suitable transport extension was not found.
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties
deleted file mode 100644
index c798fd7f9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties
+++ /dev/null
@@ -1,163 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 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
-###############################################################################
-
-title=WSIL
-
-# Navigator
-WSIL_MAIN_NODE=WSIL Main
-
-# Forms
-FORM_LABEL_URL=URL
-FORM_LABEL_ITEM_NUMBER=Item #
-FORM_LABEL_UDDI_BUSINESS_NAME=UDDI Business Name
-FORM_LABEL_UDDI_SERVICE_NAME=UDDI Service Name
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_ABSTRACT=Abstract
-FORM_LABEL_NAME=Name
-FORM_LABEL_WSDL_BINDINGS=WSDL Bindings
-FORM_LABEL_NAMESPACE_URI=Namespace URI
-FORM_LABEL_LOCAL_NAME=Local Name
-FORM_LABEL_INQUIRY_API=Inquiry API
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_DISCOVERY_URL=Discovery URL
-FORM_LABEL_WSIL=WSIL Details
-FORM_LABEL_WSIL_LINKS=WSIL Links
-FORM_LABEL_WSDL_SERVICE=WSDL Services
-FORM_LABEL_UDDI_SERVICE=UDDI Services
-FORM_LABEL_UDDI_BUSINESS=UDDI Businesses
-FORM_LABEL_ADD_TO_NAVIGATOR=Add To Navigator
-FORM_LABEL_ADD_TO_FAVORITES=Add To Favorites
-FORM_LABEL_ADD_TO_UDDI_PERSPECTIVE=Add To UDDI Page
-FORM_LABEL_ADD_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-FORM_LABEL_REFRESH=Refresh
-FORM_LABEL_NA=N/A
-FORM_LABEL_UNAVAILABLE_UDDI_SERVICE=Service Unavailable:
-FORM_LABEL_UNAVAILABLE_UDDI_BUSINESS=Business Unavailable:
-FORM_LABEL_CHOOSE_WSIL_INSPECTION_TYPE=Choose the type of objects to inspect:
-MSG_ERROR_NOTHING_SELECTED=IWAB0328E Select at least one item.
-
-# OpenWSILAction
-ALT_OPEN_WSIL=Open WSIL
-FORM_LABEL_OPEN_WSIL_DESC=Enter the URL of a WSIL document or a HTML document and click <strong>Go</strong> to open inspect.
-WSIL_URL=URL to document:
-MSG_ERROR_INVALID_WSIL_URL=IWAB0394E %1 is not a valid WSIL URL or HTML URL.
-MSG_ERROR_WSIL_ALREADY_OPENED=IWAB0329E %1 is already opened in the navigator.
-MSG_INFO_OPEN_WSIL_SUCCESSFUL=IWAB0330I %1 was successfully opened.
-
-# OpenWSILLinkAction
-ALT_OPEN_WSIL_LINK=Open WSIL Link
-MSG_ERROR_WSIL_LINK_ALREADY_OPENED=IWAB0331E %1 is already opened in the navigator
-MSG_INFO_OPEN_WSIL_LINK_SUCCESSFUL=IWAB0332I %1 was successfully opened.
-
-# WsilDetailsAction
-ALT_WSIL_DETAILS=WSIL Details
-
-# WsilServiceDetailsAction
-ALT_WSIL_SERVICE_DETAILS=WSIL Service Details
-
-# UddiLinkDetailsAction
-ALT_UDDI_LINK_DETAILS=UDDI Business Details
-
-# WsilLinkDetailsAction
-ALT_WSIL_LINK_DETAILS=WSIL Link Details
-
-# ListWSDLServicesAction
-ALT_LIST_WSDL_SERVICES=List All WSDL Services
-FORM_LABEL_LIST_WSDL_SERVICES_DESC=Select a set of WSDL services and click <strong>Add to Favorites</strong> to add these to the list of favorites.
-
-# ListUDDIServicesAction
-ALT_LIST_UDDI_SERVICES=List All UDDI Services
-FORM_LABEL_LIST_UDDI_SERVICES_DESC=Select a set of UDDI services and click <strong>Add to Favorites</strong> to add these to the list of favorites. Click <strong>Add to UDDI Page</strong> to add the selections to the UDDI Page. Click <strong>Refresh</strong> to refresh the selections.
-
-# ListUDDIBusinessesAction
-ALT_LIST_UDDI_LINKS=List All UDDI Businesses
-FORM_LABEL_LIST_UDDI_BUSINESSES_DESC=Select a set of UDDI businesses and click <strong>Add to Favorites</strong> to add these to the list of favorites. Click <strong>Add to UDDI Page</strong> to add these to the UDDI Page. Click <strong>Refresh</strong> to refresh the selections.
-
-# ListWSILLinksAction
-ALT_LIST_WSIL_LINKS=List All WSIL Links
-FORM_LABEL_LIST_WSIL_LINKS=Select a set of WSIL links and press <strong>Add to Navigator</strong> to open them in the navigator.
-
-# ClearWSILAction
-ALT_CLEAR_WSIL=Clear WSIL
-
-# RefreshAction
-ALT_REFRESH_WSIL=Refresh WSIL
-ALT_REFRESH_UDDI_BUSINESS=Refresh UDDI Business
-ALT_REFRESH_UDDI_SERVICE=Refresh UDDI Service
-MSG_ERROR_WSIL_NOT_FOUND=IWAB0333E WSIL %1 could not be loaded.
-MSG_ERROR_BUSINESS_NOT_FOUND=IWAB0334E Business %1 could not be found in the registry.
-MSG_ERROR_SERVICE_NOT_FOUND=IWAB0335E Service %1 could not be found in the registry.
-MSG_INFO_REFRESH_SUCCESSFUL=IWAB0336I %1 is refreshed.
-MSG_CONFIRM_REMOVE_NODE=%1 is no longer resolvable. Do you wish to clear it?
-
-# AddToUDDIPerspectiveAction
-ALT_ADD_BUSINESS_TO_UDDI_PERSPECTIVE=Add Business To UDDI Page
-ALT_ADD_SERVICE_TO_UDDI_PERSPECTIVE=Add Service To UDDI Page
-MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL=IWAB0337I %1 is added to UDDI Page.
-MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE=IWAB0338E Unable to add %1 to UDDI Page.
-MSG_ERROR_BUSINESS_NOT_FOUND=IWAB0339E Business %1 could not be found in the registry.
-MSG_ERROR_SERVICE_NOT_FOUND=IWAB0340E Service %1 could not be found in the registry.
-
-# WsilAddToWSDLPerspectiveAction
-ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE=Add WSDL To WSDL Page
-MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL=IWAB0395I %1 is added to WSDL Page.
-MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE=IWAB0396E %1 could not be loaded.
-
-# AddWSILToFavoritesAction
-ALT_ADD_WSIL_TO_FAVORITES=Add WSIL To Favorites
-MSG_ERROR_ADD_TO_FAVORITES=IWAB0341E Unable to add %1 to favorites.
-MSG_ERROR_FAVORITES_ALREADY_EXISTS=IWAB0342E %1 already exists in favorites.
-MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL=IWAB0343I %1 is added to favorites.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists. Do you wish to overwrite?
-
-# AddWSDLServiceToFavoritesAction
-ALT_ADD_WSDL_SERVICE_TO_FAVORITES=Add WSDL To Favorites
-
-# AddBusinessToFavoritesAction
-ALT_ADD_UDDI_BUSINESS_TO_FAVORITES=Add UDDI Business To Favorites
-
-# AddServiceToFavoritesAction
-ALT_ADD_SERVICE_TO_FAVORITES=Add UDDI Service To Favorites
-
-# WSILImportWSILToWorkbench
-ATL_IMPORT_WSIL_TO_WORKBENCH=Import WSIL To Workbench
-FORM_LABEL_IMPORT_WSIL_TO_WORKBENCH_DESC=Select a workbench project to save the WSIL file into. You may also change the name of the WSIL file.
-
-# ImportToFileSystemAction
-ALT_WSIL_IMPORT_TO_FS=Import WSIL To File System
-ALT_WSDL_IMPORT_TO_FS=Import WSDL To File System
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-
-# Form titles
-FORM_TITLE_OPEN_WSIL=Open WSIL Form
-FORM_TITLE_UDDI_BUSINESS_DETAILS=UDDI Business Details Form
-FORM_TITLE_UDDI_SERVICE_DETAILS=UDDI Service Details Form
-FORM_TITLE_WSDL_SERVICE_DETAILS=WSDL Service Details Form
-FORM_TITLE_WSIL_DETAILS=WSIL Details Form
-FORM_TITLE_WSIL_LINK_DETAILS=WSIL Link Details Form
-
-# View titles
-VIEW_TITLE_UDDI_BUSINESSES=UDDI Businesses View
-VIEW_TITLE_UDDI_SERVICES=UDDI Services View
-VIEW_TITLE_WSDL_SERVICES=WSDL Services View
-VIEW_TITLE_WSIL_LINKS=WSIL Links View
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore
deleted file mode 100644
index 40b582992..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.jar
-wsexplorersrc.zip
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp
deleted file mode 100644
index a90b044fc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp
+++ /dev/null
@@ -1,91 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs,
- org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine,
- org.eclipse.wst.ws.internal.explorer.platform.engine.ActionDataParser,
- org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor,
- org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor,
- org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor,
- org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils,
- org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils,
- org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser,
- java.util.List,
- java.util.Iterator" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-String mode = request.getParameter(ActionInputs.ACTION_ENGINE_MODE);
-String scenario = null;
-try
-{
- MultipartFormDataParser parser = new MultipartFormDataParser();
- parser.parseRequest(request, HTMLUtils.UTF8_ENCODING);
- scenario = parser.getParameter(ActionInputs.ACTION_ENGINE_SCENARIO);
-}
-catch (Throwable t)
-{
-}
-ActionEngine actionEngine = controller.getActionEngine();
-if (mode != null)
-{
- actionEngine.setMode(ActionEngine.MODE_DISABLED);
- try
- {
- actionEngine.setMode(Byte.parseByte(mode));
- }
- catch (NumberFormatException nfe)
- {
- }
-}
-if (scenario != null && scenario.length() > 0)
-{
- ScenarioDescriptor scenarioDescriptor = null;
- try
- {
- ActionDataParser parser = new ActionDataParser();
- scenarioDescriptor = parser.parseScenario(XMLUtils.stringToElement(scenario));
- actionEngine.executeScenario(scenarioDescriptor);
- }
- catch (Throwable t)
- {
- }
- if (scenarioDescriptor != null)
- {
- TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
- for (int i = 0; i < transactionDescriptors.length; i++)
- {
- ActionDescriptor[] actionDescriptors = transactionDescriptors[i].getActionDescriptors();
- for (int j = 0; j < actionDescriptors.length; j++)
- {
- %>
- <!--
- <%=actionDescriptors[j].getId()%>
- <%=actionDescriptors[j].getStatusId()%>
- <%
- List status = actionDescriptors[j].getStatus();
- if (status != null)
- {
- for (Iterator it = status.iterator(); it.hasNext();)
- {
- %>
- <%=it.next().toString()%>
- <%
- }
- }
- %>
- -->
- <%
- }
- }
- }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp
deleted file mode 100644
index aebca6da2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp
+++ /dev/null
@@ -1,138 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine,
- java.net.*" %>
-<%
-String sessionId = request.getParameter(ActionInputs.SESSIONID);
-HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-Controller controller = (Controller)currentSession.getAttribute("controller");
-ActionEngine actionEngine = controller.getActionEngine();
-String modeString = request.getParameter(ActionInputs.ACTION_ENGINE_MODE);
-if (modeString != null && modeString.length() > 0)
-{
- try
- {
- byte mode = Byte.parseByte(modeString);
- actionEngine.setMode(mode);
- }
- catch (Throwable t)
- {
- }
-}
-String playFileId = "playFileId";
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("TITLE_ACTION_RECORDER")%></title>
- <script language="javascript">
- function setMode(mode)
- {
- <%
- StringBuffer formAction = new StringBuffer(response.encodeURL(controller.getPathWithContext("actionengine_container.jsp?")));
- formAction.append(ActionInputs.SESSIONID);
- formAction.append("=");
- formAction.append(sessionId);
- formAction.append("&");
- formAction.append(ActionInputs.ACTION_ENGINE_MODE);
- formAction.append("=");
- %>
- var form = document.forms[0];
- form.action = '<%=formAction.toString()%>' + mode;
- form.target = "_self";
- form.submit();
- }
-
- function play()
- {
- var playFile = document.getElementById("<%=playFileId%>");
- if (playFile.value != null && playFile.value.length > 0)
- {
- var form = document.forms[0];
- form.action = '<%=response.encodeURL(controller.getPathWithContext("wsexplorer.jsp"))%>';
- form.target = "<%=FrameNames.WINDOW_NAME_WSEXPLORER_JSP%>";
- form.enctype = "multipart/form-data";
- // for backward compatibility
- form.encoding = "multipart/form-data";
- form.submit();
- setMode('<%=ActionEngine.MODE_PLAY%>');
- }
- else
- alert('<%=controller.getMessage("MSG_ERROR_INVALID_PLAY_FILE")%>');
- }
-
- function save()
- {
- var form = document.forms[0];
- form.action = '<%=response.encodeURL(controller.getPathWithContext("actions/SaveActionEngineScenario.jsp"))%>';
- form.target = "_self";
- form.submit();
- }
- </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <form method="post">
- <%
- String labelModePlay = controller.getMessage("FORM_LABEL_MODE_PLAY");
- String labelModeStop = controller.getMessage("FORM_LABEL_MODE_STOP");
- String labelModeRecord = controller.getMessage("FORM_LABEL_MODE_RECORD");
- String labelSave = controller.getMessage("FORM_LABEL_SAVE");
- byte mode = actionEngine.getMode();
- String imgPlay = (mode == ActionEngine.MODE_PLAY) ? "images/elcl16/actionengine_play.gif" : "images/dlcl16/actionengine_play.gif";
- String imgStop = (mode == ActionEngine.MODE_STOP) ? "images/elcl16/actionengine_stop.gif" : "images/dlcl16/actionengine_stop.gif";
- String imgRecord = (mode == ActionEngine.MODE_RECORD) ? "images/elcl16/actionengine_record.gif" : "images/dlcl16/actionengine_record.gif";
- String imgSave = "images/dlcl16/actionengine_save.gif";
- %>
- <table border=0 cellpadding=3 cellspacing=3>
- <tr>
- <td valign="middle" align="left" class="labels" nowrap>
- <a href="javascript:play()">
- <img class="normal" border=0 alt="<%=labelModePlay%>" title="<%=labelModePlay%>" src="<%=response.encodeURL(controller.getPathWithContext(imgPlay))%>">
- <%=controller.getMessage("FORM_LABEL_MODE_PLAY")%>
- </a>
- </td>
- <td valign="middle" align="left" class="labels" nowrap>
- <a href="javascript:setMode('<%=String.valueOf(ActionEngine.MODE_STOP)%>')">
- <img class="normal" border=0 alt="<%=labelModeStop%>" title="<%=labelModeStop%>" src="<%=response.encodeURL(controller.getPathWithContext(imgStop))%>">
- <%=controller.getMessage("FORM_LABEL_MODE_STOP")%>
- </a>
- </td>
- <td valign="middle" align="left" class="labels" nowrap>
- <a href="javascript:setMode('<%=String.valueOf(ActionEngine.MODE_RECORD)%>')">
- <img class="normal" border=0 alt="<%=labelModeRecord%>" title="<%=labelModeRecord%>" src="<%=response.encodeURL(controller.getPathWithContext(imgRecord))%>">
- <%=controller.getMessage("FORM_LABEL_MODE_RECORD")%>
- </a>
- </td>
- <td valign="middle" align="left" class="labels" nowrap>
- <a href="javascript:save()">
- <img class="normal" border=0 alt="<%=labelSave%>" title="<%=labelSave%>" src="<%=response.encodeURL(controller.getPathWithContext(imgSave))%>">
- <%=controller.getMessage("FORM_LABEL_SAVE")%>
- </a>
- </td>
- </tr>
- </table>
- <table border=0 cellpadding=3 cellspacing=3>
- <tr>
- <td valign="center" align="left" class="labels" nowrap><%=controller.getMessage("FORM_LABEL_PLAY_FILE")%></td>
- <td valign="center" align="left" class="labels">
- <input type="file" id="<%=playFileId%>" name="<%=ActionInputs.ACTION_ENGINE_SCENARIO%>">
- </td>
- </tr>
- </table>
- </form>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp
deleted file mode 100644
index 5384fc3cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp
+++ /dev/null
@@ -1,56 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
- ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
- if (action.isTargetFileResourceReadOnly())
- {
-%>
- var proceed = true;
-<%
- if (!action.isCheckoutFilesEnabled())
- {
-%>
- proceed = confirm("<%=HTMLUtils.JSMangle(action.getWebServicePluginFileMessage("MSG_ERROR_FILE_CHECKOUT_DISABLED"))%>");
-<%
- }
-%>
- if (proceed)
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ValidateEditAction.getActionLink()))%>";
-<%
- }
- else
- {
-%>
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
-<%
- }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc
deleted file mode 100644
index a66489d43..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
-<%
- String treeContentVar = action.getTreeContentVar();
- if (treeContentVar != null)
- {
-%>
- <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-<%
- }
- String propertiesContainerVar = action.getPropertiesContainerVar();
- if (propertiesContainerVar != null)
- {
-%>
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
- }
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
- }
-%>
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc
deleted file mode 100644
index 7e3cb5757..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
- String propertiesContainerVar = action.getPropertiesContainerVar();
- if (propertiesContainerVar != null)
- {
-%>
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
- }
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
- }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc
deleted file mode 100644
index 28fb7e3e0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // run the action
- boolean actionResult = action.run();
- boolean written = false;
-
- if (actionResult)
- {
- // write to file system
- response.setContentType("application/octet-stream");
- response.setHeader("Content-Disposition","attachment;filename="+action.getDefaultFileName());
- action.write(response.getOutputStream());
- written = true;
- }
-
- if (!written)
- {
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (action.getStatusContentVar() != null)
- {
-%>
-<script language="javascript">
- <%=action.getStatusContentVar()%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
- }
-%>
-</body>
-</html>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc
deleted file mode 100644
index 6535cdf0b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
- //Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
- if (!inputsValid)
- {
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
- }
- }
- else
- {
- session.setAttribute(ActionInputs.IMPORT_ACTION,action);
- if (action.fileExists())
- {
-%>
- var proceed = true;
-<%
- if (!action.isOverwriteFilesEnabled())
- {
-%>
- proceed = confirm("<%=HTMLUtils.JSMangle(action.getWebServicePluginFileMessage("MSG_ERROR_FILE_OVERWRITE_DISABLED"))%>");
-<%
- }
-%>
- if (proceed)
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(CheckWorkbenchFileReadOnlyAction.getActionLink()))%>";
-<%
- }
- else
- {
-%>
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
-<%
- }
- }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc
deleted file mode 100644
index 29fb0dcaa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%
- //Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.run();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (!actionResult)
- {
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
-<script language="javascript">
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
- }
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp
deleted file mode 100644
index 3dbd2bcbb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp
+++ /dev/null
@@ -1,59 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- RetrieveHistoryAction action = new RetrieveHistoryAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.run();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; UTF-8">
- <jsp:include page="/scripts/panes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
- BreadCrumb b = action.getBreadCrumb();
- if (b != null)
- {
- int breadCrumbPerspectiveId = b.getPerspectiveId();
- if (breadCrumbPerspectiveId != controller.getCurrentPerspective().getPerspectiveId())
- {
- // Switch the perspective.
-%>
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(breadCrumbPerspectiveId,true)))%>";
-<%
- }
- else
- {
- // Jump to the page retrieved from history.
-%>
- perspectiveWorkArea.location="<%=response.encodeURL(controller.getPathWithContext(b.getURL()))%>";
-<%
- }
- }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp
deleted file mode 100644
index 700b9d73b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor,
- org.eclipse.wst.ws.internal.explorer.platform.engine.ActionDataParser,
- org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils,
- java.io.PrintWriter,
- org.w3c.dom.Element"%>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-response.setContentType("application/octet-stream");
-response.setHeader("Content-Disposition","attachment;filename=scenario.xml");
-ScenarioDescriptor scenarioDescriptor = controller.getActionEngine().getScenario();
-ActionDataParser parser = new ActionDataParser();
-Element scenario = parser.toElement(scenarioDescriptor);
-if (scenario != null)
-{
- try
- {
- String scenarioString = XMLUtils.serialize(scenario, false);
- if (scenarioString != null)
- {
- PrintWriter pw = new PrintWriter(response.getOutputStream());
- pw.println(scenarioString);
- pw.close();
- }
- }
- catch (Throwable t)
- {
- }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc
deleted file mode 100644
index 5dd117e72..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc
+++ /dev/null
@@ -1,110 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (!actionResult)
- {
- if (action.isStaleBreadCrumb())
- {
-%>
-<script language="javascript">
- // Rerun the history action to get the next available item.
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
- }
- }
- else
- {
- String treeContentVar = action.getTreeContentVar();
- String propertiesContainerVar = action.getPropertiesContainerVar();
- if (action.requiresTreeViewRefresh())
- {
- if (treeContentVar != null)
- {
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- // Update the treeview.
- <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-</script>
-<%
- }
- if (propertiesContainerVar != null)
- {
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-</script>
-<%
- }
- }
- else
- {
- Node selectedNode = action.getSelectedNode();
- NodeManager nodeManager = selectedNode.getNodeManager();
- Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
- int selectedNodeId = selectedNode.getNodeId();
- if (treeContentVar != null)
- {
-%>
-<script language="javascript">
- // Update the perspective.
-<%
- if (previousSelectedNode != null && previousSelectedNode.isVisible())
- {
-%>
- <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
- }
- String selectedNodeAnchorName = selectedNode.getAnchorName();
-%>
- <%=treeContentVar%>.selectNode('<%=selectedNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(selectedNode.getOpenImagePath()))%>');
- <%=treeContentVar%>.location.hash = '#<%=selectedNodeAnchorName%>';
-<%
- }
- if (propertiesContainerVar != null)
- {
-%>
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
- }
-%>
-</script>
-<%
- }
- }
-%>
-</body>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc
deleted file mode 100644
index 5ef19e0cd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc
+++ /dev/null
@@ -1,184 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (!actionResult)
- {
- if (action.isStaleBreadCrumb())
- {
-%>
-<script language="javascript">
- // Rerun the history action to get the next available item.
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
- }
- }
- else
- {
- if (action.requiresStatusUpdate())
- {
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
-<script language="javascript">
- // Update the status content with any messages arising from this action.
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
- }
- }
-
- String treeContentVar = action.getTreeContentVar();
- String propertiesContainerVar = action.getPropertiesContainerVar();
- if (action.requiresTreeViewRefresh())
- {
-%>
-<script language="javascript">
-<%
- if (treeContentVar != null)
- {
-%>
- if (isMicrosoftInternetExplorer())
- {
- // Reload the navigator tree view to show the structural change.
- <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
- }
- else
- {
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
- }
-<%
- }
- if (propertiesContainerVar != null)
- {
-%>
- if (isMicrosoftInternetExplorer())
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
- }
-%>
-</script>
-<%
- }
- else if (action.requiresNodeSelection())
- {
- Node selectedNode = action.getSelectedNode();
- NodeManager nodeManager = selectedNode.getNodeManager();
- Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
- int selectedNodeId = selectedNode.getNodeId();
-%>
-<script language="javascript">
-<%
- if (treeContentVar != null)
- {
-%>
- // Update the navigator tree to show the selection.
-<%
- if (previousSelectedNode != null)
- {
-%>
- <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
- }
- String selectedNodeAnchorName = selectedNode.getAnchorName();
-%>
- <%=treeContentVar%>.selectNode('<%=selectedNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(selectedNode.getOpenImagePath()))%>');
- <%=treeContentVar%>.location.hash = '#<%=selectedNodeAnchorName%>';
-<%
- }
- if (propertiesContainerVar != null)
- {
-%>
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
- }
-%>
-</script>
-<%
- }
- else if (action.requiresViewSelection())
- {
- if (propertiesContainerVar != null)
- {
-%>
-<script language="javascript">
- // Update the properties container to show the view.
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-</script>
-<%
- }
- }
- else
- {
- String propertiesContentVar = action.getPropertiesContentVar();
- Tool tool = action.getSelectedViewTool();
- if (tool == null)
- tool = action.getSelectedTool();
- if (tool.getToolType() != ToolTypes.ACTION)
- {
- if (propertiesContentVar != null)
- {
-%>
-<script language="javascript">
- // Update the properties content with the tool's form.
- <%=propertiesContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(tool.getFormLink()))%>";
-</script>
-<%
- }
- }
- else
- {
- if (!action.isHistoryAction())
- {
-%>
-<script language="javascript">
- // Run the tool's action only if it is not from the history.
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(tool.getActionLink()))%>";
-</script>
-<%
- }
- else
- {
- if (propertiesContentVar != null)
- {
-%>
-<script language="javascript">
- <%=propertiesContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContentPage()))%>";
-</script>
-<%
- }
- }
- }
- }
- }
-%>
-</body>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SessionTimedOut.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SessionTimedOut.jsp
deleted file mode 100644
index e5f8ee16b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SessionTimedOut.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" %>
- <jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL("/wsexplorer/css/treeview.css")%>">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL("/wsexplorer/css/windows.css")%>">
-</head>
-<body>
-<center>
-<%=controller.getMessage("MSG_ERROR_SESSION_TIMED_OUT")%>
-<br>
-<%=controller.getMessage("MSG_ERROR_RESTART_SESSION")%>
-</center>
-<br>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp
deleted file mode 100644
index 7271d47ed..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,71 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
- StringBuffer framesetsFile = new StringBuffer("/");
- framesetsFile.append(currentPerspective.getFramesetsFile());
-
- StringBuffer framesetsForm = new StringBuffer("/");
- framesetsForm.append(currentPerspective.getProcessFramesetsForm());
-
- int targetPerspectiveId;
- boolean isHistory;
- try
- {
- targetPerspectiveId = Integer.parseInt(request.getParameter(ActionInputs.PERSPECTIVE));
- isHistory = ("1".equals(request.getParameter(ActionInputs.ISHISTORY)));
- }
- catch (NumberFormatException e)
- {
- targetPerspectiveId = ActionInputs.PERSPECTIVE_UDDI;
- isHistory = false;
- }
-
- if (controller.isPerspectiveContentBlank())
- {
- controller.enablePerspectiveContentBlank(false);
- controller.addToHistory(currentPerspective.getPerspectiveId(),ShowPerspectiveAction.getActionLink(targetPerspectiveId,true));
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
-<%
- }
- else
- {
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <jsp:include page="<%=framesetsFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append(currentPerspective.getSwitchPerspectiveFormActionLink(targetPerspectiveId,isHistory));
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<jsp:include page="<%=framesetsForm.toString()%>" flush="true"/>
-<script language="javascript">
- processFramesetSizes(document.forms[0]);
-</script>
-</body>
-</html>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc
deleted file mode 100644
index 07319ba5e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%
- Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (!actionResult)
- {
- if (action.isStaleBreadCrumb())
- {
-%>
-<script language="javascript">
- // Rerun the history action to get the next available item.
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
- }
- }
- else
- {
- String treeContentVar = action.getTreeContentVar();
- if (treeContentVar != null)
- {
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- // Update the perspective.
- <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-</script>
-<%
- }
- if (action.requiresNodeSelection())
- {
- String propertiesContainerVar = action.getPropertiesContainerVar();
- if (propertiesContainerVar != null)
- {
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- // Update the properties container.
- <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
- }
-</script>
-<%
- }
- }
- }
-%>
-</body>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp
deleted file mode 100644
index c0b04fe3c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
- boolean result = action.validateEdit();
-%>
-<script language="javascript">
- if (<%=result%>)
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
- else
- {
-<%
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
- }
-%>
- }
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp
deleted file mode 100644
index 9c29a2ab4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp
+++ /dev/null
@@ -1,42 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
- StringBuffer panesFile = new StringBuffer("/");
- panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
- action.run();
- String statusContentVar = action.getStatusContentVar();
- if (statusContentVar != null)
- {
-%>
-<script language="javascript">
- <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp
deleted file mode 100644
index c20c3a2da..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- java.net.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>
- <%=controller.getMessage("TITLE_CALENDAR_BROWSER")%>
- </title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-<%
- StringBuffer link = new StringBuffer("calendar_toolbar.jsp?");
- link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-%>
- <frame name="<%=FrameNames.CALENDAR_TOOLBAR%>" title="<%=controller.getMessage("FRAME_TITLE_CALENDAR_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-<%
- link.setLength(0);
- link.append("calendar_content.jsp?");
- link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- link.append('&').append(ActionInputs.CALENDAR_TYPE).append('=').append(request.getParameter(ActionInputs.CALENDAR_TYPE));
-%>
- <frame name="<%=FrameNames.CALENDAR_CONTENT%>" title="<%=controller.getMessage("FRAME_TITLE_CALENDAR_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp
deleted file mode 100644
index 68e46e8e5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp
+++ /dev/null
@@ -1,627 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
- int calendarType = Integer.parseInt(request.getParameter(ActionInputs.CALENDAR_TYPE));
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title><%=controller.getMessage("FRAME_TITLE_CALENDAR_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/calendar.css"))%>">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript">
- var days = new Array("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_SUNDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_MONDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_TUESDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_WEDNESDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_THURSDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_FRIDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_SATURDAY"))%>");
- var months = new Array("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JANUARY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_FEBRUARY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_MARCH"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_APRIL"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_MAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JUNE"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JULY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_AUGUST"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SEPTEMBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_OCTOBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_NOVEMBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_DECEMBER"))%>");
- var engMonths = new Array("January","February","March","April","May","June","July","August","September","October","November","December");
- var currentDate;
- var calendarBodySet = false;
- var calendarBody;
- var savedYearTextValue = "";
-
-<%
- // Regular expressions
- // time - HH:MM:SS[.SSS]
- // year - Y*
- // date - YYYY+-MM-DD
- // dateTime - YYYY+-MM-DDTHH:MM:SS[.SSS]Z
- // gYearMonth - YYYY+-MM
- // gDay - ---DD
- // gMonthDay - --MM-DD
-%>
- var timeRegExp = /^(\d{2}):(\d{2}):(\d{2})(\.\d{3})?$/;
- var yearRegExp = /^(\d*)$/;
- var dateRegExp = /^(\d{4,})-(\d{2})-(\d{2})$/;
- var dateTimeRegExp = /^(\d{4,})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d{3})?Z$/;
- var gYearMonthRegExp = /^(\d{4,})-(\d{2})$/;
- var gDayRegExp = /^-{3}(\d{2})$/;
- var gMonthDayRegExp = /^-{2}(\d{2})-(\d{2})$/;
-
- function validateYearString(yearString)
- {
- return yearRegExp.test(yearString);
- }
-
- function getTimeParameters(timeString)
- {
- return timeRegExp.exec(timeString);
- }
-
- function getDateParameters(dateString)
- {
- return dateRegExp.exec(dateString);
- }
-
- function getDateTimeParameters(dateTimeString)
- {
- return dateTimeRegExp.exec(dateTimeString);
- }
-
- function getGYearMonthParameters(gYearMonthString)
- {
- return gYearMonthRegExp.exec(gYearMonthString);
- }
-
- function getGDayParameters(gDayString)
- {
- return gDayRegExp.exec(gDayString);
- }
-
- function getGMonthDayParameters(gMonthDayString)
- {
- return gMonthDayRegExp.exec(gMonthDayString);
- }
-
-<%
- // HH:MM:SS[.SSS]
-%>
- function serializeTime(hours,minutes,seconds,milliseconds)
- {
- var timeString = "";
- if (hours < 10)
- timeString += "0";
- timeString += hours + ":";
- if (minutes < 10)
- timeString += "0";
- timeString += minutes + ":";
- if (seconds < 10)
- timeString += "0";
- timeString += seconds;
- if (milliseconds > 0)
- {
- timeString += ".";
- if (milliseconds < 100)
- {
- if (milliseconds < 10)
- timeString += "00";
- else
- timeString += "0";
- }
- timeString += milliseconds;
- }
- return timeString;
- }
-
-<%
- // YYYY+-MM
-%>
- function serializeGYearMonth(fullYear,month)
- {
- var gYearMonthString = "";
- if (fullYear < 1000)
- {
- if (fullYear < 100)
- {
- if (fullYear < 10)
- gYearMonthString += "000";
- else
- gYearMonthString += "00";
- }
- else
- gYearMonthString += "0";
- }
- gYearMonthString += fullYear+"-";
- if (month < 10)
- gYearMonthString += "0";
- gYearMonthString += month;
- return gYearMonthString;
- }
-
-<%
- // YYYY+-MM-DD
-%>
- function serializeDate(fullYear,month,date)
- {
- var dateString = serializeGYearMonth(fullYear,month) + "-";
- if (date < 10)
- dateString += "0";
- dateString += date;
- return dateString;
- }
-
- function serializeGDay(date)
- {
- var gDayString = "---";
- if (date < 10)
- gDayString += "0";
- gDayString += date;
- return gDayString;
- }
-
- function serializeGMonthDay(month,date)
- {
- var gMonthDayString = "--";
- if (month < 10)
- gMonthDayString += "0";
- gMonthDayString += month+"-";
- if (date < 10)
- gMonthDayString += "0";
- gMonthDayString += date;
- return gMonthDayString;
- }
-
- function setDateUsingGDayParameters(gDayParameters,dateObj)
- {
- if (gDayParameters != null)
- dateObj.setDate(gDayParameters[1]);
- }
-
- function setDateUsingGMonthDayParameters(gMonthDayParameters,dateObj)
- {
- if (gMonthDayParameters != null)
- {
- dateObj.setMonth(gMonthDayParameters[1]-1);
- dateObj.setDate(gMonthDayParameters[2]);
- }
- }
-
- function setDateUsingGYearMonthParameters(gYearMonthParameters,dateObj)
- {
- if (gYearMonthParameters != null)
- {
- dateObj.setFullYear(gYearMonthParameters[1]);
- dateObj.setMonth(gYearMonthParameters[2]-1);
- }
- }
-
- function setDateUsingDateParameters(dateParameters,dateObj)
- {
- if (dateParameters != null)
- {
- setDateUsingGYearMonthParameters(dateParameters,dateObj);
- dateObj.setDate(dateParameters[3]);
- }
- }
-
- function setDateUsingDateTimeParameters(dateTimeParameters,dateObj)
- {
- if (dateTimeParameters != null)
- {
- setDateUsingDateParameters(dateTimeParameters,dateObj);
- dateObj.setUTCHours(dateTimeParameters[4]);
- dateObj.setUTCMinutes(dateTimeParameters[5]);
- dateObj.setUTCSeconds(dateTimeParameters[6]);
- var milliseconds = dateTimeParameters[7];
- if (milliseconds.length > 0)
-<%
- // Eliminate the decimal point
-%>
- dateObj.setUTCMilliseconds(milliseconds.substr(1));
- else
- dateObj.setUTCMilliseconds(0);
- }
- }
-
- function setDateUsingTimeParameters(timeParameters,dateObj)
- {
- if (timeParameters != null)
- {
- dateObj.setHours(timeParameters[1]);
- dateObj.setMinutes(timeParameters[2]);
- dateObj.setSeconds(timeParameters[3]);
- var milliseconds = timeParameters[4];
- if (milliseconds.length > 0)
-<%
- // Eliminate the decimal point
-%>
- dateObj.setMilliseconds(milliseconds.substr(1));
- else
- dateObj.setMilliseconds(0);
- }
- }
-
- function init()
- {
- var d = new Date();
-<%
- switch (calendarType)
- {
- case ActionInputs.CALENDAR_TYPE_DATE:
-%>
- setDateUsingDateParameters(getDateParameters(top.opener.calendarTarget.value),d);
-<%
- break;
- case ActionInputs.CALENDAR_TYPE_DATETIME:
-%>
- setDateUsingDateTimeParameters(getDateTimeParameters(top.opener.calendarTarget.value),d);
-<%
- break;
- case ActionInputs.CALENDAR_TYPE_GYEARMONTH:
-%>
- setDateUsingGYearMonthParameters(getGYearMonthParameters(top.opener.calendarTarget.value),d);
-<%
- case ActionInputs.CALENDAR_TYPE_GDAY:
-%>
- setDateUsingGDayParameters(getGDayParameters(top.opener.calendarTarget.value),d);
-<%
- case ActionInputs.CALENDAR_TYPE_GMONTHDAY:
-%>
- setDateUsingGMonthDayParameters(getGMonthDayParameters(top.opener.calendarTarget.value),d);
-<%
- default:
- break;
- }
-%>
- generateCalendar(d);
- var monthSelector = document.getElementById("monthSelector");
- for (var i=0;i<months.length;i++)
- monthSelector.options[i] = new Option(months[i],i);
- generateCalendar(d);
- }
-
- function initCalendarHeader(table)
- {
- calendarBody = document.createElement("TBODY");
- var headerRow = document.createElement("tr");
- for (var i=0;i<days.length;i++)
- {
- var header = document.createElement("th");
- header.appendChild(document.createTextNode(days[i]));
- header.className="headercolor";
- headerRow.appendChild(header);
- }
- calendarBody.appendChild(headerRow);
- table.appendChild(calendarBody);
- calendarBodySet = true;
- }
-
- function generateCalendar(date)
- {
- var table = document.getElementById("calendar");
- var dateDate = date.getDate();
- var dateMonth = date.getMonth();
- var dateFullYear = date.getFullYear();
- var dateIterator = new Date();
- dateIterator.setTime(Date.parse(engMonths[dateMonth]+" 1, "+dateFullYear));
- var startingDate = dateIterator.getDate(); // 1,2,3...
- var startingDay = dateIterator.getDay(); // Sun,Mon,Tues...
- clearCalendar();
- for (var rows=0;rows<6;rows++)
- {
- var row = document.createElement("tr");
- for (var columns=0;columns<days.length;columns++)
- {
- var column = document.createElement("td");
- var dateIteratorDate = dateIterator.getDate();
- var dateIteratorMonth = dateIterator.getMonth();
- var dateIteratorFullYear = dateIterator.getFullYear();
- column.width = 24;
- column.height = 24;
- column.align = "center";
- column.valign = "center";
- column.className = "calendartablecells";
- if ((dateIteratorDate == startingDate && columns < startingDay) || (dateIteratorMonth != dateMonth))
- column.innerHTML = "&nbsp;";
- else if (dateIteratorMonth == dateMonth)
- {
- var link = document.createElement("a");
- switch (<%=calendarType%>)
- {
- case <%=ActionInputs.CALENDAR_TYPE_DATE%>:
- link.href = "javascript:transferDate("+dateIteratorDate+")";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_DATETIME%>:
- link.href = "javascript:transferDateTime("+dateIteratorDate+")";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GYEARMONTH%>:
- link.href = "javascript:transferGYearMonth()";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GDAY%>:
- link.href = "javascript:transferGDay("+dateIteratorDate+")";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GMONTHDAY%>:
- link.href = "javascript:transferGMonthDay("+dateIteratorDate+")";
- break;
- }
- link.appendChild(document.createTextNode(dateIteratorDate));
- column.appendChild(link);
- if (dateIteratorDate == dateDate && dateIteratorFullYear == dateFullYear)
- column.className = "todaytablecell";
- dateIteratorDate++;
- dateIterator.setTime(Date.parse(engMonths[dateIteratorMonth]+" "+dateIteratorDate+", "+dateIterator.getFullYear()));
- }
- row.appendChild(column);
- }
- calendarBody.appendChild(row);
- }
- var monthSelector = document.getElementById("monthSelector");
- for (var i=0;i<monthSelector.options.length;i++)
- {
- if (monthSelector.options[i].value == dateMonth)
- {
- monthSelector.selectedIndex = i;
- break;
- }
- }
- var yearText = document.getElementById("yearText");
- yearText.value = dateFullYear;
- savedYearTextValue = yearText.value;
-<%
- if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
- {
-%>
- var timeText = document.getElementById("timeText");
- timeText.value = serializeTime(date.getHours(),date.getMinutes(),date.getSeconds(),date.getMilliseconds());
-<%
- }
-%>
- currentDate = date;
- }
-
- function clearCalendar()
- {
- var table = document.getElementById("calendar");
- if (!calendarBodySet)
- initCalendarHeader(table);
- for (var i=1;i<table.rows.length;i++)
- {
- table.deleteRow(i);
- i--;
- }
- }
-
- function updateCalendar(newMonth,newFullYear)
- {
- var d = new Date();
- if (newMonth > months.length)
- {
- newFullYear++;
- newMonth = 0;
- }
- else if (newMonth < 0)
- {
- newFullYear--;
- newMonth = months.length-1;
- }
- d.setMonth(newMonth);
- d.setFullYear(newFullYear);
-<%
- if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
- {
-%>
- setDateUsingTimeParameters(getTimeParameters(document.getElementById("timeText").value),d);
-<%
- }
-%>
- generateCalendar(d);
- }
-
- function jumpToPreviousYear()
- {
- updateCalendar(currentDate.getMonth(),currentDate.getFullYear()-1)
- }
-
- function jumpToPreviousMonth()
- {
- updateCalendar(currentDate.getMonth()-1,currentDate.getFullYear());
- }
-
- function jumpToNextMonth()
- {
- updateCalendar(currentDate.getMonth()+1,currentDate.getFullYear());
- }
-
- function jumpToNextYear()
- {
- updateCalendar(currentDate.getMonth(),currentDate.getFullYear()+1);
- }
-
- function jumpToToday()
- {
- generateCalendar(new Date());
- }
-
- function setNewDate()
- {
- var monthSelector = document.getElementById("monthSelector");
- var newMonth = monthSelector.options[monthSelector.selectedIndex].value;
- var newFullYear = document.getElementById("yearText").value;
-<%
- // YYYY+
-%>
- var d = new Date();
- if (validateYearString(newFullYear))
- {
- // The year string contains only digits and is hence a valid year.
- d.setFullYear(newFullYear);
- d.setMonth(newMonth);
- }
- generateCalendar(d);
- }
-
- function handleYearTextKeyUpEvent()
- {
- var currentYearTextValue = document.getElementById("yearText").value;
- if (currentYearTextValue == savedYearTextValue)
- return false;
- setNewDate();
- }
-
-<%
- // YYYY+-MM-DD
-%>
- function transferDate(date)
- {
- var fullYear = document.getElementById("yearText").value;
- var month = document.getElementById("monthSelector").selectedIndex+1;
- top.opener.calendarTarget.value = serializeDate(fullYear,month,date);
- top.opener.closeCalendarBrowser();
- }
-
-<%
- // YYYY+-MM-DDTHH:MM:SS[.SSS]Z
-%>
- function transferDateTime(date)
- {
- var fullYear = document.getElementById("yearText").value;
- var month = document.getElementById("monthSelector").selectedIndex+1;
- var serializedDate = serializeDate(fullYear,month,date);
- var d = new Date();
- setDateUsingDateParameters(getDateParameters(serializedDate),d);
- var timeValue = document.getElementById("timeText").value;
- var timeParameters = getTimeParameters(timeValue);
- if (timeParameters == null)
- {
- if (!confirm("<%=HTMLUtils.JSMangle(controller.getMessage("MSG_ERROR_INVALID_TIME_FORMAT"))%>"))
- return;
- }
- else
- setDateUsingTimeParameters(timeParameters,d);
- top.opener.calendarTarget.value = serializedDate + "T" + serializeTime(d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds(),d.getUTCMilliseconds()) + "Z";
- top.opener.closeCalendarBrowser();
- }
-
-<%
- // YYYY+-MM
-%>
- function transferGYearMonth()
- {
- var fullYear = document.getElementById("yearText").value;
- var month = document.getElementById("monthSelector").selectedIndex+1;
- var serializedGYearMonth = serializeGYearMonth(fullYear,month);
- var d = new Date();
- setDateUsingGYearMonthParameters(getGYearMonthParameters(serializedGYearMonth),d);
- top.opener.calendarTarget.value = serializedGYearMonth;
- top.opener.closeCalendarBrowser();
- }
-
-<%
- // ---DD
-%>
- function transferGDay(date)
- {
- top.opener.calendarTarget.value = serializeGDay(date);
- top.opener.closeCalendarBrowser();
- }
-<%
- // --MM-DD
-%>
- function transferGMonthDay(date)
- {
- var month = document.getElementById("monthSelector").selectedIndex+1;
- top.opener.calendarTarget.value = serializeGMonthDay(month,date);
- top.opener.closeCalendarBrowser();
- }
-</script>
-</head>
-<body class="contentbodymargin">
- <div id="contentborder">
- <table border=0>
- <tr>
- <td align="center" valign="top">
- <table>
- <tr>
- <td align="left" valign="top" class="labels">
- <label for="monthSelector"><%=controller.getMessage("FORM_LABEL_MONTH")%></label>
- </td>
- <td width="20%">&nbsp;</td>
- <td align="left" valign="top" class="labels">
- <label for="yearText"><%=controller.getMessage("FORM_LABEL_YEAR")%></label>
- </td>
- </tr>
- <tr>
- <td align="left" valign="center">
- <select id="monthSelector" onChange="setNewDate()" class="selectlist">
- </select>
- </td>
- <td width="20%">&nbsp;</td>
- <td width="30%" align="left" valign="center">
- <input id="yearText" size=6 onkeyup="handleYearTextKeyUpEvent()" class="tabletextenter">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td align="center" valign="top">
- <table id="calendar" border=0 cellspacing=0 cellpadding=3 class="tableborder">
- </table>
- </td>
- </tr>
-<%
- if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
- {
-%>
- <tr>
- <td align="center" valign="top">
- <table border=0>
- <td align="center" valign="center" class="labels">
- <label for="timeText"><%=controller.getMessage("FORM_LABEL_TIME")%></label>
- </td>
- <td align="center" valign="center" width="80%">
- <input id="timeText" type="text" class="tabletextenter" size=12 maxlength=12>
- </td>
- <td width="10%">&nbsp;</td>
- </table>
- </td>
- </tr>
-<%
- }
-%>
- <tr>
- <td align="center" valign="top">
- <table border=0>
- <tr>
- <td>
- <a href="javascript:jumpToPreviousYear()" title="<%=controller.getMessage("ALT_PREVIOUS_YEAR")%>"><%=controller.getMessage("FORM_LINK_PREVIOUS_YEAR")%></a>
- </td>
- <td>
- <a href="javascript:jumpToPreviousMonth()" title="<%=controller.getMessage("ALT_PREVIOUS_MONTH")%>"><%=controller.getMessage("FORM_LINK_PREVIOUS_MONTH")%></a>
- </td>
- <td>
- <a href="javascript:jumpToToday()" title="<%=controller.getMessage("ALT_TODAY")%>"><%=controller.getMessage("FORM_LINK_TODAY")%></a>
- </td>
- <td>
- <a href="javascript:jumpToNextMonth()" title="<%=controller.getMessage("ALT_NEXT_MONTH")%>"><%=controller.getMessage("FORM_LINK_NEXT_MONTH")%></a>
- </td>
- <td>
- <a href="javascript:jumpToNextYear()" title="<%=controller.getMessage("ALT_NEXT_YEAR")%>"><%=controller.getMessage("FORM_LINK_NEXT_YEAR")%></a>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
-<script language="javascript">
- init();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp
deleted file mode 100644
index 7cf911946..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FRAME_TITLE_CALENDAR_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onUnload="top.opener.calendarBrowserClosed=true" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar">
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/calendar.gif"))%>" alt="" width=16 height=16></td>
- <td valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_CALENDAR_BROWSER")%></td>
- </tr>
- </table>
- </div>
-</div>
-<script language="javascript">
- top.opener.calendarBrowserClosed = false;
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css
deleted file mode 100644
index 383880605..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.calendartablecells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:center}
-.todaytablecell { background-color:yellow; border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:center}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css
deleted file mode 100644
index 485ea123c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css
+++ /dev/null
@@ -1,20 +0,0 @@
-#toolbar { width:100%; height:25px; background:#ECE9D8; border-color:white; border-style:solid; border-width:1 1 1 1px; border-bottom-color:#848284; border-right-color:#848284; margin:0 0 0 0px;}
-#toolbarborder { height:26px; width:100%; border-style:solid; border-width:1 0 0 1px; border-color:#848284; }
-
-/* iframe Spacing Contol */
-.toolbarbodymargin { margin: 5 5 0 5; background: #ECE9D8; }
-
-/* Toolbar Styles */
-.text {font-size:12px; font: icon;}
-a:link {color: black;}
-
-/* JS Rollover Style */
-IMG { border-width:2px; border-style:solid;}
-.normal { border-color : #ECE9D8; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color :#ECE9D8; border-right-color :#ECE9D8;}
-.hover { border-color : white; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color :#8C8E8C; border-right-color :#8C8E8C; }
-.down { border-color : #8C8E8C; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color:white; border-right-color:white;}
-
-/* GlobalToolbar */
-.gtoolbarbodymargin {margin : 0 1 3 0; background: #ECE9D8}
-#globaltoolbar{height:100%; background: #ECE9D8; border-color : white; border-style: solid; border-width:1px; border-left-width: 1px; border-bottom-color :black; border-right-width: 1px; border-right-color :#848284;}
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css
deleted file mode 100644
index da1e6a5b1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css
+++ /dev/null
@@ -1,5 +0,0 @@
-a {text-decoration: none;}
-a:hover {text-decoration: underline;}
-td {font: icon; font-size: 12px; color: Black;}
-.unselectedTextAnchor {color:blue; background-color:document.backgroundColor}
-.selectedTextAnchor {color:white; background-color:navy}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css
deleted file mode 100644
index ecdb40091..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css
+++ /dev/null
@@ -1,49 +0,0 @@
-#contentborder { border-left:1px solid #848284; border-right:1px solid #848284; border-top:0px solid #848284; border-bottom:1px solid #848284; height:100%; width:100%; background:white; overflow:auto; padding-left:10px; padding-right:0; padding-top:10; padding-bottom:10}
-#treecontentborder { border-left:1px solid #848284; border-right:1px solid #848284; border-top:0px solid #848284; border-bottom:1px solid #848284; height:100%; width:100%; background:white; overflow:auto; padding-top:5px}
-
-/* iframe Spacing Contol */
-.contentbodymargin { margin: 0 5 12 5; background:#ECE9D8; }
-
-/* Document Styles */
-.labels { font: icon; font-size: 12px; color:black; font-weight: normal;}
-
-/* fieldset+legend Styles */
-.keylinefieldset { border-color:#8080FF; border-width:1px; border-style:solid; }
-.headerfieldset { -moz-border-radius: 7pt; padding: 3px; border:1px solid #C0C0C0; }
-
-/* table Styles */
-.tableborder {border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3; }
-.tablecells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:left}
-.checkboxcells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; background-color: #ECE9D8}
-th.headercolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-style: normal; font: icon; font-size: 11px; background-color:#4977B4; color:#FFFFFF; text-align:center}
-th.singleheadercolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-style: normal; font: icon; font-size: 11px; background-color:#4977B4; color:#FFFFFF; text-align:left}
-.firstcolumnerrantrowcolor { border-left:1px solid red; border-right:0px solid #B7B4A3; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.middleerrantrowcolor { border-left:1px solid #B7B4A3; border-right:0px solid #B7B4A3; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.lastcolumnerrantrowcolor { border-left:1px solid #B7B4A3; border-right:1px solid red; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.rowcolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
-
-/* Form elements and status contents */
-td { font: icon; font-size: 12px; }
-th { font: icon; font-size: 12px; }
-input { font: icon; font-size: 12px; }
-.selectlist {font: icon; font-size: 12px; color: Black; border-style:solid; border-width : 1px; border-color:#C7C5B2;}
-select { font: icon; font-size: 12px; }
-pre { font: icon; font-size: 12px; }
-.smtextenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:10%; }
-.textenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:90%; }
-.tabletextenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; }
-.tablefilebrowse {width:100%; border-style:solid; border-width:1px; font-size: 14px; border-color: #C7C5B2; font: icon; }
-input.button {font: icon; font-size: 11px; border-width : 1px; border-style:outset; height:22px;}
-input.radio {font: icon; font-size: 11px;}
-img.twist {border-width:0 0 0 0px; height:10px; width:11px;}
-
-/* Fragment Styles */
-.fixfragtable {width:95%; border:0px none; }
-.innerfixfragtable {width:100%; border:0px none; }
-.rangefragtable {width:95%; border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3;}
-.innerrangefragtable {width:100%; border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3;}
-.textareaenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; height:150px; }
-.bigtextareaenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; height:300px; }
-.fragarea { padding-left: 3px; padding-bottom: 5px; }
-
-iframe {border-width: 2px; border-style: inset; }
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp
deleted file mode 100644
index 2a10e3f6d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,61 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddWSILToWSILPerspectiveAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- AddWSILToWSILPerspectiveAction action = new AddWSILToWSILPerspectiveAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- if (actionResult) {
-%>
- <script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSIL,false)))%>";
- </script>
-<%
- }
- else {
- if (request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION) == null) {
-%>
- <jsp:include page="/favorites/actions/RemoveFavoritesConfirmJSP.jsp" flush="true"/>
-<%
- }
- else {
-%>
- <script language="javascript">
- favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
- favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
- </script>
-<%
- }
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp
deleted file mode 100644
index 6eceed114..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddToUDDIPerspectiveAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- AddToUDDIPerspectiveAction action = AddToUDDIPerspectiveAction.newAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- if (actionResult) {
- controller.getUDDIPerspective().getNavigatorManager().makeSelectedNodeVisible();
-%>
- <script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_UDDI,false)))%>";
- </script>
-<%
- }
- else {
- if (request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION) == null) {
-%>
- <jsp:include page="/favorites/actions/RemoveFavoritesConfirmJSP.jsp" flush="true"/>
-<%
- }
- else {
-%>
- <script language="javascript">
- favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
- favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
- </script>
-<%
- }
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp
deleted file mode 100644
index 1f298ec5b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,63 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesActionInputs,
- org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs,
- org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesAddToWSDLPerspectiveAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-// Prepare the action.
-FavoritesAddToWSDLPerspectiveAction action = new FavoritesAddToWSDLPerspectiveAction(controller);
-
-// Load the parameters for the action from the servlet request.
-boolean inputsValid = action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-if (actionResult) {
-%>
-<script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSDL,false)))%>";
-</script>
-<%
-}
-else {
- if (request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION) == null) {
-%>
- <jsp:include page="/favorites/actions/RemoveFavoritesConfirmJSP.jsp" flush="true"/>
-<%
- }
- else {
-%>
- <script language="javascript">
- favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
- favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
- </script>
-<%
- }
-}
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp
deleted file mode 100644
index 9e99421fd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- java.io.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- FavoritesImportToFileSystemAction action = new FavoritesImportToFileSystemAction(controller);
-%>
-<%@ include file="/actions/ImportToFileSystemAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp
deleted file mode 100644
index 51935b4b5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesImportToWorkbenchAction action = new FavoritesImportToWorkbenchAction(controller);
-%>
-<%@ include file="/actions/ImportToWorkbenchAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp
deleted file mode 100644
index ea033b110..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesLaunchWebServiceWizardAction action = new FavoritesLaunchWebServiceWizardAction(controller);
-%>
-<%@ include file="/actions/LaunchWebServiceWizardAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesToggleNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesToggleNodeActionJSP.jsp
deleted file mode 100644
index 3e8d15645..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesToggleNodeActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- FavoritesToggleNodeAction action = new FavoritesToggleNodeAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- // Determine if the action was added to the history list.
- boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/ToggleNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesActionJSP.jsp
deleted file mode 100644
index 0fa1b2bdd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.RemoveFavoritesAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<%
- // Prepare the action.
- RemoveFavoritesAction action = new RemoveFavoritesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<%@ include file="/actions/ClearNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesConfirmJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesConfirmJSP.jsp
deleted file mode 100644
index a5970f2b7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RemoveFavoritesConfirmJSP.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.RemoveFavoritesAction"%>
-
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- if (confirm("<%=controller.getFavoritesPerspective().getMessage("MSG_CONFIRM_REMOVE_NODE", controller.getFavoritesPerspective().getNodeManager().getSelectedNode().getNodeName())%>")) {
- <%
- Node selectedNode = controller.getFavoritesPerspective().getNodeManager().getSelectedNode();
- %>
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT)))%>";
- }
- else {
- favPropertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>";
- favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
- }
- </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp
deleted file mode 100644
index 303d346fc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Create the action.
- ResizeFavoritesFramesAction action = new ResizeFavoritesFramesAction(controller);
-
- // Populate the action with the request properties.
- boolean result = action.populatePropertyTable(request);
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (result)
- {
- action.execute(false);
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- perspectiveContentFrameset.setAttribute("cols","<%=favPerspective.getPerspectiveContentFramesetCols()%>");
- actionsContainerFrameset.setAttribute("rows","<%=favPerspective.getActionsContainerFramesetRows()%>");
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_perspective_content.jsp"))%>";
-</script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp
deleted file mode 100644
index b4b9e7204..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesRestoreDefaultFavoritesAction"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesPanes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- FavoritesRestoreDefaultFavoritesAction action = new FavoritesRestoreDefaultFavoritesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- if (actionResult) {
-%>
- <script language="javascript">
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_perspective_content.jsp"))%>";
- </script>
-<%
- }
- else {
-%>
- <script language="javascript">
- favStatusContent.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>";
- </script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp
deleted file mode 100644
index 4aeb1250a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
- <script language="javascript">
- if (confirm("<%=controller.getFavoritesPerspective().getMessage("MSG_CONFIRM_RESTORE_DEFAULT_FAVORITES")%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext("favorites/actions/RestoreDefaultFavoritesActionJSP.jsp"))%>";
- </script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesNodeActionJSP.jsp
deleted file mode 100644
index 9556e0612..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesNodeActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectFavoritesNodeAction action = new SelectFavoritesNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesToolActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesToolActionJSP.jsp
deleted file mode 100644
index f1b7d200d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesToolActionJSP.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectFavoritesToolAction action = new SelectFavoritesToolAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeToolAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeActionJSP.jsp
deleted file mode 100644
index aef11983d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SelectFavoritesUserDefUDDIRegistryNodeActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesUserDefUDDIRegistryNodeAction" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action.
-SelectFavoritesUserDefUDDIRegistryNodeAction action = new SelectFavoritesUserDefUDDIRegistryNodeAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-//make sure to refresh node view
-action.setTreeRefreshNeeded();
-
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<%@ include file="/actions/SelectNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp
deleted file mode 100644
index 0ba0cde9c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-// Prepare the action
-SwitchPerspectiveFromFavoritesAction action = new SwitchPerspectiveFromFavoritesAction(controller);
-
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-
-// Run the action and obtain the return code (fail/success).
-boolean actionResult = action.execute();
-
-// Determine if the action was added to the history list.
-boolean isAddedToHistory = action.isAddedToHistory();
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp
deleted file mode 100644
index c779abc99..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%></title>
-</head>
-<frameset rows="<%=favPerspective.getActionsContainerFramesetRows()%>" bgcolor="#ECE9D8">
- <frame name="<%=FavoritesFrameNames.PROPERTIES_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_container.jsp"))%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
- <frame name="<%=FavoritesFrameNames.STATUS_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_container.jsp"))%>" scrolling="no" frameborder=1 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp
deleted file mode 100644
index 570e2ac4d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=FavoritesFrameNames.NAVIGATOR_TOOLBAR%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=FavoritesFrameNames.NAVIGATOR_CONTENT%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp
deleted file mode 100644
index cb8fc02f9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/treeview.css"))%>">
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
- </script>
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/treeview.js"))%>">
- </script>
-</head>
-<%
- String selectedAnchorName = "";
- NodeManager nodeManager = favPerspective.getNodeManager();
- int focusedNodeId = nodeManager.getFocusedNodeId();
- String focusedAnchorName = String.valueOf(focusedNodeId);
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null) {
- selectedAnchorName = selectedNode.getAnchorName();
- if (focusedNodeId == selectedNode.getNodeId())
- focusedAnchorName = selectedAnchorName;
- }
-%>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" onLoad="self.location.hash='#<%=focusedAnchorName%>';setSelectedAnchorName('<%=selectedAnchorName%>')" class="contentbodymargin">
-<div id="treecontentborder">
- <%=nodeManager.renderTreeView(response)%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp
deleted file mode 100644
index f36bae808..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("favorites/actions/ResizeFavoritesFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(FavoritesFrameNames.NAVIGATOR_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/favorites/forms/ProcessFavoritesFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/navigator.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (favPerspective.getPerspectiveContentFramesetCols().startsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- else
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_NAVIGATOR")%></td>
-<%
- String altRestore = favPerspective.getMessage("ALT_RESTORE_DEFAULT_FAVORITES");
- String altRemove = favPerspective.getMessage("ALT_REMOVE_FAVORITE");
-%>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/refresh_enabled.gif"))%>';mouseup(this)" alt="<%=altRestore%>" title="<%=altRestore%>"></a></td>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("favorites/actions/RemoveFavoritesActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altRemove%>" title="<%=altRemove%>"></a></td>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp
deleted file mode 100644
index 2491c8a7d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_PERSPECTIVE_CONTENT")%></title>
-</head>
-<frameset cols="<%=favPerspective.getPerspectiveContentFramesetCols()%>" bgcolor=#ECE9D8>
- <%
- if (org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.isRTL())
- {
- %>
- <frame name="<%=FavoritesFrameNames.ACTIONS_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_actions_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <frame name="<%=FavoritesFrameNames.NAVIGATOR_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <%
- }
- else
- {
- %>
- <frame name="<%=FavoritesFrameNames.NAVIGATOR_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_NAVIGATOR_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_navigator_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <frame name="<%=FavoritesFrameNames.ACTIONS_CONTAINER%>" title="<%=favPerspective.getMessage("FRAME_TITLE_ACTIONS_CONTAINER")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_actions_container.jsp"))%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=1>
- <%
- }
- %>
-</frameset>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp
deleted file mode 100644
index 89a612537..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=FavoritesFrameNames.PROPERTIES_TOOLBAR%>" title="<%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=FavoritesFrameNames.PROPERTIES_CONTENT%>" title="<%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_properties_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp
deleted file mode 100644
index 4f956a431..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp
+++ /dev/null
@@ -1,74 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null)
- {
- ToolManager toolManager;
- if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
- toolManager = selectedNode.getToolManager();
- else
- toolManager = selectedNode.getViewToolManager();
- Tool selectedTool = toolManager.getSelectedTool();
- if (selectedTool != null && selectedTool.getToolType() != ToolTypes.ACTION) {
- %>
- <script language="javascript">
- location="<%=response.encodeURL(controller.getPathWithContext(selectedTool.getFormLink()))%>";
- </script>
- <%
- }
- else {
- %>
-<table>
- <tr>
- <td>
- <%=controller.getMessage("MSG_ERROR_NO_ACTION_SELECTED")%>
- </td>
- </tr>
-</table>
- <%
- }
- }
- else {
- %>
-<table>
- <tr>
- <td>
- <%=controller.getMessage("MSG_ERROR_NO_NODE_SELECTED")%>
- </td>
- </tr>
-</table>
- <%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp
deleted file mode 100644
index b21409a6a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp
+++ /dev/null
@@ -1,83 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_PROPERTIES_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("favorites/actions/ResizeFavoritesFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(FavoritesFrameNames.PROPERTIES_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/favorites/forms/ProcessFavoritesFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/actions.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (favPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
- {
- if (favPerspective.getActionsContainerFramesetRows().startsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- }
- if (doubleClickColumnTitle == null)
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_ACTIONS")%></td>
-<%
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- if (selectedNode != null) {
- ToolManager toolManager;
- if (selectedNode.getViewId() == ActionInputs.VIEWID_DEFAULT)
- toolManager = selectedNode.getToolManager();
- else
- toolManager = selectedNode.getViewToolManager();
- for(int i=0; i<toolManager.getNumberOfTools(); i++) {
- Tool tool = (Tool)toolManager.getTool(i);
- %>
- <td valign="middle" align="center" width=25 height=25><%=tool.renderTool(response,controller)%></td>
- <%
- }
- }
-%>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp
deleted file mode 100644
index 215fc526e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTAINER")%></title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
- <frame name="<%=FavoritesFrameNames.STATUS_TOOLBAR%>" title="<%=favPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_toolbar.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
- <frame name="<%=FavoritesFrameNames.STATUS_CONTENT%>" title="<%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp
deleted file mode 100644
index 67b55c179..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_STATUS_CONTENT")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <table>
- <tr>
- <td>
- <pre>
-<%=HTMLUtils.charactersToHTMLEntitiesStrict(favPerspective.getMessageQueue().getMessagesFromList())%>
- </pre>
- </td>
- </tr>
- </table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp
deleted file mode 100644
index 3e3bb45f9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FRAME_TITLE_STATUS_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
-<jsp:include page="/favorites/scripts/favoritesframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="toolbarbodymargin">
-<div id="toolbarborder">
- <div id="toolbar" ondblclick="processFramesetSizes(document.forms[0])">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
- formAction.append("favorites/actions/ResizeFavoritesFramesActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request">
-<%
- formFrameName.append(FavoritesFrameNames.STATUS_CONTAINER);
-%>
-</jsp:useBean>
-<jsp:include page="/favorites/forms/ProcessFavoritesFramesetsForm.jsp" flush="true"/>
- <table width="100%" height=25 cellpadding=0 cellspacing=0 border=0>
- <tr>
- <td valign="middle" align="center" width=25 height=25><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/status.gif"))%>" alt="" width=16 height=16></td>
-<%
- String doubleClickColumnTitle = null;
- if (favPerspective.getPerspectiveContentFramesetCols().endsWith("100%"))
- {
- if (favPerspective.getActionsContainerFramesetRows().endsWith("100%"))
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_RESTORE");
- }
- if (doubleClickColumnTitle == null)
- doubleClickColumnTitle = controller.getMessage("ALT_DOUBLE_CLICK_TO_MAXIMIZE");
-%>
- <td id="doubleclickcolumn" title="<%=doubleClickColumnTitle%>" valign="middle" align="left" width="*" height=25 nowrap class="text"><%=controller.getMessage("ALT_STATUS")%></td>
-<%
- String altClear = controller.getMessage("ALT_CLEAR");
-%>
- <td valign="middle" align="center" width=25 height=25><a href="<%=response.encodeURL(controller.getPathWithContext("favorites/fav_status_content.jsp"))%>" target="<%=FavoritesFrameNames.STATUS_CONTENT%>"><img class="normal" src="<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>" width=16 height=16 onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mouseover(this)" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/clear_enabled.gif"))%>';mouseup(this)" alt="<%=altClear%>" title="<%=altClear%>"></a></td>
- </tr>
- </table>
- </div>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesImportToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesImportToWorkbenchForm.jsp
deleted file mode 100644
index 48b418436..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesImportToWorkbenchForm.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request">
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- // The selected node must be a FavoritesWSDLServiceNode.
- Node selectedNode = nodeManager.getSelectedNode();
- FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement)selectedNode.getTreeElement();
- formProperties.put("formActionLink","favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp");
- formProperties.put("wsdlURL",wsdlElement.getWsdlUrl());
-%>
-</jsp:useBean>
-<jsp:include page="/forms/ImportWSDLAndWSILToWorkbenchForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp
deleted file mode 100644
index e9323df91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request">
-<%
- formActionLink.append("favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp");
-%>
-</jsp:useBean>
-<jsp:include page="/forms/LaunchWebServiceWizardForm.jsp" flush="true"/>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp
deleted file mode 100644
index b50b6d678..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp
+++ /dev/null
@@ -1,101 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.apache.wsil.extension.uddi.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_BUSINESS_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_BUSINESS_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesUDDIBusinessElement) {
- FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement)selectedElement;
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_BUSINESS_NAME")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=busElement.getName()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=busElement.getInquiryURL()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_BUSINESS_KEY")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=busElement.getBusinessKey()%>
- </td>
- </tr>
- </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp
deleted file mode 100644
index 25d934cb3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp
+++ /dev/null
@@ -1,155 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.apache.wsil.extension.uddi.*,
- java.io.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_REGISTRY_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_REGISTRY_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesUDDIRegistryElement) {
- FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement)selectedElement;
- String registryName = regElement.getName();
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_NAME")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=registryName%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=regElement.getInquiryURL()%>
- </td>
- </tr>
- </table>
-<%
- String publishURL = regElement.getPublishURL();
- if (Validator.validateURL(publishURL))
- {
-%>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=publishURL%>
- </td>
- </tr>
- </table>
-<%
- }
-
- String registryURL = regElement.getRegistrationURL();
- if (Validator.validateURL(registryURL))
- {
-%>
- <br>
- <table>
- <tr>
- <td align="left">
- <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_URL",registryURL)%>
- </td>
- </tr>
- </table>
-<%
- }
-
- StringBuffer categoryDirectory = new StringBuffer();
- FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(categoryDirectory,controller.getServletEngineStateLocation(),registryName);
- File categoryDirectoryFile = new File(categoryDirectory.toString());
- String[] categoryFiles = categoryDirectoryFile.list();
- if (categoryFiles != null)
- {
-%>
-<br>
-<table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_USER_DEFINED_CATEGORY_DATA_FILES")%>
- </th>
- </tr>
-<%
- for (int i=0;i<categoryFiles.length;i++)
- {
-%>
- <tr>
- <td class="tablecells">
- <%=categoryFiles[i]%>
- </td>
- </tr>
-<%
- }
-%>
-</table>
-<%
- }
-%>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp
deleted file mode 100644
index be43c524a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp
+++ /dev/null
@@ -1,101 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.apache.wsil.extension.uddi.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_SERVICE_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesUDDIServiceElement) {
- FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement)selectedElement;
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SERVICE_NAME")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serElement.getName()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serElement.getInquiryURL()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SERVICE_KEY")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serElement.getServiceKey()%>
- </td>
- </tr>
- </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp
deleted file mode 100644
index 668423d50..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp
+++ /dev/null
@@ -1,101 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.apache.wsil.extension.uddi.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_UDDI_SERVICE_INTERFACE_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesUDDIServiceInterfaceElement) {
- FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement)selectedElement;
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SERVICE_INTERFACE_NAME")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serIntElement.getName()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serIntElement.getInquiryURL()%>
- </td>
- </tr>
- </table>
-
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SERVICE_INTERFACE_KEY")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=serIntElement.getServiceInterfaceKey()%>
- </td>
- </tr>
- </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp
deleted file mode 100644
index a408a1ade..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUserDefUDDIRegistryDetailsPage.jsp
+++ /dev/null
@@ -1,312 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060912 141796 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.apache.wsil.extension.uddi.*,
- java.io.*,
- java.util.*,
- org.eclipse.wst.ws.internal.model.v10.registry.Name,
- org.eclipse.wst.ws.internal.model.v10.registry.Description,
- org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies,
- org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_USER_DEF_UDDI_REGISTRY_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_USER_DEF_UDDI_REGISTRY_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesUserDefUDDIRegistryElement) {
- FavoritesUserDefUDDIRegistryElement regElement = (FavoritesUserDefUDDIRegistryElement)selectedElement;
- regElement.refreshMeta();
-
- String version = regElement.getVersion();
- if (version != null)
- {
- %>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_UDDI_VERSION")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=version%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
-
- <%
- List names = regElement.getNames();
- if (names != null && !names.isEmpty())
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left" width="1" nowrap>
- <%=favPerspective.getMessage("FORM_LABEL_LANGUAGE")%>
- </th>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_REGISTRY_NAME")%>
- </th>
- </tr>
- <%
- for (Iterator it = names.iterator(); it.hasNext();)
- {
- Name name = (Name)it.next();
- String lang = name.getLang();
- %>
- <tr>
- <td class="tablecells"><%=lang != null ? lang : "--"%></td>
- <td class="tablecells"><%=name.getValue()%></td>
- </tr>
- <%
- }
- %>
- </table>
- <%
- }
- %>
-
- <%
- List descs = regElement.getDescs();
- if (descs != null && !descs.isEmpty())
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left" width="1" nowrap>
- <%=favPerspective.getMessage("FORM_LABEL_LANGUAGE")%>
- </th>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_DESC")%>
- </th>
- </tr>
- <%
- for (Iterator it = descs.iterator(); it.hasNext();)
- {
- Description desc = (Description)it.next();
- String lang = desc.getLang();
- %>
- <tr>
- <td class="tablecells"><%=lang != null ? lang : "--"%></td>
- <td class="tablecells"><%=desc.getValue()%></td>
- </tr>
- <%
- }
- %>
- </table>
- <%
- }
- %>
-
- <%
- String defaultLogin = regElement.getDefaultLogin();
- if (defaultLogin != null)
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_DEFAULT_LOGIN")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=defaultLogin%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
-
- <%
- String defaultPassword = regElement.getDefaultPassword();
- if (defaultPassword != null)
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_DEFAULT_PASSWORD")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=defaultPassword%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
-
- <%
- String inquiryURL = regElement.getInquiryURL();
- if (inquiryURL != null)
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=inquiryURL%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
-
- <%
- String publishURL = regElement.getPublishURL();
- if (Validator.validateURL(publishURL))
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_PUBLISH_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=publishURL%>
- </td>
- </tr>
- </table>
- <%
- }
-
- String secureInquiryURL = regElement.getSecureInquiryURL();
- if (Validator.validateURL(secureInquiryURL))
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SECURE_INQUIRY_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=secureInquiryURL%>
- </td>
- </tr>
- </table>
- <%
- }
-
- String securePublishURL = regElement.getSecurePublishURL();
- if (Validator.validateURL(securePublishURL))
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_SECURE_PUBLISH_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=securePublishURL%>
- </td>
- </tr>
- </table>
- <%
- }
- %>
-
- <%
- Taxonomy[] taxonomies = regElement.getTaxonomies();
- if (taxonomies != null && taxonomies.length > 0)
- {
- %>
- <br>
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_TAXONOMY")%>
- </th>
- </tr>
- <%
- for (int i=0; i<taxonomies.length; i++)
- {
- Taxonomy taxonomy = taxonomies[i];
- %>
- <tr>
- <td class="tablecells"><%=taxonomy.getName()%></td>
- </tr>
- <%
- }
- %>
- </table>
- <%
- }
- %>
-
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-<%
- }
-%>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp
deleted file mode 100644
index 24495387a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp
+++ /dev/null
@@ -1,72 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_WSDL_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_WSDL_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesWSDLServiceElement) {
- FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement)selectedElement;
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="headercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=wsdlElement.getWsdlUrl()%>
- </td>
- </tr>
- </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp
deleted file mode 100644
index aee1ad75a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp
+++ /dev/null
@@ -1,73 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*,
- org.apache.wsil.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- ToolManager currentToolManager = selectedNode.getCurrentToolManager();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favPerspective.getMessage("FORM_TITLE_WSIL_DETAILS")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <%
- String titleImagePath = "images/details_highlighted.gif";
- String title = favPerspective.getMessage("ALT_FAVORITES_WSIL_DETAILS");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <%
- if (selectedElement instanceof FavoritesWSILElement) {
- FavoritesWSILElement wsilElement = (FavoritesWSILElement)selectedElement;
- %>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="singleheadercolor" height=20 valign="bottom" align="left">
- <%=favPerspective.getMessage("FORM_LABEL_URL")%>
- </th>
- </tr>
- <tr>
- <td class="tablecells">
- <%=wsilElement.getWsilUrl()%>
- </td>
- </tr>
- </table>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request">
-<%
- currentToolManagerHash.put(ActionInputs.CURRENT_TOOL_MANAGER,currentToolManager);
-%>
-</jsp:useBean>
-<jsp:include page="/forms/otherActions.jsp" flush="true"/>
-
- <%
- }
- %>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/ProcessFavoritesFramesetsForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/ProcessFavoritesFramesetsForm.jsp
deleted file mode 100644
index 2f9a71ca9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/ProcessFavoritesFramesetsForm.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-%>
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request"/>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<form action="<%=response.encodeURL(controller.getPathWithContext(formAction.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data" style="margin-top:0;margin-bottom:0">
- <input name="<%=ActionInputs.FRAME_NAME%>" type="hidden" value="<%=formFrameName%>">
- <input name="<%=FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>" type="hidden" value="<%=favPerspective.getPerspectiveContentFramesetCols()%>">
- <input name="<%=FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>" type="hidden" value="<%=favPerspective.getActionsContainerFramesetRows()%>">
-</form>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_enabled.gif
deleted file mode 100644
index e65d19a11..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_highlighted.gif
deleted file mode 100644
index 4aa3ddcb5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_uddi_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_enabled.gif
deleted file mode 100644
index 074184164..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_highlighted.gif
deleted file mode 100644
index 362b8cb5a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/add_to_wsil_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_enabled.gif
deleted file mode 100644
index 0fa09842f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_highlighted.gif
deleted file mode 100644
index 18a4ceb03..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_WSIL_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_enabled.gif
deleted file mode 100644
index bd1e37adc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_highlighted.gif
deleted file mode 100644
index d51b97517..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_business_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_enabled.gif
deleted file mode 100644
index ef2aa155f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_highlighted.gif
deleted file mode 100644
index d91ecb55f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_registry_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_enabled.gif
deleted file mode 100644
index c351daff7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_highlighted.gif
deleted file mode 100644
index 53e1335da..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_enabled.gif
deleted file mode 100644
index 446986a1a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_highlighted.gif
deleted file mode 100644
index 815312251..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_service_interface_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_enabled.gif
deleted file mode 100644
index 6dc028508..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_highlighted.gif
deleted file mode 100644
index 428c8ea5e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/list_wsdl_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_business_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_business_node.gif
deleted file mode 100644
index d3d6a778b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_business_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_cat_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_cat_node.gif
deleted file mode 100644
index feec281b1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_cat_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_node.gif
deleted file mode 100644
index 5b43cae7b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_registry_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_interface_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_interface_node.gif
deleted file mode 100644
index 21325ca77..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_interface_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_node.gif
deleted file mode 100644
index 8c0252a2f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/uddi_service_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsdl_service_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsdl_service_node.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsdl_service_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsil_node.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsil_node.gif
deleted file mode 100644
index 7c5916fb6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/images/wsil_node.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesFormSubmit.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesFormSubmit.jsp
deleted file mode 100644
index 915fe97eb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesFormSubmit.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-<script language="javascript">
- function isSomethingSelected(tableContainerId) {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows; i<table.rows.length; i++) {
- var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
- var rowCheckbox = rowCheckboxCell.childNodes[0];
- if (rowCheckbox.checked)
- return true;
- }
- alert("<%=controller.getFavoritesPerspective().getMessage("MSG_ERROR_NOTHING_SELECTED")%>");
- return false;
- }
-
- function setFormLocationAndSubmit(tableContainerId, form, location) {
- if (isSomethingSelected(tableContainerId))
- setLocationAndSubmit(form, location);
- }
-
- function setLocationAndSubmit(form, location) {
- if (handleSubmit(form))
- {
- form.action = location;
- form.submit();
- }
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesPanes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesPanes.jsp
deleted file mode 100644
index 7ca588e60..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesPanes.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- var favNavigatorContainer = perspectiveContent.frames["<%=FavoritesFrameNames.NAVIGATOR_CONTAINER%>"];
- var favNavigatorToolbar = favNavigatorContainer.frames["<%=FavoritesFrameNames.NAVIGATOR_TOOLBAR%>"];
- var favNavigatorContent = favNavigatorContainer.frames["<%=FavoritesFrameNames.NAVIGATOR_CONTENT%>"];
- var favActionsContainer = perspectiveContent.frames["<%=FavoritesFrameNames.ACTIONS_CONTAINER%>"];
- var favPropertiesContainer = favActionsContainer.frames["<%=FavoritesFrameNames.PROPERTIES_CONTAINER%>"];
- var favPropertiesToolbar = favPropertiesContainer.frames["<%=FavoritesFrameNames.PROPERTIES_TOOLBAR%>"];
- var favPropertiesContent = favPropertiesContainer.frames["<%=FavoritesFrameNames.PROPERTIES_CONTENT%>"];
- var favStatusContainer = favActionsContainer.frames["<%=FavoritesFrameNames.STATUS_CONTAINER%>"];
- var favStatusToolbar = favStatusContainer.frames["<%=FavoritesFrameNames.STATUS_TOOLBAR%>"];
- var favStatusContent = favStatusContainer.frames["<%=FavoritesFrameNames.STATUS_CONTENT%>"];
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesTable.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesTable.jsp
deleted file mode 100644
index e76ad2b22..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesTable.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*"%>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/scripts/tables.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<script language="javascript">
-
- function favHandleCheckAllClick(tableContainerId, checkAllCheckbox) {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows; i<table.rows.length; i++) {
- var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
- var rowCheckbox = rowCheckboxCell.childNodes[0];
- rowCheckbox.checked = checkAllCheckbox.checked;
- if (rowCheckbox.checked) {
- highlightRow(table.rows[i],"rowcolor");
- rowCheckbox.name = "<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>";
- }
- else {
- highlightRow(table.rows[i],"tablecells");
- rowCheckbox.name = "";
- }
- }
- }
-
- function validateCheckBoxInput(checkbox, isChecked) {
- if (isChecked) {
- checkbox.name = "<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>";
- }
- else {
- checkbox.name = "";
- }
- handleRowCheckboxClick();
- }
-
- function twistInit(tableContainerId,twistImageName) {
- var tableContainer = document.getElementById(tableContainerId);
- var table = getTable(tableContainerId);
- if (table.rows.length > numberOfHeaderRows) {
- tableContainer.style.display = "none";
- twist(tableContainerId, twistImageName);
- }
- else {
- tableContainer.style.display = "";
- twist(tableContainerId, twistImageName);
- }
- }
-
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesframesets.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesframesets.jsp
deleted file mode 100644
index 4fbe09025..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/scripts/favoritesframesets.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- function getActionsContainerFrameset()
- {
- return perspectiveContent.frames["<%=FavoritesFrameNames.ACTIONS_CONTAINER%>"].document.getElementsByTagName("frameset").item(0);
- }
-
- function processFramesetSizes(framesetSizesForm)
- {
- toggleDoubleClickColumnTitle();
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- framesetSizesForm.<%=FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT%>.value = perspectiveContentFrameset.cols;
- framesetSizesForm.<%=FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER%>.value = actionsContainerFrameset.rows;
- framesetSizesForm.submit();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIBusinessView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIBusinessView.jsp
deleted file mode 100644
index d7cadc773..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIBusinessView.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteUDDIBusinessTable = "divFavoriteUDDIBusinessTable";
- String xdivFavoriteUDDIBusinessTable = "xdivFavoriteUDDIBusinessTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_BUSINESS_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-<%
- String titleImagePath = "wsil/images/list_business_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_BUSINESS");
-%>
-<%@ include file="/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_BUSINESS_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesUDDIBusinessFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteUDDIBusinessTable%>','<%=xdivFavoriteUDDIBusinessTable%>')"><img name="<%=xdivFavoriteUDDIBusinessTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_BUSINESS")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteUDDIBusinessTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIBusinessTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesUDDIBusinessFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesUDDIBusinessElement favUDDIBusinessElement = (FavoritesUDDIBusinessElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIBusinessElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIBusinessElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIBusinessElement.getName()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteUDDIBusinessTable%>','<%=xdivFavoriteUDDIBusinessTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIBusinessTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIBusinessTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%">&nbsp;</td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp
deleted file mode 100644
index f97ec69f9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteUDDIRegistryTable = "divFavoriteUDDIRegistryTable";
- String xdivFavoriteUDDIRegistryTable = "xdivFavoriteUDDIRegistryTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_REGISTRY_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "favorites/images/list_registry_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_REGISTRY");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_REGISTRY_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesUDDIRegistryFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>')"><img name="<%=xdivFavoriteUDDIRegistryTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_REGISTRY")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteUDDIRegistryTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIRegistryTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesUDDIRegistryFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesUDDIRegistryElement favUDDIRegistryElement = (FavoritesUDDIRegistryElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIRegistryElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIRegistryElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIRegistryElement.getName()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIRegistryTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIRegistryTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%">&nbsp;</td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp
deleted file mode 100644
index 8c3ec16ce..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteUDDIServiceIntTable = "divFavoriteUDDIServiceIntTable";
- String xdivFavoriteUDDIServiceIntTable = "xdivFavoriteUDDIServiceIntTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_SERVICE_INTERFACE_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "favorites/images/list_service_interface_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_INTERFACE_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesUDDIServiceInterfaceFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteUDDIServiceIntTable%>','<%=xdivFavoriteUDDIServiceIntTable%>')"><img name="<%=xdivFavoriteUDDIServiceIntTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_SERVICE_INTERFACE")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteUDDIServiceIntTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIServiceIntTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesUDDIServiceInterfaceFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDISerIntElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDISerIntElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDISerIntElement.getName()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteUDDIServiceIntTable%>','<%=xdivFavoriteUDDIServiceIntTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceIntTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceIntTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%">&nbsp;</td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp
deleted file mode 100644
index bd0575f4c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteUDDIServiceTable = "divFavoriteUDDIServiceTable";
- String xdivFavoriteUDDIServiceTable = "xdivFavoriteUDDIServiceTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_UDDI_SERVICE_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "wsil/images/list_UDDI_service_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesUDDIServiceFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteUDDIServiceTable%>','<%=xdivFavoriteUDDIServiceTable%>')"><img name="<%=xdivFavoriteUDDIServiceTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_UDDI_SERVICE")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteUDDIServiceTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIServiceTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesUDDIServiceFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesUDDIServiceElement favUDDIServiceElement = (FavoritesUDDIServiceElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIServiceElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIServiceElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIServiceElement.getName()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteUDDIServiceTable%>','<%=xdivFavoriteUDDIServiceTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIServiceTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%">&nbsp;</td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp
deleted file mode 100644
index 4bd8d80c2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUserDefUDDIRegistryView.jsp
+++ /dev/null
@@ -1,124 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteUDDIRegistryTable = "divFavoriteUDDIRegistryTable";
- String xdivFavoriteUDDIRegistryTable = "xdivFavoriteUDDIRegistryTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_USER_DEF_UDDI_REGISTRY_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "favorites/images/list_registry_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_USER_DEF_UDDI_REGISTRY_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesUserDefUDDIRegistryFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>')"><img name="<%=xdivFavoriteUDDIRegistryTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_USER_DEF_UDDI_REGISTRY")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteUDDIRegistryTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteUDDIRegistryTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_NAME")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesUserDefUDDIRegistryFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesUserDefUDDIRegistryElement favUDDIRegistryElement = (FavoritesUserDefUDDIRegistryElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favUDDIRegistryElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favUDDIRegistryElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favUDDIRegistryElement.getName()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteUDDIRegistryTable%>','<%=xdivFavoriteUDDIRegistryTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteUDDIRegistryTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddToUDDIPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%">&nbsp;</td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp
deleted file mode 100644
index a96cc1ef2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp
+++ /dev/null
@@ -1,127 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteWSDLTable = "divFavoriteWSDLTable";
- String xdivFavoriteWSDLTable = "xdivFavoriteWSDLTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_WSDL_SERVICE_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "wsil/images/list_WSDL_service_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_WSDL_SERVICE");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_WSDL_SERVICE_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesWSDLServiceFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteWSDLTable%>','<%=xdivFavoriteWSDLTable%>')"><img name="<%=xdivFavoriteWSDLTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_WSDL")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteWSDLTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteWSDLTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_URL")%></th>
- </tr>
- <%
- Enumeration e = ((FavoritesWSDLServiceFolderElement)selectedElement).getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesWSDLServiceElement favWSDLServiceElement = (FavoritesWSDLServiceElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favWSDLServiceElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favWSDLServiceElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favWSDLServiceElement.getWsdlUrl()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteWSDLTable%>','<%=xdivFavoriteWSDLTable%>');
- </script>
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_WSDL_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSDLTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(FavoritesAddToWSDLPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSDLTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%">&nbsp;</td>
- </tr>
- </table>
-
- <%
- }
-%>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp
deleted file mode 100644
index a117be508..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp
+++ /dev/null
@@ -1,129 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="java.util.Enumeration,
- java.util.Vector,
- org.eclipse.wst.ws.internal.explorer.platform.util.QuickSort,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String divFavoriteWSILTable = "divFavoriteWSILTable";
- String xdivFavoriteWSILTable = "xdivFavoriteWSILTable";
-
- FavoritesPerspective favoritesPerspective = controller.getFavoritesPerspective();
- NodeManager nodeManager = favoritesPerspective.getNodeManager();
- Node selectedNode = nodeManager.getSelectedNode();
- TreeElement selectedElement = selectedNode.getTreeElement();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=favoritesPerspective.getMessage("VIEW_TITLE_WSIL_LIST")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/favorites/scripts/favoritesFormSubmit.jsp" flush="true"/>
- <jsp:include page="/favorites/scripts/favoritesTable.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <%
- String titleImagePath = "favorites/images/list_WSIL_highlighted.gif";
- String title = favoritesPerspective.getMessage("ALT_LIST_FAVORITE_WSIL");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels">
- <%=favoritesPerspective.getMessage("FORM_LABEL_LIST_FAVORITE_WSIL_DESC")%>
- </td>
- </tr>
- </table>
- <form action="<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" style="margin-top:10px;">
- <%
- if (selectedElement instanceof FavoritesWSILFolderElement) {
- %>
- <input type="hidden" name="<%=FavoritesActionInputs.MULTIPLE_LINK_ACTION%>" value="1">
- <table width="95%" border=0 cellpadding=6 cellspacing=0>
- <tr>
- <td height=20 valign="bottom" align="left" nowrap width=11>
- <a href="javascript:twist('<%=divFavoriteWSILTable%>','<%=xdivFavoriteWSILTable%>')"><img name="<%=xdivFavoriteWSILTable%>" src="<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>" alt="<%=controller.getMessage("ALT_TWIST_CLOSED")%>" class="twist"></a>
- </td>
- <td height=20 valign="bottom" align="left" nowrap class="labels">
- <strong><%=favoritesPerspective.getMessage("FORM_LABEL_FAVORITE_WSIL")%></strong>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=0 cellspacing=0>
- <tr>
- <td valign="top" height=10><img src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt="" height=2 width="100%"></td>
- </tr>
- </table>
-
- <div id="<%=divFavoriteWSILTable%>">
- <table width="95%" cellpadding=3 cellspacing=0 class="tableborder">
- <tr>
- <th class="checkboxcells" width=10><input type="checkbox" onClick="favHandleCheckAllClick('<%=divFavoriteWSILTable%>',this)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX")%>"></th>
- <th class="headercolor"><%=favoritesPerspective.getMessage("FORM_LABEL_URL")%></th>
- </tr>
- <%
- FavoritesWSILFolderElement favWSILFolderElement = (FavoritesWSILFolderElement)selectedElement;
- Enumeration e = favWSILFolderElement.getAllFavorites();
- Vector sortedVector = new Vector();
- while (e.hasMoreElements()) {
- sortedVector.add(e.nextElement());
- }
- QuickSort.sort(sortedVector);
- e = sortedVector.elements();
- while (e.hasMoreElements()) {
- FavoritesWSILElement favWSILElement = (FavoritesWSILElement)e.nextElement();
- %>
- <tr>
- <td class="checkboxcells" width=10><input type="checkbox" name="<%=FavoritesActionInputs.MASS_ACTION_NODE_ID%>" value="<%=selectedNode.getChildNode(favWSILElement).getNodeId()%>" onClick="validateCheckBoxInput(this, this.checked)" title="<%=controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX")%>"></td>
- <td class="tablecells" nowrap><a href="<%=response.encodeURL(controller.getPathWithContext(SelectFavoritesNodeAction.getActionLink(selectedNode.getChildNode(favWSILElement).getNodeId(), false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><%=favWSILElement.getWsilUrl()%></a></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- <script language="javascript">
- twistInit('<%=divFavoriteWSILTable%>','<%=xdivFavoriteWSILTable%>');
- </script>
-
-
- <table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_IMPORT_TO_WSIL_PERSPECTIVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSILTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(AddWSILToWSILPerspectiveAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td height=40 valign="bottom" nowrap>
- <input type="button" value="<%=favoritesPerspective.getMessage("FORM_LABEL_REMOVE")%>" onClick="setFormLocationAndSubmit('<%=divFavoriteWSILTable%>', this.form, '<%=response.encodeURL(controller.getPathWithContext(RemoveFavoritesAction.getBaseActionLink()))%>')" class="button">
- </td>
- <td nowrap width="90%">&nbsp;</td>
- </tr>
- </table>
-
- <%
- }
- %>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp
deleted file mode 100644
index c2f54c572..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp
+++ /dev/null
@@ -1,104 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.core.resources.*,
- org.eclipse.core.runtime.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FORM_TITLE_IMPORT_TO_WORKBENCH")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <form action="<%=response.encodeURL(controller.getPathWithContext((String)formProperties.get("formActionLink")))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
- <input type="hidden" name="<%=ActionInputs.IMPORT_FILE%>" value="<%=ActionInputs.IMPORT_FILE%>">
-
- <%
- String titleImagePath = "images/import_to_workbench_highlighted.gif";
- String title = controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td>
- <%=controller.getMessage("FORM_LABEL_IMPORT_TO_WORKBENCH_DESC")%>
- </td>
- </tr>
- </table>
- <table>
- <tr>
- <td class="labels" height=40 valign="center">
- <label for="select_workbench_project_name"><%=controller.getMessage("WORKBENCH_PROJECT_NAME")%></label>
- </td>
- <td class="labels" height=40 valign="center" nowrap>
- <%
- IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = iWorkspaceRoot.getProjects();
- %>
- <select id="select_workbench_project_name" name="<%=ActionInputs.WORKBENCH_PROJECT_NAME%>" class="selectlist">
- <%
- for (int i = 0; i < projects.length; i++) {
- try {
- if (!projects[i].isOpen()) continue;
- String projectName = projects[i].getName();
- %>
- <option value="<%=projectName%>"><%=projectName%>
- <%
- }
- catch (Exception e) {}
- }
- %>
- </select>
- </td>
- </tr>
- </table>
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <label for="input_imported_file_name"><%=controller.getMessage("IMPORTED_WSDL_FILE_NAME")%></label>
- </td>
- </tr>
- <tr>
- <td height=10 valign="bottom" width="60%">
-<%
- String wsdlFileName="temp.wsdl";
- String wsdlURL = (String)formProperties.get("wsdlURL");
- if (wsdlURL != null && wsdlURL.endsWith(".wsdl"))
- {
- int lastSeparatorPos = Math.max(wsdlURL.lastIndexOf("/"),wsdlURL.lastIndexOf("\\"));
- if (lastSeparatorPos > 0)
- wsdlFileName = wsdlURL.substring(lastSeparatorPos+1,wsdlURL.length());
- }
-%>
- <input type="text" id="input_imported_file_name" name="<%=ActionInputs.IMPORTED_FILE_NAME%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsdlFileName)%>" size=50 class="textenter">
- </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp
deleted file mode 100644
index bc1a670a4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp
+++ /dev/null
@@ -1,161 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 127443 jesper@selskabet.org - Jesper S Moller
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- org.eclipse.core.resources.*,
- org.eclipse.core.runtime.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formProperties" class="java.util.Hashtable" scope="request"/>
-<script language="javascript">
- function toggleDivContainer(divId)
- {
- var divContainer = document.getElementById(divId);
- if (divContainer.style.display == "none")
- divContainer.style.display = "";
- else
- divContainer.style.display = "none";
- }
-</script>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FORM_TITLE_IMPORT_TO_WORKBENCH")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
- <jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
- <jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
-
- <form action="<%=response.encodeURL(controller.getPathWithContext((String)formProperties.get("formActionLink")))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
-
- <%
- String titleImagePath = "images/import_to_workbench_highlighted.gif";
- String title = controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH");
- %>
- <%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td>
- <%=controller.getMessage("FORM_LABEL_IMPORT_TO_WORKBENCH_DESC")%>
- </td>
- </tr>
- </table>
- <table>
- <tr>
- <td class="labels" height=40 valign="center">
- <label for="select_workbench_project_name"><%=controller.getMessage("WORKBENCH_PROJECT_NAME")%></label>
- </td>
- <td class="labels" height=40 valign="center" nowrap>
- <%
- IWorkspaceRoot iWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = iWorkspaceRoot.getProjects();
- %>
- <select id="select_workbench_project_name" name="<%=ActionInputs.WORKBENCH_PROJECT_NAME%>" class="selectlist">
- <%
- for (int i = 0; i < projects.length; i++) {
- try {
- if (!projects[i].isOpen())
- continue;
- String projectName = projects[i].getName();
- %>
- <option value="<%=projectName%>"><%=projectName%>
- <%
- }
- catch (Exception e) {}
- }
- %>
- </select>
- </td>
- </tr>
- </table>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <input type="checkbox" checked id="input_import_wsdl" name="<%=ActionInputs.IMPORT_FILE%>" value="<%=ActionInputs.IMPORT_FILE%>" onClick="toggleDivContainer('div_import_wsdl')">
- <label for="input_import_wsdl"><%=controller.getMessage("LABEL_IMPORT_WSDL")%></label>
- </td>
- </tr>
- </table>
- <div id="div_import_wsdl">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <label for="input_imported_wsdl_file_name"><%=controller.getMessage("IMPORTED_WSDL_FILE_NAME")%></label>
- </td>
- </tr>
- <tr>
- <td height=10 valign="bottom" width="60%">
-<%
- String wsdlFileName="temp.wsdl";
- String wsdlURL = (String)formProperties.get("wsdlURL");
- if (wsdlURL != null && wsdlURL.endsWith(".wsdl"))
- {
- int lastSeparatorPos = Math.max(wsdlURL.lastIndexOf("/"),wsdlURL.lastIndexOf("\\"));
- if (lastSeparatorPos > 0)
- wsdlFileName = wsdlURL.substring(lastSeparatorPos+1,wsdlURL.length());
- }
-%>
- <input type="text" id="input_imported_wsdl_file_name" name="<%=ActionInputs.IMPORTED_FILE_NAME%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsdlFileName)%>" size=50 class="textenter">
- </td>
- </tr>
- </table>
- </div>
-
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">&nbsp;</td>
- </tr>
- </table>
-
- <input type="hidden" name="<%=ActionInputs.IMPORTED_WSDL_URL%>" value="<%=wsdlURL%>">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <input type="checkbox" id="input_import_wsil" name="<%=ActionInputs.IMPORT_TO_WSIL%>" value="<%=ActionInputs.IMPORT_TO_WSIL%>" onClick="toggleDivContainer('div_import_wsil')">
- <label for="input_import_wsil"><%=controller.getMessage("LABEL_IMPORT_TO_WSIL")%></label>
- </td>
- </tr>
- </table>
- <div id="div_import_wsil" style="display:none;">
- <table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td class="labels" height=10 valign="bottom">
- <label for="input_imported_wsil_file_name"><%=controller.getMessage("WSIL_FILE_NAME")%></label>
- </td>
- </tr>
- <tr>
- <td height=10 valign="bottom" width="60%">
-<%
- String wsilFileName = (String)formProperties.get("wsilFileName");
- if (wsilFileName == null || wsilFileName.length() <= 0)
- wsilFileName = wsdlFileName.substring(0, wsdlFileName.length()-4) + "wsil";
-%>
- <input type="text" id="input_imported_wsil_file_name" name="<%=ActionInputs.WSIL_FILE_NAME%>" value="<%=HTMLUtils.charactersToHTMLEntitiesStrict(wsilFileName)%>" size=50 class="textenter">
- </td>
- </tr>
- </table>
- </div>
-
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp
deleted file mode 100644
index 61f04e7bb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="formActionLink" class="java.lang.StringBuffer" scope="request"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FORM_TITLE_LAUNCH_WEBSERVICE_WIZARD")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<jsp:include page="/scripts/formsubmit.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
-<div id="contentborder">
- <form action="<%=response.encodeURL(controller.getPathWithContext(formActionLink.toString()))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" enctype="multipart/form-data">
-
-<%
- String titleImagePath = "images/launch_wswizard_highlighted.gif";
- String title = controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD");
-%>
-<%@ include file = "/forms/formheader.inc" %>
- <table>
- <tr>
- <td class="labels" height=20 valign="bottom">
- <%=controller.getMessage("FORM_LABEL_CHOOSE_WIZARD")%>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_ws_client_wizard" class="radio" name="<%=ActionInputs.WEB_SERVICE_WIZARD%>" checked=true value="<%=String.valueOf(ActionInputs.WEB_SERVICE_CLIENT_WIZARD)%>"><label for="radio_ws_client_wizard"><%=controller.getMessage("FORM_RADIO_WEB_SERVICE_CLIENT_WIZARD")%></label>
- </td>
- </tr>
- <tr>
- <td>
- <input type="radio" id="radio_ws_skeleton_wizard" class="radio" name="<%=ActionInputs.WEB_SERVICE_WIZARD%>" value="<%=String.valueOf(ActionInputs.WEB_SERVICE_SKELETON_WIZARD)%>"><label for="radio_ws_skeleton_wizard"><%=controller.getMessage("FORM_RADIO_WEB_SERVICE_SKELETON_WIZARD")%></label>
- </td>
- </tr>
- </table>
-<jsp:include page="/forms/simpleCommon_table.jsp" flush="true"/>
- </form>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp
deleted file mode 100644
index 6d6693755..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp
+++ /dev/null
@@ -1,74 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- Controller controller;
- StringBuffer targetContentLink = new StringBuffer(request.getParameter(ActionInputs.TARGET_PAGE));
- if (sessionId != null)
- {
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- controller = (Controller)currentSession.getAttribute("controller");
- if (targetContentLink.toString().indexOf("?") != -1)
- targetContentLink.append('&');
- else
- targetContentLink.append('?');
- targetContentLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
- }
- else
- controller = (Controller)session.getAttribute("controller");
-
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FORM_TITLE_PAGE_LOADER")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript">
- function loadContent()
- {
- var frameset = parent.document.getElementById("proxyPage");
- var contentFrame = frameset.getElementsByTagName("frame").item(1);
- contentFrame.src = "<%=response.encodeURL(controller.getPathWithContext(targetContentLink.toString()))%>";
- }
-
- function handleCompletion()
- {
- var table = document.getElementsByTagName("table").item(0);
- var tBody = table.getElementsByTagName("TBODY").item(0);
- var doneRow = document.createElement("tr");
- var doneColumn = document.createElement("td");
- doneColumn.appendChild(document.createTextNode("Page loaded."));
- doneRow.appendChild(doneColumn);
- tBody.appendChild(doneRow);
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="contentbodymargin">
- <div id="contentborder">
- <table>
- <tr>
- <td class="labels">
- <%=controller.getMessage("MSG_LOAD_IN_PROGRESS")%>
- </td>
- </tr>
- </table>
- </div>
-<script language="javascript">
- loadContent();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadPage.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadPage.jsp
deleted file mode 100644
index a62462e0d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadPage.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils,
- java.util.*,
- java.net.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- Controller controller;
- StringBuffer loadContentLink = new StringBuffer("forms/ProxyLoadContent.jsp?");
- if (sessionId != null)
- {
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- controller = (Controller)currentSession.getAttribute("controller");
- loadContentLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&');
- }
- else
- controller = (Controller)session.getAttribute("controller");
- loadContentLink.append(ActionInputs.TARGET_PAGE).append('=').append(URLUtils.encode(request.getParameter(ActionInputs.TARGET_PAGE)));
-%>
-<frameset id="proxyPage" rows="100%,*" border=0>
- <frame src="<%=controller.getPathWithContext(loadContentLink.toString())%>" title="<%=controller.getMessage("FORM_TITLE_PAGE_LOADER")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=0 noresize>
- <frame title="<%=controller.getMessage("FORM_TITLE_PAGE_CONTENT")%>" marginwidth=0 marginheight=0 scrolling="no" frameborder=0 noresize>
-</frameset>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/copyright.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/copyright.inc
deleted file mode 100644
index a7fdcef6e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/copyright.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%> \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/formheader.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/formheader.inc
deleted file mode 100644
index afe5b2ba6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/formheader.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <img src="<%=response.encodeURL(controller.getPathWithContext(titleImagePath))%>" alt="">
- <strong><%=title%></strong>
- </td>
- </tr>
- <tr>
- <td height=20> <img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt=""> </td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/otherActions.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/otherActions.jsp
deleted file mode 100644
index dde615688..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/otherActions.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:useBean id="currentToolManagerHash" class="java.util.Hashtable" scope="request"/>
-<%
- ToolManager currentToolManager = (ToolManager)currentToolManagerHash.get(ActionInputs.CURRENT_TOOL_MANAGER);
- int numberOfTools = currentToolManager.getNumberOfTools();
- if (numberOfTools > 1)
- {
-%>
-<table>
- <tr>
- <td height=20>&nbsp;</td>
- </tr>
-</table>
-<table width="95%" border=0 cellpadding=3 cellspacing=0>
- <tr>
- <td>
- <strong><%=controller.getMessage("ALT_OTHER_ACTIONS")%></strong>
- </td>
- </tr>
- <tr>
- <td height=20> <img height=2 width="100%" align="top" src="<%=response.encodeURL(controller.getPathWithContext("images/keyline.gif"))%>" alt=""> </td>
- </tr>
-</table>
-<table>
-<%
- for (int i=1;i<numberOfTools;i++)
- {
- Tool t = currentToolManager.getTool(i);
-%>
- <tr>
- <td><a href="<%=response.encodeURL(controller.getPathWithContext(t.getSelectToolActionHref(false)))%>" target="<%=t.getSelectToolActionTarget()%>"><%=t.getAltText()%></a></td>
- </tr>
-<%
- }
-%>
-</table>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/simpleCommon_table.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/simpleCommon_table.jsp
deleted file mode 100644
index 6dfe8a8d4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/simpleCommon_table.jsp
+++ /dev/null
@@ -1,26 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<table border=0 cellpadding=2 cellspacing=0>
- <tr>
- <td height=30 valign="bottom" align="left" nowrap>
- <input type="submit" value="<%=controller.getMessage("FORM_BUTTON_GO")%>" class="button">
- </td>
- <td height=30 valign="bottom" align="left" nowrap>
- <input type="button" value="<%=controller.getMessage("FORM_BUTTON_RESET")%>" onClick="resetFormInputs()" class="button">
- </td>
- <td nowrap width="90%">&nbsp;</td>
- </tr>
-</table>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/actions.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/actions.gif
deleted file mode 100644
index d5aed7aa0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/actions.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_enabled.gif
deleted file mode 100644
index 55ce561af..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_highlighted.gif
deleted file mode 100644
index 8ead667de..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/add_to_wsdl_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_enabled.gif
deleted file mode 100644
index 1a46673a1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_highlighted.gif
deleted file mode 100644
index 4fb415010..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/back_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/calendar.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/calendar.gif
deleted file mode 100644
index be2817bf1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/calendar.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_enabled.gif
deleted file mode 100644
index 5798483df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_highlighted.gif
deleted file mode 100644
index 6bc10f9d0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/clear_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_enabled.gif
deleted file mode 100644
index 333327302..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_highlighted.gif
deleted file mode 100644
index 98a2ba04e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/details_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_play.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_play.gif
deleted file mode 100644
index eb17c1103..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_play.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_record.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_record.gif
deleted file mode 100644
index 03004f54e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_record.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_save.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_save.gif
deleted file mode 100644
index fe0048bed..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_save.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_stop.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_stop.gif
deleted file mode 100644
index 3aee9aa1b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/dlcl16/actionengine_stop.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_play.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_play.gif
deleted file mode 100644
index b88fb72d5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_play.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_record.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_record.gif
deleted file mode 100644
index 26ccfe22c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_record.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_save.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_save.gif
deleted file mode 100644
index c6e7b9d6a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_save.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_stop.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_stop.gif
deleted file mode 100644
index 0dc366d0e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/elcl16/actionengine_stop.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/actionengine.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/actionengine.gif
deleted file mode 100644
index bf64bc22f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/eview16/actionengine.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_enabled.gif
deleted file mode 100644
index acb026872..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_highlighted.gif
deleted file mode 100644
index fa6221852..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_enabled.gif
deleted file mode 100644
index 39004bf62..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_highlighted.gif
deleted file mode 100644
index 1965b847b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/favorites_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_closed.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_closed.gif
deleted file mode 100644
index 42e027c93..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_closed.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_open.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_open.gif
deleted file mode 100644
index 21322e0aa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/folder_open.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_enabled.gif
deleted file mode 100644
index 4231431ef..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_highlighted.gif
deleted file mode 100644
index e2f8c3e1f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/forward_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_enabled.gif
deleted file mode 100644
index a70c7a7c4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_highlighted.gif
deleted file mode 100644
index 946d3e71b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_fs_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_enabled.gif
deleted file mode 100644
index b64a07d3a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_highlighted.gif
deleted file mode 100644
index d38085ad9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/import_to_workbench_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/keyline.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/keyline.gif
deleted file mode 100644
index de8069e64..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/keyline.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_enabled.gif
deleted file mode 100644
index d258dc5c2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_highlighted.gif
deleted file mode 100644
index 5f097d561..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/launch_wswizard_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line.gif
deleted file mode 100644
index 881e5b7f9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_last.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_last.gif
deleted file mode 100644
index 8f0ef83e0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_last.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_notlast.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_notlast.gif
deleted file mode 100644
index 8292ce2df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/line_notlast.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_last.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_last.gif
deleted file mode 100644
index 19ebb73bd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_last.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_notlast.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_notlast.gif
deleted file mode 100644
index cd6431bf9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/minus_notlast.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/navigator.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/navigator.gif
deleted file mode 100644
index 88c056795..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/navigator.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_last.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_last.gif
deleted file mode 100644
index e00c89a0b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_last.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_notlast.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_notlast.gif
deleted file mode 100644
index 257bd1653..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/plus_notlast.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_enabled.gif
deleted file mode 100644
index 5bd5d19de..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_highlighted.gif
deleted file mode 100644
index 42904295e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/refresh_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/root_main.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/root_main.gif
deleted file mode 100644
index 27ade02c4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/root_main.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/space.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/space.gif
deleted file mode 100644
index 481191560..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/space.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/status.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/status.gif
deleted file mode 100644
index 2da001e3e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/status.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_enabled.gif
deleted file mode 100644
index 7b5bc9d04..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_highlighted.gif
deleted file mode 100644
index 07164754e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/top_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistclosed.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistclosed.gif
deleted file mode 100644
index 264331e46..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistclosed.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistopened.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistopened.gif
deleted file mode 100644
index 4c2c5f2fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/twistopened.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_enabled.gif
deleted file mode 100644
index 9acab3dba..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_highlighted.gif
deleted file mode 100644
index 7cfc0af65..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/uddi_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_enabled.gif
deleted file mode 100644
index 932acfed6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_highlighted.gif
deleted file mode 100644
index ae8efc903..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsdl_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_enabled.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_enabled.gif
deleted file mode 100644
index 7af88fcb0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_enabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_highlighted.gif b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_highlighted.gif
deleted file mode 100644
index 23b35a615..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/images/wsil_perspective_highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/launch_options_registry.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/launch_options_registry.jsp
deleted file mode 100644
index 11c07822d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/launch_options_registry.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060515 128602 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.WSExplorerContext,
- java.util.Enumeration,
- java.util.Hashtable,
- org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils" %>
-
-<%
- request.setCharacterEncoding("UTF-8");
- String key = null;
- Hashtable options = new Hashtable();
- Enumeration paramNames = request.getParameterNames();
- while (paramNames.hasMoreElements())
- {
- String paramName = (String)paramNames.nextElement();
- String[] paramValues = request.getParameterValues(paramName);
- if (paramValues != null && paramValues.length > 0)
- {
- if (key == null && URLUtils.decode(paramName).equals(WSExplorerContext.ID))
- key = paramValues[0];
- else
- options.put(paramName, paramValues);
- }
- }
- if (key != null)
- {
- LaunchOptionsManager manager = LaunchOptionsManager.getInstance();
- manager.manage(key, options, application);
- }
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp
deleted file mode 100644
index ef0742344..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_CONTENT")%></title>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-<script language="javascript">
- perspectiveWorkArea.location="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(controller.getCurrentPerspective().getPerspectiveId(),false)))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp
deleted file mode 100644
index 9d3347f61..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp
+++ /dev/null
@@ -1,78 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-StringBuffer hrefActionEngine = new StringBuffer();
-hrefActionEngine.append(response.encodeURL(controller.getPathWithContext("actionengine_container.jsp")));
-hrefActionEngine.append("?");
-hrefActionEngine.append(ActionInputs.SESSIONID);
-hrefActionEngine.append("=");
-hrefActionEngine.append(session.getId());
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title><%=controller.getMessage("FRAME_TITLE_PERSPECTIVE_TOOLBAR")%></title>
- <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/toolbar.css"))%>">
- <script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/toolbar.js"))%>">
- </script>
- <script language="javascript">
- function openActionEngineContainer()
- {
- var link = "<%=hrefActionEngine.toString()%>";
- var actionEngineContainer = window.open(link,"actionEngineContainer","height=100,width=350,status=yes,scrollbars=yes,resizable=yes");
- if (actionEngineContainer.focus)
- actionEngineContainer.focus();
- }
- </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>" class="gtoolbarbodymargin">
-<div id="globaltoolbar">
-<table width="100%" cellpadding=3 cellspacing=0 border=0>
- <tr>
- <td class="text" nowrap valign="middle" align="left" width="100%" height=25><%=controller.getMessage("TITLE_WSEXPLORER")%></td>
- <%
- String altHistoryBack = controller.getMessage("ALT_BACK");
- String altHistoryForward = controller.getMessage("ALT_FORWARD");
- String altActionEngine = controller.getMessage("ALT_ACTION_ENGINE");
- String altUDDI = controller.getMessage("ALT_UDDI_PERSPECTIVE");
- String altWSIL = controller.getMessage("ALT_WSIL_PERSPECTIVE");
- String altWSDL = controller.getMessage("ALT_WSDL_PERSPECTIVE");
- String altFavorites = controller.getMessage("ALT_FAVORITES_PERSPECTIVE");
- %>
- <td class="text" nowrap valign="middle" align="center" width=16 height=26><a href="<%=response.encodeURL(controller.getPathWithContext(RetrieveHistoryAction.getActionLink(ActionInputs.JUMP_BACK)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altHistoryBack%>" title="<%=altHistoryBack%>" src="<%=response.encodeURL(controller.getPathWithContext("images/back_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/back_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/back_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/back_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/back_enabled.gif"))%>';mouseup(this)"></a></td>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(RetrieveHistoryAction.getActionLink(ActionInputs.JUMP_FORWARD)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altHistoryForward%>" title="<%=altHistoryForward%>" src="<%=response.encodeURL(controller.getPathWithContext("images/forward_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/forward_enabled.gif"))%>';mouseup(this)"></a></td>
- <%
- ActionEngine actionEngine = controller.getActionEngine();
- if (actionEngine != null && actionEngine.getMode() != ActionEngine.MODE_DISABLED)
- {
- %>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="javascript:openActionEngineContainer()"><img class="normal" alt="<%=altActionEngine%>" title="<%=altActionEngine%>" src="<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/eview16/actionengine.gif"))%>';mouseup(this)"></a></td>
- <%
- }
- %>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_UDDI,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altUDDI%>" title="<%=altUDDI%>" src="<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/uddi_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSIL,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altWSIL%>" title="<%=altWSIL%>" src="<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/wsil_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_WSDL,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altWSDL%>" title="<%=altWSDL%>" src="<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/wsdl_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
- <td class="text" nowrap valign="middle" align="left" height=25><a href="<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(ActionInputs.PERSPECTIVE_FAVORITES,false)))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>"><img class="normal" alt="<%=altFavorites%>" title="<%=altFavorites%>" src="<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_enabled.gif"))%>" onMouseOver="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_highlighted.gif"))%>';mouseover(this);" onMouseOut="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_enabled.gif"))%>';mouseout(this)" onMouseDown="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_highlighted.gif"))%>';mousedown(this)" onMouseUp="src='<%=response.encodeURL(controller.getPathWithContext("images/favorites_perspective_enabled.gif"))%>';mouseup(this)"></a></td>
- </tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/browserdetect.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/browserdetect.js
deleted file mode 100644
index 6b8135867..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/browserdetect.js
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// Copyright (c) 2002, 2004 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
-//
-
-function isMicrosoftInternetExplorer()
-{
- return navigator.appName == "Microsoft Internet Explorer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/calendarbrowser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/calendarbrowser.jsp
deleted file mode 100644
index 79b9ca265..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/calendarbrowser.jsp
+++ /dev/null
@@ -1,69 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String sessionId = session.getId();
-%>
-<script language="javascript">
- var calendarBrowser;
- var calendarBrowserClosed = true;
- var calendarTargetRow = -1;
- var calendarTarget;
-
- function openCalendarBrowser(type,formContainerId,elementName,index)
- {
- var form = document.getElementById(formContainerId).getElementsByTagName("form").item(0);
- var elements = form.elements[elementName];
- if (index == 0 && elements.length == undefined)
-<%
- // Only one element.
-%>
- calendarTarget = elements;
- else
- {
- calendarTargetRow = index;
- calendarTarget = elements.item(index);
- }
- var link;
- switch (type)
- {
- case <%=ActionInputs.CALENDAR_TYPE_DATE%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForDate(sessionId)))%>";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_DATETIME%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForDateTime(sessionId)))%>";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GYEARMONTH%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForGYearMonth(sessionId)))%>";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GDAY%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForGDay(sessionId)))%>";
- break;
- case <%=ActionInputs.CALENDAR_TYPE_GMONTHDAY%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenCalendarBrowserAction.getActionLinkForGMonthDay(sessionId)))%>";
- break;
- }
- calendarBrowser = window.open(link,"calendarBrowser","height=350,width=264,status=yes,scrollbars=yes,resizable=yes");
- if (calendarBrowser.focus)
- calendarBrowser.focus();
- }
-
- function closeCalendarBrowser()
- {
- if (!calendarBrowserClosed)
- calendarBrowser.close();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formsubmit.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formsubmit.jsp
deleted file mode 100644
index 3b3b4f36a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formsubmit.jsp
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<script language="javascript">
- var requestSubmitted = false;
-
- function handleSubmit(form)
- {
- if (requestSubmitted)
- {
- alert("<%=HTMLUtils.JSMangle(controller.getMessage("MSG_SUBMIT_IN_PROGRESS"))%>");
- return false;
- }
- requestSubmitted = true;
- return true;
- }
-
- function resetSubmission()
- {
- requestSubmitted = false;
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formutils.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formutils.jsp
deleted file mode 100644
index 2dec80569..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/formutils.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<script language="javascript">
- <%// Requires browserdetect.js%>
- function createHiddenElement(elementName,value)
- {
- var hiddenInput;
- if (elementName.length > 0)
- {
- if (isMicrosoftInternetExplorer())
- hiddenInput = document.createElement("<input name='"+elementName+"'>");
- else
- {
- hiddenInput = document.createElement("input");
- hiddenInput.setAttribute("name",elementName);
- }
- }
- else
- hiddenInput = document.createElement("input");
- hiddenInput.type = "hidden";
- hiddenInput.value = value;
- return hiddenInput;
- }
-
- function resetFormInputs()
- {
- document.location.reload();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/panes.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/panes.jsp
deleted file mode 100644
index aa69c2ca7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/panes.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<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%>";
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/resumeproxyloadpage.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/resumeproxyloadpage.js
deleted file mode 100644
index d5e1549fa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/resumeproxyloadpage.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright (c) 2002, 2004 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
-//
-
-function resumeProxyLoadPage()
-{
- var proxyPage = parent.document.getElementById("proxyPage");
- proxyPage.setAttribute("rows", "0,100%");
- parent.frames[0].handleCompletion();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/switchperspective.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/switchperspective.jsp
deleted file mode 100644
index 9aac1928b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/switchperspective.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/scripts/panes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(controller.getCurrentPerspective().getPerspectiveContentPage()))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/tables.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/tables.jsp
deleted file mode 100644
index 99a24eefe..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/tables.jsp
+++ /dev/null
@@ -1,159 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<script language="javascript">
- var numberOfHeaderRows = 1;
- function getTable(tableContainerId)
- {
- var container = document.getElementById(tableContainerId);
- return container.getElementsByTagName("table").item(0);
- }
-
- function setSelect(select,value)
- {
- for (var i=0;i<select.options.length;i++)
- {
- if (select.options[i].value == value)
- {
- select.selectedIndex = i;
- return select.options[i].text;
- }
- }
- }
-
- function removeSelectedRows(tableContainerId)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckbox = table.rows[i].getElementsByTagName("input").item(0);
- if (rowCheckbox.checked)
- {
- table.deleteRow(i);
- i--;
- }
- }
- var checkAllCheckboxRow = table.rows[0];
- var checkAllCheckbox = checkAllCheckboxRow.getElementsByTagName("input").item(0);
- if (checkAllCheckbox.checked)
- checkAllCheckbox.checked = false;
- }
-
- function handleRowCheckboxClick(e)
- {
- var checkbox;
- if (isMicrosoftInternetExplorer())
- checkbox = event.srcElement;
- else
- checkbox = e.target;
- var cell = checkbox.parentNode;
- var row = cell.parentNode;
- if (checkbox.checked)
- highlightRow(row,"rowcolor");
- else
- highlightRow(row,"tablecells");
-
- var tbody = row.parentNode;
- var table = tbody.parentNode;
- var checkAllCheckbox = table.rows[0].getElementsByTagName("input").item(0);
- if (checkAllCheckbox.checked)
- checkAllCheckbox.checked = false;
- }
-
- function createRowCheckbox()
- {
- var rowCheckbox = document.createElement("input");
- rowCheckbox.setAttribute("name",rowCheckboxName);
- rowCheckbox.type = "checkbox";
- rowCheckbox.title = "<%=HTMLUtils.JSMangle(controller.getMessage("FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX"))%>";
- rowCheckbox.onclick = handleRowCheckboxClick;
- return rowCheckbox;
- }
-
- function handleCheckAllClick(tableContainerId,checkAllCheckbox)
- {
- var table = getTable(tableContainerId);
- for (var i=numberOfHeaderRows;i<table.rows.length;i++)
- {
- var rowCheckboxCell = table.rows[i].getElementsByTagName("td").item(0);
- var rowCheckbox = rowCheckboxCell.childNodes[0];
- rowCheckbox.checked = checkAllCheckbox.checked;
- if (rowCheckbox.checked)
- highlightRow(table.rows[i],"rowcolor");
- else
- highlightRow(table.rows[i],"tablecells");
- }
- }
-
- function highlightRow(row,className)
- {
- var rowColumns = row.getElementsByTagName("td");
- for (var i=1;i<rowColumns.length;i++)
- rowColumns.item(i).className = className;
- }
-
- function highlightErrantRow(row,className)
- {
- var rowColumns = row.getElementsByTagName("td");
- var column0 = rowColumns.item(0);
- var column0Control = column0.childNodes[0];
- var start;
- if (column0Control.type == "checkbox")
- {
- column0Control.checked = true;
- rowColumns.item(1).className = "firstcolumnerrantrowcolor";
- start = 2;
- }
- else
- {
- column0.className = "firstcolumnerrantrowcolor";
- start = 1;
- }
- rowColumns.item(rowColumns.length-1).className = "lastcolumnerrantrowcolor";
- for (var i=start;i<rowColumns.length-1;i++)
- rowColumns.item(i).className = "middleerrantrowcolor";
- }
-
- function twist(tableContainerId,twistImageName)
- {
- var tableContainer = document.getElementById(tableContainerId);
- var twistImage = document.images[twistImageName];
- if (tableContainer.style.display == "none")
- {
- tableContainer.style.display = "";
- twistImage.src = "<%=response.encodeURL(controller.getPathWithContext("images/twistopened.gif"))%>";
- twistImage.alt = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_TWIST_OPENED"))%>";
- }
- else
- {
- tableContainer.style.display = "none";
- twistImage.src = "<%=response.encodeURL(controller.getPathWithContext("images/twistclosed.gif"))%>";
- twistImage.alt = "<%=HTMLUtils.JSMangle(controller.getMessage("ALT_TWIST_CLOSED"))%>";
- }
- }
-
- function twistOpen(tableContainerId)
- {
- if (document.getElementById(tableContainerId).style.display == "none")
- twist(tableContainerId,"x"+tableContainerId);
- }
-
- function getDefaultDisplayString(inputValue)
- {
- if (inputValue == null || inputValue.length < 1)
- return "<%=HTMLUtils.JSMangle(controller.getMessage("TABLE_BLANK_PLACEHOLDER"))%>";
- return inputValue;
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/toolbar.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/toolbar.js
deleted file mode 100644
index bab1b2dbb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/toolbar.js
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// Copyright (c) 2002, 2004 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
-//
-
-function mouseover(img)
-{
- img.className = "hover";
-}
-
-function mouseout(img)
-{
- img.className = "normal";
-}
-
-function mousedown(img)
-{
- img.className = "down";
-}
-
-function mouseup(img)
-{
- return mouseout(img);
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/treeview.js b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/treeview.js
deleted file mode 100644
index 0e843fb42..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/treeview.js
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2002, 2004 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
-//
-
-// Requires browserdetect.js
-
-var selectedAnchorName = "";
-
-function setSelectedAnchorName(anchorName)
-{
- selectedAnchorName = anchorName;
-}
-
-function selectNode(anchorName,openImagePath)
-{
- var isIE = isMicrosoftInternetExplorer();
- if (selectedAnchorName.length > 0)
- {
- var selectedAnchor;
- if (isIE)
- selectedAnchor = document.anchors(selectedAnchorName);
- else
- selectedAnchor = document.anchors[selectedAnchorName];
- if (selectedAnchor)
- selectedAnchor.className = "unselectedTextAnchor";
- }
- if (anchorName.indexOf("-1") == -1)
- {
- if (isIE)
- document.anchors(anchorName).className = "selectedTextAnchor";
- else
- document.anchors[anchorName].className = "selectedTextAnchor";
- setSelectedAnchorName(anchorName);
- alterImage(anchorName,openImagePath);
- }
- else
- setSelectedAnchorName("");
-}
-
-function alterImage(imageName,imagePath)
-{
- document.images[imageName].src = imagePath;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/wsdlbrowser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/wsdlbrowser.jsp
deleted file mode 100644
index 4e45a7fbd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/scripts/wsdlbrowser.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- String sessionId = session.getId();
-%>
-<script language="javascript">
- var wsdlWindow;
- var wsdlWindowClosed = true;
- var targetWSDLURLElement;
- function openWSDLBrowser(formContainerId,type)
- {
- var form = document.getElementById(formContainerId).getElementsByTagName("form").item(0);
- targetWSDLURLElement = form.<%=ActionInputs.QUERY_INPUT_WSDL_URL%>;
- var link;
- switch (type)
- {
- case <%=ActionInputs.WSDL_TYPE_SERVICE%>:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenWSDLBrowserAction.getActionLinkForService(sessionId)))%>";
- break;
- case <%=ActionInputs.WSDL_TYPE_SERVICE_INTERFACE%>:
- default:
- link = "<%=response.encodeURL(controller.getPathWithContext(OpenWSDLBrowserAction.getActionLinkForServiceInterface(sessionId)))%>";
- }
- wsdlWindow = window.open(link,"wsdlWindow","height=300,width=450,status=yes,scrollbars=yes,resizable=yes");
- if (wsdlWindow.focus)
- wsdlWindow.focus();
- }
-
- function closeWSDLBrowser()
- {
- if (!wsdlWindowClosed)
- wsdlWindow.close();
- }
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddItemsToFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddItemsToFavoritesActionJSP.jsp
deleted file mode 100644
index e7e0f393a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddItemsToFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- AddItemsToFavoritesAction action = new AddItemsToFavoritesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp
deleted file mode 100644
index 519a4fbd7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- AddPublisherAssertionsAction action = new AddPublisherAssertionsAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (inputsValid)
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- }
-%>
-
- <script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- </script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp
deleted file mode 100644
index 11f7b4a77..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.AddToFavoritesAction"%>
-
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- AddToFavoritesAction action = new AddToFavoritesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp
deleted file mode 100644
index cc6f2f4a2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action
- BusPublishServiceAdvancedAction action = new BusPublishServiceAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp
deleted file mode 100644
index b87ef0dd8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- BusPublishServiceSimpleAction action = new BusPublishServiceSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusinessGetServicesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusinessGetServicesActionJSP.jsp
deleted file mode 100644
index 3ee5d2463..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusinessGetServicesActionJSP.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<%
- // Prepare the action.
- BusinessGetServicesAction action = new BusinessGetServicesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- boolean businessExists = action.validateBusiness();
-
- if (!businessExists)
- {
- int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_BUSINESS_NODE"))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CheckFavoriteExistsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CheckFavoriteExistsActionJSP.jsp
deleted file mode 100644
index 73d1e43e4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CheckFavoriteExistsActionJSP.jsp
+++ /dev/null
@@ -1,66 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.AddToFavoritesAction,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*"%>
-
-
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/AddToFavoritesActionJSP.jsp"))%>" method="post" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>">
-<%
-Enumeration paramNames = request.getParameterNames();
-while (paramNames.hasMoreElements()) {
- String paramName = (String)paramNames.nextElement();
- String[] paramValues = request.getParameterValues(paramName);
- for (int i = 0; i < paramValues.length; i++) {
-%>
- <input type="hidden" name="<%=paramName%>" value="<%=paramValues[i]%>">
-<%
- }
-}
-%>
-</form>
-</body>
-</html>
-
-<%
-// Prepare the action.
-AddToFavoritesAction action = new AddToFavoritesAction(controller);
-// Load the parameters for the action from the servlet request.
-action.populatePropertyTable(request);
-if (action.favoriteExists()) {
-%>
- <script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(controller.getUDDIPerspective().getMessage("MSG_QUESTION_OVERWRITE_FAVORITES"))%>"))
- document.forms[0].submit();
- </script>
-<%
-}
-else {
-%>
- <script language="javascript">
- document.forms[0].submit();
- </script>
-<%
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodeActionJSP.jsp
deleted file mode 100644
index c9dec4361..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodeActionJSP.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Prepare the action.
- NodeManager navigatorManager = controller.getUDDIPerspective().getNavigatorManager();
- Node selectedNode = navigatorManager.getSelectedNode();
- ClearNavigatorNodeAction action;
- if (selectedNode instanceof FolderNode)
- action = new ClearNavigatorFolderNodeAction(controller);
- else
- action = new ClearNavigatorNodeAction(controller);
-
- // The action may be executed programmed link.
- action.populatePropertyTable(request);
-
- boolean inputsValid = true;
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<%@ include file="/actions/ClearNodeAction.inc" %>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodesActionJSP.jsp
deleted file mode 100644
index 4277ca352..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ClearNavigatorNodesActionJSP.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- ClearNavigatorNodesAction action = new ClearNavigatorNodesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp
deleted file mode 100644
index 523157576..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- CompletePublisherAssertionsAction action = new CompletePublisherAssertionsAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (inputsValid)
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- }
-%>
-
- <script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- </script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LaunchSubQueryAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LaunchSubQueryAction.inc
deleted file mode 100644
index c3bfee0d4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LaunchSubQueryAction.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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
- *******************************************************************************/
-%>
-<%
- String subQueryKey = action.getSubQueryKey();
- StringBuffer newSubQueryKey = new StringBuffer();
- if (subQueryKey != null && subQueryKey.length() > 0)
- newSubQueryKey.append(action.getSubQueryKey()).append(':');
- newSubQueryKey.append(action.getNewSubQuery());
- FormTool formTool = (FormTool)action.getSelectedFormTool();
- FormToolPropertiesInterface parentFormToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
- FormToolPropertiesInterface subQueryFormToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(newSubQueryKey.toString());
- String newSubQueryItemString = action.getNewSubQueryItem();
- subQueryFormToolPI.setProperty(UDDIActionInputs.QUERY_ITEM,newSubQueryItemString);
- subQueryFormToolPI.setProperty(UDDIActionInputs.SUBQUERY_GET,new Boolean(action.isSubQueryGet()));
-
- // Always initialize the query name so the subquery makes sense.
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- String parentQueryName = (String)parentFormToolPI.getProperty(UDDIActionInputs.QUERY_NAME);
- if (parentQueryName == null)
- parentQueryName = uddiPerspective.getMessage("DEFAULT_QUERY_NAME");
- int newSubQueryItem = Integer.parseInt(newSubQueryItemString);
- String newSubQueryItemTypeString = null;
- switch (newSubQueryItem)
- {
- case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
- newSubQueryItemTypeString = uddiPerspective.getMessage("FORM_OPTION_BUSINESSES");
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICES:
- newSubQueryItemTypeString = uddiPerspective.getMessage("FORM_OPTION_SERVICES");
- break;
- case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
- default:
- newSubQueryItemTypeString = uddiPerspective.getMessage("FORM_OPTION_SERVICE_INTERFACES");
- }
- String[] messageParameters = {parentQueryName,newSubQueryItemTypeString};
- subQueryFormToolPI.setProperty(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("DEFAULT_SUBQUERY_NAME",messageParameters));
-
- Node node = action.getSelectedNavigatorNode();
- int nodeId = node.getNodeId();
- int toolId = node.getToolManager().getSelectedToolId();
- int viewId = node.getViewId();
- int viewToolId = node.getViewToolId();
-%>
-<script language="javascript">
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(SelectFindToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,newSubQueryKey.toString(),false)))%>";
-</script>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LoginAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LoginAdvancedActionJSP.jsp
deleted file mode 100644
index 2233b4baf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LoginAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body>
-<%
- // Prepare the action.
- LoginAdvancedAction action = new LoginAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LogoutAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LogoutAdvancedActionJSP.jsp
deleted file mode 100644
index e9ce7a89a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/LogoutAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,44 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- * yyyymmdd bug Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060427 136449 brunssen@us.ibm.com - Vince Brunssen
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body>
-<%
- // Prepare the action.
- LogoutAdvancedAction action = new LogoutAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = true; //action.populatePropertyTable(request);
-
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ManageReferencedServicesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ManageReferencedServicesActionJSP.jsp
deleted file mode 100644
index 9004073f0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ManageReferencedServicesActionJSP.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- ManageReferencedServicesAction action = new ManageReferencedServicesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!inputsValid)
- {
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
- }
- else
- {
- if (!action.isSubQueryInitiated())
- {
- action.execute();
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/NewNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/NewNodeAction.inc
deleted file mode 100644
index 2f9e480d1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/NewNodeAction.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%
- if (!inputsValid)
- {
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
- }
- else
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-
- if (actionResult)
- {
- // Ensure that the selected node is visible.
- controller.getUDDIPerspective().getNavigatorManager().makeSelectedNodeVisible();
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- navigatorContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/navigator_content.jsp"))%>";
- propertiesContainer.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_container.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/uddi_perspective_content.jsp"))%>";
-</script>
-<%
- }
- else
- {
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-<%
- }
- }
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/OpenRegistryActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/OpenRegistryActionJSP.jsp
deleted file mode 100644
index 2fc743aa2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/OpenRegistryActionJSP.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
-
- OpenRegistryAction action = new OpenRegistryAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp
deleted file mode 100644
index 10cbceab7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp
+++ /dev/null
@@ -1,91 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<%
- // Prepare the action.
- RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller);
-
- // The action may be executed via program link.
- action.populatePropertyTable(request);
- boolean isNodeDataValid = action.verifyNodeData();
-
- boolean inputsValid = true;
- String onLoadAction;
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- function processClearNodesForm()
- {
- var clearNodesForm = document.forms[0];
- var submitClearNodesForm = false;
-<%
- Vector staleNodes = action.getStaleNodes();
- for (int i=0;i<staleNodes.size();i++)
- {
- Node staleNode = (Node)staleNodes.elementAt(i);
-%>
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_NODE",staleNode.getNodeName()))%>"))
- {
- clearNodesForm.appendChild(createHiddenElement("<%=ActionInputs.NODEID%>",<%=staleNode.getNodeId()%>));
- submitClearNodesForm = true;
- }
-<%
- }
-%>
- if (submitClearNodesForm)
- clearNodesForm.submit();
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodesActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data">
-</form>
-<%
- if (!isNodeDataValid)
- {
- int nodeId = Integer.parseInt((String)(action.getPropertyTable().get(ActionInputs.NODEID)));
- String nodeName = uddiPerspective.getNavigatorManager().getNode(nodeId).getNodeName();
-%>
-<script language="javascript">
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_NODE",nodeName))%>"))
- perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ClearNavigatorNodeAction.getActionLink(nodeId)))%>";
-</script>
-<%
- }
- else
- {
-%>
-<script language="javascript">
- processClearNodesForm();
-</script>
-<%@ include file = "/uddi/actions/NewNodeAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp
deleted file mode 100644
index e7ef36708..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp
+++ /dev/null
@@ -1,66 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<jsp:include page="/scripts/formutils.jsp" flush="true"/>
-<%
- // Prepare the action.
- RefreshUDDINodesAction action = new RefreshUDDINodesAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- // Run the action
- boolean actionResult = action.execute();
-%>
-<script language="javascript">
- function processClearNodesForm()
- {
- var clearNodesForm = document.forms[0];
-<%
- Vector staleNodes = action.getStaleNodes();
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
- for (int i=0;i<staleNodes.size();i++)
- {
- Node staleNode = (Node)staleNodes.elementAt(i);
-%>
- if (confirm("<%=HTMLUtils.JSMangle(uddiPerspective.getMessage("MSG_QUESTION_REMOVE_NODE",staleNode.getNodeName()))%>"))
- clearNodesForm.appendChild(createHiddenElement("<%=ActionInputs.NODEID%>",<%=staleNode.getNodeId()%>));
-<%
- }
-%>
- clearNodesForm.submit();
- }
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<form action="<%=response.encodeURL(controller.getPathWithContext("uddi/actions/ClearNavigatorNodesActionJSP.jsp"))%>" target="<%=FrameNames.PERSPECTIVE_WORKAREA%>" method="post" enctype="multipart/form-data">
-</form>
-<script language="javascript">
- processClearNodesForm();
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp
deleted file mode 100644
index f2bc98300..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp
deleted file mode 100644
index 7eb43cb3d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindBusinessesAdvancedAction action = new RegFindBusinessesAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp
deleted file mode 100644
index 06be1f8f7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindBusinessesSimpleAction action = new RegFindBusinessesSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp
deleted file mode 100644
index 2d7274924..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServiceInterfaceUUIDAction action = new RegFindServiceInterfaceUUIDAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp
deleted file mode 100644
index c0edc8f0d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServiceInterfacesAdvancedAction action = new RegFindServiceInterfacesAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp
deleted file mode 100644
index 46ff1bb35..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServiceInterfacesSimpleAction action = new RegFindServiceInterfacesSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp
deleted file mode 100644
index 43638d7d3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp
deleted file mode 100644
index dc062c38f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp
deleted file mode 100644
index 981e75c16..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegFindServicesSimpleAction action = new RegFindServicesSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp
deleted file mode 100644
index 6e3a40e3a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- java.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishBusinessAdvancedAction action = new RegPublishBusinessAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp
deleted file mode 100644
index 00119e86e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishBusinessSimpleAction action = new RegPublishBusinessSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp
deleted file mode 100644
index 7247e095c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishServiceAdvancedAction action = new RegPublishServiceAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp
deleted file mode 100644
index ff7aa9219..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishServiceInterfaceAdvancedAction action = new RegPublishServiceInterfaceAdvancedAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp
deleted file mode 100644
index 8395f8eaf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishServiceInterfaceSimpleAction action = new RegPublishServiceInterfaceSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp
deleted file mode 100644
index 1f436023e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RegPublishServiceSimpleAction action = new RegPublishServiceSimpleAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (!action.isSubQueryInitiated())
- {
-%>
-<%@ include file="/uddi/actions/NewNodeAction.inc" %>
-<%
- }
- else
- {
-%>
-<%@ include file="/uddi/actions/LaunchSubQueryAction.inc" %>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp
deleted file mode 100644
index 2fcbcc296..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.constants.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RemovePublisherAssertionsAction action = new RemovePublisherAssertionsAction(controller);
-
- // Load the parameters for the action from the servlet request.
- boolean inputsValid = action.populatePropertyTable(request);
-
- if (inputsValid)
- {
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
- }
-%>
-
- <script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
- </script>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp
deleted file mode 100644
index 2824a932d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddipanes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- // Prepare the action.
- RemoveSubQueryItemAction action = new RemoveSubQueryItemAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute();
-%>
-<script language="javascript">
- propertiesContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/properties_content.jsp"))%>";
- statusContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/status_content.jsp"))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp
deleted file mode 100644
index fa983746f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
- // Create the action.
- ResizeUDDIFramesAction action = new ResizeUDDIFramesAction(controller);
-
- // Populate the action with the request properties.
- boolean result = action.populatePropertyTable(request);
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/uddiframesets.jsp" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
- if (result)
- {
- action.execute(false);
-
- UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-%>
-<script language="javascript">
- if (isMicrosoftInternetExplorer())
- {
- var perspectiveContentFrameset = getPerspectiveContentFrameset();
- var actionsContainerFrameset = getActionsContainerFrameset();
- perspectiveContentFrameset.setAttribute("cols","<%=uddiPerspective.getPerspectiveContentFramesetCols()%>");
- actionsContainerFrameset.setAttribute("rows","<%=uddiPerspective.getActionsContainerFramesetRows()%>");
- }
- else
- perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext("uddi/uddi_perspective_content.jsp"))%>";
-</script>
-<%
- }
-%>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp
deleted file mode 100644
index 4cbb193d2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp
+++ /dev/null
@@ -1,78 +0,0 @@
-<%
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*,
- org.uddi4j.util.*" %>
-
-<%
- String sessionId = request.getParameter(ActionInputs.SESSIONID);
- HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
- Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="<%=response.getLocale().getLanguage()%>">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<jsp:include page="/uddi/scripts/cbpanes.jsp" flush="true"/>
-<%
- // Prepare the action.
- SelectCategoryNodeAction action = new SelectCategoryNodeAction(controller);
-
- // Load the parameters for the action from the servlet request.
- action.populatePropertyTable(request);
-
- // Run the action and obtain the return code (fail/success).
- boolean actionResult = action.execute(false);
-
- CategoryNode selectedNode = (CategoryNode)action.getSelectedNode();
- NodeManager nodeManager = selectedNode.getNodeManager();
- Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
- int selectedNodeId = selectedNode.getNodeId();
-%>
-<script language="javascript">
-<%
- String treeContentVar = action.getTreeContentVar();
- if (previousSelectedNode != null)
- {
- if (treeContentVar != null)
- {
-%>
- <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
- }
- }
- String selectedNodeAnchorName = selectedNode.getAnchorName();
- if (treeContentVar != null)
- {