Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMKeywordImpl.java')
-rw-r--r--bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMKeywordImpl.java75
1 files changed, 0 insertions, 75 deletions
diff --git a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMKeywordImpl.java b/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMKeywordImpl.java
deleted file mode 100644
index f8b5594006..0000000000
--- a/bundles/org.eclipse.wst.css.core/src/org/eclipse/wst/css/core/internal/metamodelimpl/CSSMMKeywordImpl.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.css.core.internal.metamodelimpl;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMKeyword;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-
-class CSSMMKeywordImpl extends CSSMMNodeImpl implements CSSMMKeyword {
-
- public CSSMMKeywordImpl() {
- super();
- }
-
- public String getType() {
- return TYPE_KEYWORD;
- }
-
- public String getName() {
- String name = getAttribute(ATTR_NAME);
- if (name != null) {
- return name.toLowerCase();
- }
- else {
- return null;
- }
- }
-
- /*
- * @see CSSMMNodeImpl#canContain(CSSMMNode)
- */
- boolean canContain(CSSMMNode child) {
- return false;
- }
-
- /*
- * @see CSSMMKeyword#getKeywordString()
- */
- public String getKeywordString() {
- return fValue;
- }
-
- /*
- * @see Object#toString()
- */
- public String toString() {
- return getKeywordString();
- }
-
- void setKeywordString(String value) {
- fValue = value;
- }
-
- short getError() {
- if (getName() == null) {
- return MetaModelErrors.ERROR_NOT_DEFINED;
- }
- else if (getKeywordString() == null) {
- return MetaModelErrors.ERROR_NO_CHILD;
- }
- else {
- return MetaModelErrors.NO_ERROR;
- }
- }
-
-
- private String fValue = null;
-}

Back to the top

g/eclipse/jst/ws/axis/consumption/ui/plugin.properties118
-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.java49
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java176
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java163
-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/task/CheckAxisDeploymentDescriptorsTask.java85
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java308
-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.java65
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java278
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java654
-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.java290
-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.java511
-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.java130
-rw-r--r--bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java118
-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.java155
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore5
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/.project40
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF46
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/about.html22
-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.xml78
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties163
-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.java55
-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.java83
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java72
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java82
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java221
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java73
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java178
-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/BUCheckAxisDeploymentDescriptors.java21
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java269
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java121
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java135
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java286
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java21
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java207
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java224
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java172
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java329
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java174
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java127
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java213
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java125
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java224
-rw-r--r--bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java211
-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.java342
-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.consumption.ui/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore5
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/.project36
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF73
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/about.html22
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/build.properties8
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gifbin3222 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gifbin356 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gifbin591 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gifbin587 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gifbin231 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gifbin356 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gifbin2966 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gifbin3289 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gifbin574 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gifbin3422 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gifbin353 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gifbin565 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gifbin565 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gifbin364 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gifbin3460 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gifbin565 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gifbin563 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gifbin606 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties121
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml714
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd118
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd111
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd201
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd269
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd132
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties579
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java60
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java97
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java251
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java93
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java81
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java40
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java31
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java38
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java36
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java35
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java570
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java376
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java108
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java106
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java26
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java313
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java104
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java47
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java135
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java131
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java391
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java29
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java56
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java57
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java444
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java120
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java266
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java108
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java264
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java223
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java111
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java75
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java75
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java585
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java620
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java80
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java226
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java83
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java101
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java202
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java227
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java221
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java619
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java138
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java132
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java287
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java158
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java126
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java110
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java411
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java139
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java139
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java245
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java403
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java90
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java105
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java443
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java40
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java68
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java268
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java41
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java115
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java45
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java36
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java393
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java116
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java114
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java70
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java56
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java278
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java92
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java270
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java37
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java233
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java71
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java88
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java238
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java55
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java545
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java32
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java343
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java1485
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java729
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java255
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java348
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java59
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java416
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java125
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java174
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java73
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java64
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java105
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java52
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java95
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java54
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java30
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java188
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java235
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java50
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java114
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java74
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java34
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java35
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java206
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java172
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java169
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java36
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java331
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java33
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java59
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java96
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java842
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java193
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java193
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java80
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java26
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java41
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java41
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java41
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java41
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java41
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java41
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java41
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java25
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java43
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java65
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java75
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java157
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java524
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java52
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java147
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java117
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java143
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.java52
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java30
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java167
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java198
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java45
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java100
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java216
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java197
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java967
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java1439
-rw-r--r--bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java208
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/.classpath8
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/.cvsignore5
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/.project32
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF61
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/about.html22
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/build.properties10
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/plugin.properties19
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/plugin.xml50
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties183
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java235
-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.java89
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java115
-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.java144
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java436
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java113
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java224
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java85
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java120
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java95
-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.java113
-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.java141
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java120
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java90
-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.java79
-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/CopyWSDLCommand.java330
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java109
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java250
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java81
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java339
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java140
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java127
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java69
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java66
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java206
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java118
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java148
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java108
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java59
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java62
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java162
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java262
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java51
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java399
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java93
-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/JavaResourceFilter.java169
-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.java125
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java39
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java45
-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.java120
-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.java62
-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.java123
-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.java125
-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.java127
-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/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.java47
-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.java140
-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.java192
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java248
-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.java90
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java73
-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.java291
-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.java89
-rw-r--r--bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java139
-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.java110
-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.java229
-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.java64
-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.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/META-INF/MANIFEST.MF10
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html22
-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.xml74
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/.cvsignore5
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/.project34
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF44
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/about.html22
-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/export_ws_wiz.gifbin3365 -> 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/webservices_wiz.gifbin3322 -> 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.xml245
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties25
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java107
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java28
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java314
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java107
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java50
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java111
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java114
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java136
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java57
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java57
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java303
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java79
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java98
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java105
-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.java583
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java408
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java1330
-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.java172
-rw-r--r--bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java104
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore5
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/.project34
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF21
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/about.html22
-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/uddiprivateconfig_wiz.gifbin3574 -> 0 bytes-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties20
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml59
-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.java212
-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.java113
-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.java130
-rw-r--r--bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties55
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.cvsignore5
-rw-r--r--bundles/org.eclipse.jst.ws.ui/.project31
-rw-r--r--bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF32
-rw-r--r--bundles/org.eclipse.jst.ws.ui/about.html22
-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.xml79
-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.java221
-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.java212
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java245
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java323
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java131
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java48
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java114
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java219
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java52
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java307
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java156
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java316
-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.ui/src/org/eclipse/jst/ws/ui/plugin.properties143
-rw-r--r--bundles/org.eclipse.jst.ws/.classpath7
-rw-r--r--bundles/org.eclipse.jst.ws/.cvsignore5
-rw-r--r--bundles/org.eclipse.jst.ws/.project31
-rw-r--r--bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF50
-rw-r--r--bundles/org.eclipse.jst.ws/about.html22
-rw-r--r--bundles/org.eclipse.jst.ws/build.properties7
-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/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.java85
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java89
-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.java98
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java1156
-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.java1850
-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.java748
-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/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/context/PersistentProjectTopologyContext.java75
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java273
-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/ProjectTopologyContext.java33
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyDefaults.java34
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java73
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java97
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientProjectTopologyContext.java46
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java218
-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.java86
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java57
-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.java115
-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.java118
-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.java71
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java131
-rw-r--r--bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/plugin.properties16
-rw-r--r--bundles/org.eclipse.wst.command.env.core/.classpath7
-rw-r--r--bundles/org.eclipse.wst.command.env.core/.cvsignore7
-rw-r--r--bundles/org.eclipse.wst.command.env.core/.project28
-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.html22
-rw-r--r--bundles/org.eclipse.wst.command.env.core/build.properties10
-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/plugin.xml7
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/environment.properties24
-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/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/ClassEntry.java22
-rw-r--r--bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java272
-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.java392
-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/.cvsignore7
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/.project28
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF25
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/about.html22
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/build.properties9
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/plugin.properties18
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/plugin.xml7
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd106
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/environmentui.properties19
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/environment.properties13
-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.java579
-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/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.java136
-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/plugin/EnvUIPlugin.java38
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java242
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java105
-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/DynamicWizard.java389
-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.java226
-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.java79
-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.java136
-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.java469
-rw-r--r--bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java223
-rw-r--r--bundles/org.eclipse.wst.command.env/.classpath7
-rw-r--r--bundles/org.eclipse.wst.command.env/.cvsignore7
-rw-r--r--bundles/org.eclipse.wst.command.env/.options18
-rw-r--r--bundles/org.eclipse.wst.command.env/.project28
-rw-r--r--bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF21
-rw-r--r--bundles/org.eclipse.wst.command.env/about.html22
-rw-r--r--bundles/org.eclipse.wst.command.env/build.properties9
-rw-r--r--bundles/org.eclipse.wst.command.env/plugin.properties21
-rw-r--r--bundles/org.eclipse.wst.command.env/plugin.xml14
-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.java76
-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.java659
-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/common/environment.properties42
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java99
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java80
-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/BaseEclipseEnvironment.java27
-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/plugin/EnvPlugin.java38
-rw-r--r--bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java205
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.classpath9
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.cvsignore8
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.project28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF70
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/about.html22
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/build-war-pde.xml78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/build-war.xml59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/build.properties22
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/plugin.properties35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/plugin.xml47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil65
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/CatalinaRunnable.java59
-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.java229
-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/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/plugin/ExplorerPlugin.java195
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java121
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties181
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties145
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties495
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties155
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties163
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java124
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java81
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java72
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java127
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java218
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java80
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java121
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java163
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java88
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java104
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java122
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java229
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java233
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java92
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java104
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java76
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java134
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java163
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java121
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java215
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java87
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java109
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java135
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java92
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java137
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java117
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java192
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java118
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java118
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java110
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java109
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java90
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java161
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java62
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java224
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java27
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java102
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java109
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java94
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java126
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java450
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java253
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java105
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java75
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java242
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java242
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java53
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java81
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java63
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java53
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java103
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java217
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java266
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java374
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java249
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java238
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java254
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java72
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java112
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java315
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java119
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java112
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java378
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java119
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java112
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java392
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java121
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java269
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java370
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java239
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java158
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java216
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java228
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java83
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java76
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java83
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java229
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java425
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java79
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java148
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java133
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java115
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java165
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java185
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java409
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java127
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java490
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java336
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java209
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java48
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java541
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java111
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java230
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java110
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java76
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java104
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java103
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java19
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java62
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java124
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java140
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java126
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java239
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java74
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java116
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java508
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java396
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java69
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java189
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java25
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java247
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java101
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java145
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java96
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java89
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java284
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java168
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java100
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java135
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java70
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java90
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java124
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java92
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java48
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java233
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java339
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java271
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java18
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java16
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java16
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java20
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java22
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java23
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java14
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java15
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java18
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java104
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java174
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java90
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java87
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java102
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java188
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java189
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java238
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java120
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java223
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java119
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java298
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java167
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java168
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java261
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java229
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java149
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java119
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java103
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java114
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java96
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java21
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java64
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java370
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java21
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java98
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java192
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPException.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java491
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java143
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java95
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java95
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java96
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java128
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java83
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java155
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java104
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java183
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java90
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java94
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java94
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java86
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java75
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java31
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java26
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java24
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java460
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java53
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java96
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java105
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java86
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java48
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java41
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java153
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java139
-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/WEB-INF/web.xml3573
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp91
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp137
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp55
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc59
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp58
-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.inc108
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc182
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp70
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc77
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp48
-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.jsp44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp626
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_toolbar.jsp42
-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.css45
-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.jsp60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp61
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp62
-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.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/ResizeFavoritesFramesActionJSP.jsp53
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp27
-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/SwitchPerspectiveFromFavoritesActionJSP.jsp30
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_actions_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_content.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_navigator_toolbar.jsp66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_perspective_content.jsp42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_content.jsp73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_properties_toolbar.jsp82
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_content.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/fav_status_toolbar.jsp67
-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.jsp100
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp154
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp100
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp100
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSDLDetailsPage.jsp71
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/forms/FavoritesWSILDetailsPage.jsp72
-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.jsp126
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIRegistryView.jsp126
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp126
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteUDDIServiceView.jsp126
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSDLServiceView.jsp126
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/favorites/views/ListFavoriteWSILView.jsp128
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/.cvsignore2
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportToWorkbenchForm.jsp100
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ImportWSDLAndWSILToWorkbenchForm.jsp157
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/LaunchWebServiceWizardForm.jsp57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/forms/ProxyLoadContent.jsp73
-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.jsp45
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_content.jsp28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/perspective_toolbar.jsp77
-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.jsp28
-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.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddPublisherAssertionsActionJSP.jsp46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/AddToFavoritesActionJSP.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/BusPublishServiceSimpleActionJSP.jsp37
-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.jsp65
-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.jsp35
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/CompletePublisherAssertionsActionJSP.jsp46
-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/ManageReferencedServicesActionJSP.jsp67
-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.jsp36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodeActionJSP.jsp90
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RefreshUDDINodesActionJSP.jsp65
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessUUIDActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServiceUUIDActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesAdvancedActionJSP.jsp51
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegFindServicesSimpleActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RegPublishServiceSimpleActionJSP.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemovePublisherAssertionsActionJSP.jsp46
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/RemoveSubQueryItemActionJSP.jsp42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/ResizeUDDIFramesActionJSP.jsp54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/SelectCategoryNodeActionJSP.jsp77
-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.jsp51
-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.jsp57
-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.jsp58
-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.jsp42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/TransferToAddCategoryDataActionJSP.jsp44
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp54
-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.jsp36
-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.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateNewPublishActionJSP.jsp32
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateRegistryActionJSP.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceActionJSP.jsp86
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceInterfaceActionJSP.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp36
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/actions_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_browser.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_content.jsp113
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/category_toolbar.jsp44
-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/dWCommunity-data.txt2
-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.jsp259
-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.jsp293
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/GetForm.jsp217
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ItemsSummaryForm.jsp210
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManagePublisherAssertionsForm.jsp408
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ManageReferencedServicesForm.jsp231
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenPrivateRegistryForm.jsp111
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/OpenRegistryForm.jsp196
-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.jsp263
-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.jsp705
-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.jsp583
-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.jsp176
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceDetailsForm.jsp278
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/forms/ServiceInterfaceDetailsForm.jsp292
-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.jsp90
-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.jsp85
-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/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.jsp56
-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.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_content.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/navigator_toolbar.jsp66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_content.jsp76
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/properties_toolbar.jsp84
-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.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_content.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/status_toolbar.jsp66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/uddi/uddi_perspective_content.jsp42
-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.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/CreateInstanceActionJSP.jsp34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp138
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp172
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/OpenWSDLActionJSP.jsp58
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/RefreshWSDLActionJSP.jsp73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/ResizeWSDLFramesActionJSP.jsp54
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp33
-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.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp37
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp56
-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.jsp34
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLAddToFavoritesActionJSP.jsp40
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp65
-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.jsp43
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/FragmentsSoapView.jsp316
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/InvokeWSDLOperationForm.jsp164
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/OpenWSDLForm.jsp81
-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.jsp222
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/ReadOnlyFragmentsSoapView.jsp114
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLBindingDetailsForm.jsp111
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/forms/WSDLDetailsForm.jsp104
-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/XSDComplexFixWFragmentJSP.jsp75
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRFragmentJSP.jsp60
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp87
-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.jsp73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultRFragmentXML.jsp98
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDDefaultWFragmentJSP.jsp55
-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/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.jsp113
-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.jsp136
-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.jsp85
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfoDialog.jsp52
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_content.jsp47
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDInfo_toolbar.jsp50
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp78
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp97
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp93
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp149
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp72
-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.jsp124
-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.jsp87
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp128
-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.jsp141
-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.jsp183
-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.jsp33
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_actions_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_container.jsp28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_content.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_navigator_toolbar.jsp66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_perspective_content.jsp42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_content.jsp73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_properties_toolbar.jsp81
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_result_content.jsp72
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_container.jsp39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_content.jsp39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl/wsdl_status_toolbar.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_browser.jsp57
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp278
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_toolbar.jsp42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsexplorer.jsp88
-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.jsp34
-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.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/OpenWSILLinkActionJSP.jsp67
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/RefreshActionJSP.jsp63
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/ResizeWSILFramesActionJSP.jsp42
-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.jsp39
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp56
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp53
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp72
-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.jsp98
-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.jsp126
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/UddiServiceDetailsPage.jsp132
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WSILImportWSILToWorkbenchForm.jsp110
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsdlServiceDetailsPage.jsp148
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/forms/WsilDetailsPage.jsp88
-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.jsp84
-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.jsp157
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/UddiServicesView.jsp158
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsdlServicesView.jsp134
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/views/WsilLinksView.jsp130
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_actions_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_container.jsp28
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_content.jsp49
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_navigator_toolbar.jsp66
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_perspective_content.jsp42
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_content.jsp73
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_properties_toolbar.jsp81
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_container.jsp29
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_content.jsp38
-rw-r--r--bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsil/wsil_status_toolbar.jsp66
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.classpath7
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.cvsignore7
-rw-r--r--bundles/org.eclipse.wst.ws.parser/.project28
-rw-r--r--bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/about.html22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/build.properties7
-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.java171
-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.java547
-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.java22
-rw-r--r--bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/parser/plugin.properties22
-rw-r--r--bundles/org.eclipse.wst.ws.ui/.classpath7
-rw-r--r--bundles/org.eclipse.wst.ws.ui/.cvsignore6
-rw-r--r--bundles/org.eclipse.wst.ws.ui/.project28
-rw-r--r--bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF24
-rw-r--r--bundles/org.eclipse.wst.ws.ui/about.html22
-rw-r--r--bundles/org.eclipse.wst.ws.ui/build.properties7
-rw-r--r--bundles/org.eclipse.wst.ws.ui/plugin.properties19
-rw-r--r--bundles/org.eclipse.wst.ws.ui/plugin.xml35
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java121
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/preferences/WebServicesPreferencePage.java44
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java380
-rw-r--r--bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/properties/WSICompliancePropertyPage.java239
-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.ui/src/org/eclipse/wst/ws/ui/plugin.properties87
-rw-r--r--bundles/org.eclipse.wst.ws/.classpath7
-rw-r--r--bundles/org.eclipse.wst.ws/.cvsignore6
-rw-r--r--bundles/org.eclipse.wst.ws/.project28
-rw-r--r--bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF31
-rw-r--r--bundles/org.eclipse.wst.ws/about.html22
-rw-r--r--bundles/org.eclipse.wst.ws/build.properties8
-rw-r--r--bundles/org.eclipse.wst.ws/component.xml12
-rw-r--r--bundles/org.eclipse.wst.ws/plugin.properties31
-rw-r--r--bundles/org.eclipse.wst.ws/plugin.xml17
-rw-r--r--bundles/org.eclipse.wst.ws/schema/webServiceLocator.exsd121
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/BundleUtils.java26
-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.java151
-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.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java50
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java212
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/plugin/WSPlugin.java180
-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.java43
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSIContext.java163
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSISSBPContext.java32
-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/WSIComplianceUtils.java89
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/AbstractWebServiceLocator.java53
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/IWebServiceLocator.java27
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceFinder.java84
-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.java116
-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/IContext.java40
-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/IWebServiceTester.java18
-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.java252
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceClientInfo.java59
-rw-r--r--bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceInfo.java81
-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/.classpath10
-rw-r--r--bundles/org.eclipse.wst.wsdl/.cvsignore8
-rw-r--r--bundles/org.eclipse.wst.wsdl/.project28
-rw-r--r--bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF35
-rw-r--r--bundles/org.eclipse.wst.wsdl/about.html22
-rw-r--r--bundles/org.eclipse.wst.wsdl/build.properties25
-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/plugin.properties32
-rw-r--r--bundles/org.eclipse.wst.wsdl/plugin.xml95
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/model/HTTP.genmodel411
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/model/com.ibm.etools.wsdl.bindings.HTTP.cat378
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/model/http.ecore27
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/model/http.mdl32383
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java86
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java612
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java26
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/generator/HTTPContentGenerator.java267
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java251
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java252
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java127
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java252
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java412
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java150
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java150
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java333
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java32
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java336
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/model/MIME.genmodel428
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/model/com.ibm.etools.wsdl.bindings.MIME.cat630
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/model/mime.ecore44
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/model/mime.mdl32998
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java106
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java77
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java79
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java69
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java559
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java44
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java330
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java164
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java259
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java236
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java427
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java195
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java298
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java31
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java54
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java295
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/model/SOAP.genmodel429
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/model/com.ibm.etools.wsdl.bindings.SOAP.cat945
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/model/soap.ecore46
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/model/soap.mdl32688
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java34
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java35
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java113
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java35
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java48
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java159
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java25
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java33
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java1068
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java366
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java264
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java324
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java497
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java229
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java406
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java564
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java208
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java303
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java325
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java594
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java333
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java43
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java64
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java358
-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/model/WSDL.mdl31023
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/model/com.ibm.etools.WSDL.cat6997
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.ecore606
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/model/wsdl.genmodel393
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Binding.java137
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingFault.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingInput.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOperation.java160
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOutput.java104
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Definition.java291
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibilityElement.java89
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibleElement.java72
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Fault.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Import.java159
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Input.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Message.java110
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/MessageReference.java83
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Namespace.java89
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Operation.java208
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Output.java29
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Part.java200
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Port.java88
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/PortType.java110
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Service.java110
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Types.java46
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java51
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLElement.java142
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLFactory.java230
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java3650
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPlugin.java101
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPluginImplementation.java23
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java58
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java53
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java45
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java79
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BaseGenerator.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java611
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/ContentGenerator.java32
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/PortGenerator.java78
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionDescriptor.java42
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionFactoryRegistry.java158
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionRegistryReader.java63
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java419
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java786
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java420
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java797
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java420
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java2291
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java409
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java238
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java179
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java592
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java179
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java617
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java344
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java234
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java1201
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java179
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java765
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java438
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java635
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java628
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java334
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java320
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java1487
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java523
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java2506
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java414
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java52
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java229
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java138
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/Reconcilable.java23
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java1039
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java61
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java56
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java49
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java1074
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java155
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java31
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java69
-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.java19
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java16
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java148
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceFactoryRegistry.java133
-rw-r--r--bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java428
-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/.classpath7
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/.cvsignore6
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/.project28
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF39
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/about.html22
-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.xml105
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/LogBuilder.java434
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/Messages.java75
-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/WSIValidateAction.java296
-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.java225
-rw-r--r--bundles/org.eclipse.wst.wsi.ui/src/org/eclipse/wst/wsi/ui/internal/actions/icons/wsi_logfile_wiz.gifbin2549 -> 0 bytes-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/.classpath7
-rw-r--r--bundles/org.eclipse.wst.wsi/.cvsignore6
-rw-r--r--bundles/org.eclipse.wst.wsi/.project28
-rw-r--r--bundles/org.eclipse.wst.wsi/META-INF/MANIFEST.MF57
-rw-r--r--bundles/org.eclipse.wst.wsi/about.html22
-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.properties13
-rw-r--r--bundles/org.eclipse.wst.wsi/plugin.xml28
-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.java105
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsPlugin.java58
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java81
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java314
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java393
-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.java488
-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.java313
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.properties44
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/AnalyzerContext.java79
-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.java659
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/analyzer/CandidateInfo.java918
-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.java175
-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.java156
-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/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.java75
-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/impl/LogImpl.java219
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java784
-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.java135
-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.java176
-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.java543
-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.java50
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java222
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/EnvelopeValidator.java52
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/MessageValidator.java68
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/ProfileValidatorFactory.java96
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/UDDIValidator.java54
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/WSDLValidator.java55
-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.java1837
-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.java75
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/envelope/AP1920.java118
-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.java267
-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.java56
-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.java57
-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.java160
-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.java84
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java590
-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.java297
-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.java341
-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.java341
-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.java116
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2102.java203
-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.java420
-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.java82
-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.java111
-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.java2314
-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.java287
-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.java140
-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.java278
-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.java1720
-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.java171
-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.java577
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/UDDIUtils.java336
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/Utils.java1415
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/core/util/WSDLUtil.java154
-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.java293
-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.java384
-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.java3271
-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.java1528
-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.java54
-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/ReportNoWriterImpl.java84
-rw-r--r--bundles/org.eclipse.wst.wsi/src/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java369
-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.html22
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/axisconsumptionui-f1Contexts.xml39
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/axiscreationui-f1Contexts.xml105
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/build.properties6
-rw-r--r--docs/org.eclipse.jst.ws.axis.infopop/plugin.xml19
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/.cvsignore1
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/.project11
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/META-INF/MANIFEST.MF11
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/build.properties8
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/concepts/caxistover.html71
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/plugin.xml19
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsampappa.html119
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/tsklwsdla.html154
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/ttomcatserv.html60
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/tasks/twsbeana.html172
-rw-r--r--docs/org.eclipse.jst.ws.axis.ui.doc.user/wsaxisbuild_toc.xml15
-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.MF8
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/build.properties6
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/plugin.xml20
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/wsconsumptionui-f1Contexts.xml353
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/wscreationui-f1Contexts.xml70
-rw-r--r--docs/org.eclipse.jst.ws.consumption.infopop/wsui-f1Contexts.xml33
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/.cvsignore1
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/.project11
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/META-INF/MANIFEST.MF11
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/build.properties11
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cuddi.html109
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/concepts/cwsdlud.html126
-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/bindnode.gifbin382 -> 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.gifbin925 -> 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/opnode.gifbin1044 -> 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/scenario7.gifbin8218 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/servnode.gifbin457 -> 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.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.gifbin17184 -> 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.gifbin10112 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlfavicon.gifbin941 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlicon.gifbin952 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlnode.gifbin865 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlop.gifbin13770 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopret.gifbin13933 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlopretx.gifbin12274 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlservdet.gifbin14386 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wsdlstatx.gifbin20654 -> 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/wsilview.gifbin367 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/images/wswizicon.gifbin952 -> 0 bytes-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.properties3
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/plugin.xml20
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/ref/ruddi.html102
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/taddreg.html81
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tassert.html76
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbkmrk.html70
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tbusproj.html68
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tdiscov.html169
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tgenwsil.html79
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpubent.html114
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tpublish.html126
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/treg.html84
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tsampapp.html146
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tstrtexp.html124
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/ttestwsdl.html96
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tuddiexp.html183
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tunpub.html72
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/tupdate.html69
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdisc.html103
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/tasks/twsdlexp.html127
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptionbuild_toc.xml26
-rw-r--r--docs/org.eclipse.jst.ws.consumption.ui.doc.user/wsconsumptiont_toc.xml18
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/.cvsignore1
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/.project11
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/build.properties10
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cjaxrpc.html71
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cjsr109.html54
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/csoap.html135
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cws.html211
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsbtmup.html47
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsdl.html96
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsil.html109
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsilud.html89
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsinwsa.html157
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwsiover.html64
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/concepts/cwstopdown.html47
-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/plugin.properties3
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/plugin.xml20
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/ref/rwsdl.html82
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/ref/rwspref.html108
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/tasks/twsicomply.html77
-rw-r--r--docs/org.eclipse.jst.ws.doc.user/webservice_toc.xml68
-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.MF8
-rw-r--r--docs/org.eclipse.jst.ws.infopop/about.html22
-rw-r--r--docs/org.eclipse.jst.ws.infopop/build.properties5
-rw-r--r--docs/org.eclipse.jst.ws.infopop/plugin.xml19
-rw-r--r--docs/org.eclipse.jst.ws.infopop/webserviceui-f1Contexts.xml101
-rw-r--r--docs/org.eclipse.jst.ws.infopop/wsui-f1Contexts.xml33
-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.MF7
-rw-r--r--docs/org.eclipse.wst.ws.infopop/about.html22
-rw-r--r--docs/org.eclipse.wst.ws.infopop/build.properties5
-rw-r--r--docs/org.eclipse.wst.ws.infopop/plugin.xml8
-rw-r--r--docs/org.eclipse.wst.ws.infopop/webserviceui-f1Contexts.xml30
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/.cvsignore1
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/.project22
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/about.html22
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/build.properties12
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/concepts/cwsdled.html73
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/images/httpskel.gifbin13056 -> 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.gifbin13643 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/images/wsdleditor.gifbin14541 -> 0 bytes-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/plugin.xml27
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddmess.html84
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddoper.html69
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddpart.html61
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddport.html72
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/taddsrvc.html57
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtimpt.html56
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrttype.html68
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html73
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tedtwsdl.html149
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/timpwsdl.html86
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetbind.html97
-rw-r--r--docs/org.eclipse.wst.wsdl.ui.doc.user/tasks/tsetprtt.html96
-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.xml20
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/.cvsignore1
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/.project11
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/META-INF/MANIFEST.MF8
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/about.html22
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/build.properties8
-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/plugin.xml27
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/tmonitor.html106
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsdlval.html59
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/tasks/twsival.html58
-rw-r--r--docs/org.eclipse.wst.wsi.ui.doc.user/wswsitest_toc.xml17
-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.properties11
-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.xml107
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/license.html93
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplateFeature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplateFeature/epl-v10.html328
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplateFeature/feature.properties132
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplateFeature/license.html79
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplatePlugin/about.html27
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplatePlugin/about.ini31
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplatePlugin/about.mappings6
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplatePlugin/about.properties26
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplatePlugin/build.properties2
-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplatePlugin/eclipse32.gifbin1706 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplatePlugin/eclipse32.pngbin4594 -> 0 bytes-rw-r--r--features/org.eclipse.wst.ws_sdk.feature/sourceTemplatePlugin/plugin.properties12
-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.properties9
-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.xml60
-rw-r--r--features/org.eclipse.wst.ws_tests.feature/license.html93
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/.project17
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/build.properties9
-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.xml37
-rw-r--r--features/org.eclipse.wst.ws_userdoc.feature/license.html93
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.classpath7
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.cvsignore2
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/.project28
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF27
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/about.html22
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/build.properties9
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/plugin.xml6
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java160
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java144
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java135
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java32
-rw-r--r--tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java71
-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.java63
-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/META-INF/MANIFEST.MF36
-rw-r--r--tests/org.eclipse.jst.ws.tests/about.html22
-rw-r--r--tests/org.eclipse.jst.ws.tests/build.properties11
-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.xml6
-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.java208
-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.java98
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java134
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java205
-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.java99
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java66
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java46
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java99
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java67
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java359
-rw-r--r--tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java45
-rw-r--r--tests/org.eclipse.wst.ws.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.ws.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.ws.tests/.project28
-rw-r--r--tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF27
-rw-r--r--tests/org.eclipse.wst.ws.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.ws.tests/build.properties11
-rw-r--r--tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl45
-rw-r--r--tests/org.eclipse.wst.ws.tests/plugin.xml6
-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/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.java90
-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/ResourceUtilsTests.java20
-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.java38
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java99
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/DynamicPopupJUnitWizard.java43
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java67
-rw-r--r--tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/ScenarioConstants.java45
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/.classpath7
-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/about.html22
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/build.properties8
-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.java32
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java129
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java82
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java88
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java83
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java54
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java52
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java41
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java69
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java69
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java60
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java60
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java127
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/plugin.xml34
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.performance/test.xml237
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/.project30
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/about.html22
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/build.properties9
-rw-r--r--tests/org.eclipse.wst.wsdl.tests.ui/plugin.xml44
-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/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/.project37
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/build.properties19
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/plugin.xml26
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/samples/LoadAndPrintTest.wsdl38
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java47
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.java226
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.java193
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java33
-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.java230
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java513
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.java280
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java458
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java612
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java260
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java109
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java101
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java211
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java208
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java608
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java46
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java169
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java31
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java31
-rw-r--r--tests/org.eclipse.wst.wsdl.tests/test.xml53
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.wsi.tests/.project37
-rw-r--r--tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF19
-rw-r--r--tests/org.eclipse.wst.wsi.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.wsi.tests/build.properties10
-rw-r--r--tests/org.eclipse.wst.wsi.tests/plugin.xml6
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreWSDLConformanceTest.java289
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/RegressionBucket.java31
-rw-r--r--tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceAPTest.java72
-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/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.xml18
-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.xml18
-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
3000 files changed, 0 insertions, 476635 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 cb0105380..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"/>
- <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 e93bbd83e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis.jar
-@dot
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 846a39435..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.consumption.core</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env.core</project>
- </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/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index cfd394046..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +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.0
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.internal.axis.consumption.core.command,
- org.eclipse.jst.ws.internal.axis.consumption.core.common
-Require-Bundle: org.apache.ant,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.j2ee.web,
- org.apache.axis,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.wst.common.environment
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 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html> \ No newline at end of file
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 5da312238..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
- plugin.properties,\
- plugin.xml,\
- readme.html,\
- META-INF/,\
- about.html
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 5e9ff7c46..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.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=Web service Axis Consumption Core
-PLUGIN_PROVIDER=Eclipse.org
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 c911fbfbd..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
+++ /dev/null
@@ -1,15 +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>
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties
deleted file mode 100644
index 0038ec5d8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties
+++ /dev/null
@@ -1,46 +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
-###############################################################################
-
-#
-# 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
-MSG_AXIS_DEPLOY_OK=Web service successfuly deployed to Axis run-time environment
-
-TASK_LABEL_WSDL_JAVA_COMMAND=WSDL2JavaCommand
-TASK_DESC_WSDL_JAVA_COMMAND=Calls to AXIS WSDL2JavaCommand.
-#
-# Messages for Java2WSDLCommand
-#
-TASK_LABEL_JAVA_WSDL_COMMAND=Java2WSDLCommand
-TASK_DESC_JAVA_WSDL_COMMAND=Calls to AXIS Java2WSDLCommand.
-MSG_GENERATE_WSDL=Generating WSDL file: {0}
-MSG_ERROR_JAVA_WSDL_GENERATE=IWAB0398E Error in generating WSDL from Java
-
-#
-# Messages for WSDL2JavaCommand
-#
-TASK_LABEL_WSDL_JAVA_COMMAND=WSDL2JavaCommand
-TASK_DESC_WSDL_JAVA_COMMAND=Calls to AXIS WSDL2JavaCommand.
-MSG_PARSING_WSDL=Parsing WSDL file: {0}
-MSG_ERROR_WSDL_JAVA_GENERATE=IWAB0399E Error in generating Java from WSDL
-
-#
-# Messages common for all
-#
-MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET=IWAB0397E JavaWSDLParam not set
-
-#
-# Messages common for Java2WSDLCommand and WSDL2JavaCommand
-#
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 4881f14b7..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,165 +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.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.util.ResourceBundle;
-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.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.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;
-/**
- * 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$
-
- private JavaWSDLParameter javaWSDLParam;
- private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
- /**
- * Constructor for AxisDeployCommand.
- * @param String description
- * @param String name
- *
- */
- public AxisDeployCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (javaWSDLParam == null)
- {
- return StatusUtils.errorStatus(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
- }
-
- if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
- { //$NON-NLS-1$
- return StatusUtils.errorStatus(getMessage("MSG_ERROR_PROJECT_URL_PARAM_NOT_SET"));
- }
-
- if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
- {
- return StatusUtils.errorStatus(getMessage("MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET"));
- }
-
- ProgressUtils.report(monitor, getMessage("MSG_AXIS_DEPLOY"));
-
- IStatus 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() + 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(getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
- }
- return Status.OK_STATUS;
- }
-
- /**
- * Returns the message string identified by the given key from plugin.properties.
- *
- * @return The String message.
- */
- public String getMessage(String key)
- {
- return resource.getString(key);
- }
-
- /**
- * @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 218ed4ca2..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,296 +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.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.ResourceBundle;
-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.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 ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
- 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(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
- }
-
- if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
- { //$NON-NLS-1$
- return StatusUtils.errorStatus(getMessage("MSG_ERROR_PROJECT_URL_PARAM_NOT_SET"));
- }
-
- if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
- {
- return StatusUtils.errorStatus(
- getMessage("MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET"));
- }
-
- ProgressUtils.report(monitor, getMessage("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();
- }
-
-// Status[] childStatus = new Status[1];
-// childStatus[0] = new SimpleStatus("AxisDeployCommand", message, Status.ERROR);
-// return new SimpleStatus("AxisDeployCommand", //$NON-NLS-1$
-// getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-// }
-// return new SimpleStatus("AxisDeployCommand", //$NON-NLS-1$
-// getMessage("MSG_AXIS_DEPLOY_OK"), Status.OK);
- IStatus[] childStatus = new Status[1];
- childStatus[0] = StatusUtils.errorStatus( message);
- return StatusUtils.multiStatus(getMessage("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(getMessage("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(getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-
- }
- }
-
- /**
- * Returns the message string identified by the given key from plugin.properties.
- *
- * @return The String message.
- */
- public String getMessage(String key)
- {
- return resource.getString(key);
- }
-
- /**
- * @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 a5127b20b..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,195 +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.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.ResourceBundle;
-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.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.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.environment.ILog;
-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 ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$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(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (javaWSDLParam_.getBeanName() == null) {
- status = StatusUtils.errorStatus(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- ProgressUtils.report(monitor, getMessage("MSG_GENERATE_WSDL", javaWSDLParam_.getBeanName() ));
-
- return executeAntTask(environment);
- }
-
- protected IStatus executeAntTask(IEnvironment environment) {
-
- 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());
- }
- }
-
- Emitter emitter = new Emitter();
- emitter.createClasspath().setPath(javaWSDLParam_.getClasspath());
- environment.getLog().log(ILog.INFO, 5008, this, "executeAntTask", "Class Path = "+ javaWSDLParam_.getClasspath());
-
- emitter.setPortTypeName(javaWSDLParam_.getPortTypeName());
- environment.getLog().log(ILog.INFO, 5009, this, "executeAntTask", "Port Type Name = "+ javaWSDLParam_.getPortTypeName());
-
- emitter.setServiceElementName(javaWSDLParam_.getServiceName());
- environment.getLog().log(ILog.INFO, 5010, this, "executeAntTask", "Service Name = "+ javaWSDLParam_.getServiceName());
-
- emitter.setLocation(javaWSDLParam_.getUrlLocation());
- environment.getLog().log(ILog.INFO, 5011, this, "executeAntTask", "URL Location = "+ javaWSDLParam_.getUrlLocation());
-
- emitter.setMethods(javaWSDLParam_.getMethodString());
- environment.getLog().log(ILog.INFO, 5012, this, "executeAntTask", "Methods = "+ javaWSDLParam_.getMethodString());
-
- emitter.setStyle(javaWSDLParam_.getStyle());
- environment.getLog().log(ILog.INFO, 5013, this, "executeAntTask", "Style = "+ javaWSDLParam_.getStyle());
-
- emitter.setUse(javaWSDLParam_.getUse());
- environment.getLog().log(ILog.INFO, 5014, this, "executeAntTask", "Use = "+ javaWSDLParam_.getUse());
-
- emitter.setOutput(new File(javaWSDLParam_.getOutputWsdlLocation()));
- environment.getLog().log(ILog.INFO, 5015, this, "executeAntTask", "WSDL Location = "+ javaWSDLParam_.getOutputWsdlLocation());
-
- emitter.setNamespace(javaWSDLParam_.getNamespace());
- environment.getLog().log(ILog.INFO, 5016, this, "executeAntTask", "Name Space = "+ javaWSDLParam_.getNamespace());
-
- emitter.setClassName(javaWSDLParam_.getBeanName());
- environment.getLog().log(ILog.INFO, 5017, this, "executeAntTask", "Bean name = "+ javaWSDLParam_.getBeanName());
-
- emitter.setImplClass(javaWSDLParam_.getBeanName());
-
- 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();
- } catch (BuildException e) {
- environment.getLog().log(ILog.ERROR, 5018, this, "executeAntTask", e);
- IStatus status = StatusUtils.errorStatus(
- getMessage("MSG_ERROR_JAVA_WSDL_GENERATE") + " " //$NON-NLS-1$
- +e.getCause().toString());
- environment.getStatusHandler().reportError(status);
- return status;
- }
- return Status.OK_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_;
- }
-
- private String getMessage(String messageId, String parm1) {
- String message = resource.getString(messageId);
- return MessageFormat.format(message, new String[] { parm1 });
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public String getMessage(String key) {
- return resource.getString(key);
- }
-
- 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 541d3ee6f..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,215 +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.axis.consumption.core.command;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.GeneratedFileInfo;
-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.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.environment.ILog;
-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 JavaWSDLParameter javaWSDLParam;
- private String wsdlURI;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
- private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
-
- public WSDL2JavaCommand() {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status;
- if (javaWSDLParam == null) {
- status = StatusUtils.errorStatus(
- getMessage("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 (environment.getLog().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());
- }
- if (javaWSDLParam.isMetaInfOnly()) {
- // for the case Java2WSDL-WSDL2Java
- wsdl2Java.setOutputDir(removeFileProtocol(javaWSDLParam.getOutput()));
- 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
- wsdl2Java.setOutputDir(removeFileProtocol(javaWSDLParam.getJavaOutput()));
- if (javaWSDLParam.getMappings() != null) {
- wsdl2Java.setNamespaceMap(javaWSDLParam.getMappings());
- }
- }
- environment.getLog().log(ILog.INFO, 5019, this, "execute", "Java output = " + javaWSDLParam.getJavaOutput());
- if (javaWSDLParam.getHTTPPassword() != null) {
- wsdl2Java.setPassword(javaWSDLParam.getHTTPPassword());
- environment.getLog().log(ILog.INFO, 5081, this, "execute", "password: " + javaWSDLParam.getHTTPPassword());
- }
- if (javaWSDLParam.getHTTPUsername() != null) {
- wsdl2Java.setUsername(javaWSDLParam.getHTTPUsername());
- environment.getLog().log(ILog.INFO, 5082, this, "execute", "username: " + javaWSDLParam.getHTTPUsername());
- }
- environment.getLog().log(ILog.INFO, 5020, this, "execute", "WSDL Location = " + javaWSDLParam.getInputWsdlLocation());
- ProgressUtils.report(monitor, getMessage("MSG_PARSING_WSDL", javaWSDLParam.getInputWsdlLocation() ) );
- try {
- wsdl2Java.run(javaWSDLParam.getInputWsdlLocation());
- if (serverSide) {
- // set deployment files
- List deploymentFiles1 = wsdl2Java.getGeneratedFileInfo().findType(DEPLOY_TYPE);
- List deploymentFiles2 = wsdl2Java.getGeneratedFileInfo().findType(UNDEPLOY_TYPE);
- ArrayList deplFiles = new ArrayList();
- if (deploymentFiles1 != null && deploymentFiles2 != null) {
- deploymentFiles1.addAll(deploymentFiles2);
- for (int i = 0; i < deploymentFiles1.size(); i++) {
- GeneratedFileInfo.Entry entry = (GeneratedFileInfo.Entry) deploymentFiles1.get(i);
- deplFiles.add(entry.fileName);
- }
- String[] deplFilesArray = new String[deplFiles.size()];
- deplFiles.toArray(deplFilesArray);
- javaWSDLParam.setDeploymentFiles(deplFilesArray);
- }
- // set java files
- List javaFiles = wsdl2Java.getGeneratedFileNames();
- javaFiles.removeAll(deplFiles);
- String[] javaFileNames = new String[javaFiles.size()];
- javaFiles.toArray(javaFileNames);
- javaWSDLParam.setJavaFiles(javaFileNames);
- }
-
- } catch (Exception e) {
- environment.getLog().log(ILog.ERROR, 5021, this, "execute", e);
- status = StatusUtils.errorStatus(
- getMessage("MSG_ERROR_WSDL_JAVA_GENERATE") + " " //$NON-NLS-1$
- + e.toString());
- environment.getStatusHandler().reportError(status);
- return status;
- }
- return Status.OK_STATUS;
- }
-
- /*
- * 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;
- }
-
- private String getMessage(String messageId, String parm1) {
- String message = resource.getString(messageId);
- return MessageFormat.format(message, new String[]{parm1});
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- *
- * @return The String message.
- */
- public String getMessage(String key) {
- return resource.getString(key);
- }
-
- 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/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 c3da781b3..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,448 +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.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 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 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() {
- String methodString = ""; //$NON-NLS-1$
- 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;
- }
-
- /**
- * 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;
- }
-
-}
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 cb0105380..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"/>
- <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 bb8eaa839..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis-ui.jar
-@dot
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 cb0ee10ec..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.consumption.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.axis.consumption.core</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.consumption.ui</project>
- <project>org.eclipse.jst.ws.discovery.core</project>
- <project>org.eclipse.jst.ws.ui</project>
- <project>org.eclipse.wst.wsdl</project>
- <project>org.eclipse.wst.ws.parser</project>
- </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/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index dedeca474..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,46 +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.0
-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.axis.consumption.ui,
- org.eclipse.jst.ws.internal.axis.consumption.ui.command,
- org.eclipse.jst.ws.internal.axis.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.axis.consumption.ui.task,
- org.eclipse.jst.ws.internal.axis.consumption.ui.util,
- org.eclipse.jst.ws.internal.axis.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jem,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.modulecore,
- org.wsdl4j,
- org.apache.axis,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
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 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html> \ No newline at end of file
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 3abf85f7c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
+++ /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
-###############################################################################
-
-#
-# 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
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 197c57ee1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- J2EE Service Reference Generator -->
-
- <extension
- point="org.eclipse.jst.j2ee.WebServiceClientGenerator">
- <generator
- className="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientGenerator">
- <runtime
- serverTarget="Generic J2EE Container">
- </runtime>
- </generator>
- </extension>
-
- <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>
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties
deleted file mode 100644
index 5a9b0bbbb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties
+++ /dev/null
@@ -1,118 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-MSG_ERROR_DEFAULT_BEAN=IWAB0491E Error encountered while setting up default values for Java bean
-MSG_ERROR_READ_WSDL=IWAB0494E Error in reading WSDL file {0}
-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
-#
-TASK_LABEL_CLIENT_JAVA_WSDL_DEFAULTS=DefaultsForClientJavaWSDL
-TASK_DESC_CLIENT_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for client side.
-MSG_ERROR_WSDL_LOCATION_NOT_SET=IWAB0501E WSDL location not set.
-
-#
-#AddJarsToProjectBuildPathTask
-#
-TASK_LABEL_JARS_TO_PROJECT=AddJarsToProjectBuildPathTask
-TASK_DESC_JARS_TO_PROJECT=Add Jars to project build path.
-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
-#
-TASK_DESC_COPY_JARS_TO_PROJECT=CopyAxisJarCommand
-TASK_LABEL_COPY_JARS_TO_PROJECT=Copy required Axis runtime jars from plugin to web project.
-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
-#
-TASK_LABEL_REFESH_PROJECT=RefreshProjectTask
-TASK_DESC_REFESH_PROJECT=Refresh the files on the project with the local file system.
-MSG_ERROR_REFRESH_PROJECT=IWAB0508E Unable to refresh project.
-
-
-#
-#WebServiceAxisProxyFragment
-#
-
-#
-#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
-
-#
-# CheckAxisDeploymentDescriptorsTask
-#
-CHECK_WS_DD_TASK_DESCRIPTION=CheckAxisDeploymentDescriptorsTask
-CHECK_WS_DD_TASK_LABEL=CheckAxisDeploymentDescriptorsTask
-
-#
-#ClasspathUtils
-#
-MSG_ERROR_CLASSPATH_UTILS_IOEXCEPTION=IWAB0509E IOException in ClasspathUtils
-
-#
-# 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 CheckAxisDeploymentDescriptorsTask
-#
-MSG_ERROR_XML_FILE_OVERWRITE_DISABLED=IWAB0532E Do you want to overwrite the Apache Axis deployment descriptor?
-
-#
-#Messages for CopyClientWSDLCommand
-#
-TASK_DESC_COPY_CLIENT_WSDL=Copies WSDL to Client project
-TASK_LABEL_COPY_CLIENT_WSDL=Copy WSDL to Client project
-
-#
-#AxisClientInputCommand and AxisClientOutputCommand
-#
-
-TASK_LABEL_AXIS_CLIENT_INPUT=Axis client input commmand
-TASK_DESC_AXIS_CLIENT_INPUT=Axis client input commmand
-TASK_LABEL_AXIS_CLIENT_OUTPUT=Axis client output commmand
-TASK_DESC_AXIS_CLIENT_OUTPUT=Axis client output commmand
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 959002a71..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, 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.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 1f21ce548..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,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.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_;
-
- /**
- * Default CTOR
- */
- public AxisClientOutputCommand() {
- }
-
- public AxisClientOutputCommand(IWebServiceClient wsc, IContext context) {
- wsc_ = wsc;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
- return Status.OK_STATUS;
- }
-
- public void setProxyBean(String proxyBean) {
- this.proxyBean_ = proxyBean;
- }
-
-
-}
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 f7e03fcae..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,176 +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.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.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.parser.wsil.WebServicesParser;
-
-
-/**
- *
- */
-public class CopyClientWSDLCommand extends AbstractDataModelOperation
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- private MessageUtils msgUtils_;
- private String wsdlURL_;
- private String clientWSDLPathName_;
- private WebServicesParser wsParser_;
-
- public CopyClientWSDLCommand()
- {
- msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
- }
-
- 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( msgUtils_.getMessage("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( msgUtils_.getMessage("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( msgUtils_.getMessage("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 =
- WebServicePlugin.getInstance().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 d7e78075c..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,163 +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.axis.consumption.ui.command;
-
-
-import org.eclipse.core.resources.IFolder;
-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.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-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.MessageUtils;
-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 MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
-
- public DefaultsForClientJavaWSDLCommand( ) {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status;
- if (javaWSDLParam_ == null) {
- status = StatusUtils.errorStatus(
- coreMsgUtils_.getMessage(
- "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();
- javaWSDLParam_.setJavaOutput(output);
-
-
- IFolder webModuleContainer = ResourceUtils.getWebComponentServerRoot(proxyProject_);
- if (webModuleContainer !=null)
- {
- IPath webModulePath = webModuleContainer.getFullPath();
- //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
- IJavaProject javaProject = null;
-
- javaProject = JavaCore.create(proxyProject_);
- if (javaProject != null)
- {
- IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_);
- String output = ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
- javaWSDLParam_.setJavaOutput(output);
- javaWSDLParam_.setOutput(output);
- }
- else
- {
- //Not familiar with this kind of project
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"));
- environment.getStatusHandler().reportError(status);
- return status;
-
- }
- }
-
-
-
- if (WSDLServicePathname_ == null) {
-
- if (WSDLServiceURL_ == null) {
- status = StatusUtils.errorStatus(
- msgUtils_.getMessage(
- "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;
- }
-}
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 d7eb402eb..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, 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.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/task/CheckAxisDeploymentDescriptorsTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
deleted file mode 100644
index dcbe956d8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
+++ /dev/null
@@ -1,85 +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.axis.consumption.ui.task;
-
-import org.eclipse.core.resources.IFile;
-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.common.J2EEUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class CheckAxisDeploymentDescriptorsTask extends AbstractDataModelOperation {
-
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private IProject serverProject;
-
- public CheckAxisDeploymentDescriptorsTask( )
- {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- if(EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled()) {
- return status;
- }
-
- IPath filePath = null;
- IProject project = serverProject;
-
-
- filePath = J2EEUtils.getWebInfPath( project );
- filePath = filePath.append("/server-config.wsdd");
-
- if(filePath==null || filePath.isEmpty())
- {
- status = StatusUtils.errorStatus( coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
- if (file.exists() && !EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled()) {
- status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_ERROR_XML_FILE_OVERWRITE_DISABLED"));
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = StatusUtils.errorStatus( "User aborted");
- }
-
- return status;
- }
- return status;
- }
-
- public void setServerProject(IProject serverProject)
- {
- this.serverProject = serverProject;
- }
-}
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 cd0bc3b07..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,308 +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.axis.consumption.ui.task;
-
-
-import java.io.IOException;
-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.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.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.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.componentcore.ModuleCoreNature;
-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_RUNTIME_PLUGIN_ID = "org.apache.axis"; //$NON-NLS-1$
- public static String[] JARLIST = new String[] {
- "axis.jar",
- "commons-discovery-0.2.jar",
- "commons-logging-1.0.4.jar",
- "jaxrpc.jar",
- "saaj.jar",
- "wsdl4j-1.5.1.jar"
- };
- public static String PATH_TO_JARS_IN_PLUGIN = "lib/";
-
- private MessageUtils msgUtils_;
- private MessageUtils baseConMsgUtils_;
- private IProject project;
- private Boolean projectRestartRequired_ = Boolean.FALSE;
-
- /**
- * Default CTOR;
- */
- public CopyAxisJarCommand( ) {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- baseConMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- ProgressUtils.report(monitor, msgUtils_.getMessage("PROGRESS_INFO_COPY_AXIS_CFG"));
-
- ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(project);
- if (mn!=null)
- {
- copyAxisJarsToProject(project, status, env, monitor);
- }
- else
- {
- //Check if it's a plain old Java project
- IJavaProject javaProject = null;
-
- javaProject = JavaCore.create(project);
- if (javaProject != null)
- {
- status = addAxisJarsToBuildPath(project, env, monitor);
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- else
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("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 = ResourceUtils.getWebModuleServerRoot(project).getFullPath();
- IPath webModulePath = J2EEUtils.getWebContentPath( project );
- if (webModulePath == null) {
- status = StatusUtils.errorStatus( baseConMsgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"));
- env.getStatusHandler().reportError(status);
- return;
- }
-
- for (int i=0; i<JARLIST.length; ) {
- copyIFile("lib/"+JARLIST[i], webModulePath, "WEB-INF/lib/"+JARLIST[i++], status, env, monitor);
- if (status.getSeverity() == Status.ERROR)
- return;
- }
- return;
- }
-
- /**
- *
- */
- private void copyIFile(String source, IPath targetPath, String targetFile, IStatus status, IEnvironment env, IProgressMonitor monitor) {
- IPath target = targetPath.append(new Path(targetFile));
- ProgressUtils.report(monitor, baseConMsgUtils_.getMessage("PROGRESS_INFO_COPYING_FILE"));
-
- try {
- ResourceContext context = new TransientResourceContext();
- context.setOverwriteFilesEnabled(true);
- context.setCreateFoldersEnabled(true);
- context.setCheckoutFilesEnabled(true);
- URL sourceURL = BundleUtils.getURLFromBundle( AXIS_RUNTIME_PLUGIN_ID, 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( msgUtils_.getMessage("MSG_ERROR_FILECOPY"), e);
- env.getStatusHandler().reportError(status);
-
- }
- }
-
- public IStatus addAxisJarsToBuildPath(IProject p, IEnvironment env, IProgressMonitor monitor)
- {
- String[] jarNames = new String[JARLIST.length];
- for (int i=0; i<JARLIST.length; i++)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(PATH_TO_JARS_IN_PLUGIN);
- sb.append(JARLIST[i]);
- String jarName = sb.toString();
- jarNames[i] = jarName;
- }
-
- IStatus status = addJar(p, AXIS_RUNTIME_PLUGIN_ID, jarNames, env, monitor);
- if (status.getSeverity()==Status.ERROR)
- {
- return status;
- }
- return Status.OK_STATUS;
- }
-
-
- private IStatus addJar(IProject webProject, String pluginId, String[] jarNames, IEnvironment env, IProgressMonitor monitor)
- {
-
- IStatus status = Status.OK_STATUS;
- //
- // Get the current classpath.
- //
- IJavaProject javaProject_ = null;
- IClasspathEntry[] oldClasspath = null;
- javaProject_ = JavaCore.create(webProject);
- try
- {
- oldClasspath = javaProject_.getRawClasspath();
- } catch (JavaModelException jme)
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), jme);
- // env.getStatusHandler().reportError(status);
- return status;
- }
-
- ArrayList newJarNamesList = new ArrayList();
-
- for (int k = 0; k < jarNames.length; k++)
- {
- boolean found = false;
- for (int i = 0; i < oldClasspath.length; i++)
- {
- found = oldClasspath[i].getPath().toString().toLowerCase().endsWith(jarNames[k].toLowerCase());
- if (found)
- {
- break;
- }
- }
-
- if (!found)
- {
- newJarNamesList.add(jarNames[k]);
- }
- }
-
- if (newJarNamesList.size() > 0)
- {
- String[] newJarNames = (String[]) newJarNamesList.toArray(new String[] {});
-
- IClasspathEntry[] newClasspath = new IClasspathEntry[oldClasspath.length + newJarNames.length];
- int i = 0;
- while (i < oldClasspath.length)
- {
- newClasspath[i] = oldClasspath[i];
- i++;
- }
-
- try
- {
- int m = 0;
- while (i < newClasspath.length)
- {
- newClasspath[i] = JavaCore.newLibraryEntry(getTheJarPath(pluginId, newJarNames[m]), null, null);
- m++;
- i++;
- }
- } catch (CoreException e)
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), e);
- return status;
- }
-
- //
- // Then update the project classpath.
- //
- try
- {
- javaProject_.setRawClasspath(newClasspath, monitor);
- } catch (JavaModelException e)
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), e);
- return status;
- }
- }
-
- return status;
-
- }
-
- //
- // Returns the local native pathname of the jar.
- //
- private IPath getTheJarPath(String pluginId, String theJar)
- throws CoreException {
- try {
- if (pluginId != null) {
- URL localURL =
- Platform.asLocalURL(
- BundleUtils.getURLFromBundle( pluginId, theJar ) );
- return new Path(localURL.getFile());
- } else {
- return new Path(theJar);
- }
- } catch (MalformedURLException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisConsumptionUIPlugin.ID,
- 0,
- msgUtils_.getMessage("MSG_BAD_AXIS_JAR_URL"),
- e));
- } catch (IOException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisConsumptionUIPlugin.ID,
- 0,
- msgUtils_.getMessage("MSG_BAD_AXIS_JAR_URL"),
- e));
- }
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public boolean getProjectRestartRequired() {
- return projectRestartRequired_.booleanValue();
- }
-}
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 0a6c00e75..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, 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.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 7bb2f4eae..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,65 +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.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.wst.command.internal.env.core.common.MessageUtils;
-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;
- private MessageUtils msgUtils_;
-
- public RefreshProjectCommand()
- {
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
- }
-
- /**
- * 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( msgUtils_.getMessage("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 4189ea6f1..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,278 +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.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.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.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 IProject clientProject_;
-
- private MessageUtils msgUtils_;
-
- public Stub2BeanCommand(){
- super();
- portTypes_ = new Vector();
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * 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
- IJavaProject javaProject = null;
- javaProject = JavaCore.create(clientProject_);
- if (javaProject == null)
- {
- IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("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 = WSDLUtils.getPackageName(service, 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)
- {
- 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_);
- String portTypePkgName = WSDLUtils.getPackageName(portType, pkg2nsMapping);
- 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, 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 final char UNDERSCORE = '_';
-
- private String computeClassName(String className)
- {
- String classNameCopy = className;
- int i = classNameCopy.indexOf(UNDERSCORE);
- while (i != -1)
- {
- char c = classNameCopy.charAt(i+1);
- if (Character.isLowerCase(c))
- {
- StringBuffer sb = new StringBuffer();
- sb.append(classNameCopy.substring(0, i+1));
- sb.append(Character.toUpperCase(c));
- sb.append(classNameCopy.substring(i+2, classNameCopy.length()));
- classNameCopy = sb.toString();
- }
- i = classNameCopy.indexOf(UNDERSCORE, i+1);
- }
- char[] cArray = new char[classNameCopy.length()];
- boolean foundDigit = false;
- for (int j = 0; j < cArray.length; j++)
- {
- char c = classNameCopy.charAt(j);
- if (Character.isDigit(c))
- {
- cArray[j] = c;
- foundDigit = true;
- }
- else
- {
- if (foundDigit)
- cArray[j] = Character.toUpperCase(c);
- else
- cArray[j] = c;
- foundDigit = false;
- }
- }
- return new String(cArray);
- }
-
- /**
- * 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_;
- }
-}
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 90b6111e6..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,654 +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.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.StringTokenizer;
-import java.util.Vector;
-
-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.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-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.axis.consumption.ui.util.WSDLUtils;
-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.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-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_;
-
- 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 setPackage(String pkgName)
- {
- if (pkgName != null && pkgName.length() > 0)
- package_ = manglePackageName(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)
- {
- if (className != null && className.length() > 0)
- class_ = mangleClassName(className);
- }
-
- private String toFullyQualifiedClassName(String pkgName, String className)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(manglePackageName(pkgName));
- sb.append(".");
- sb.append(mangleClassName(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 manglePackageName(String s)
- {
- return replaceInvalidJavaChars(s);
- }
-
- private String mangleClassName(String s)
- {
- s = firstCharToUpperCase(WSDLUtils.resolveDotInPortName(s));
- return replaceInvalidJavaChars(s);
- }
-
- private String replaceInvalidJavaChars(String s)
- {
- char[] c = s.toCharArray();
- for (int i = 0; i < c.length; i++)
- {
- if (!Character.isJavaIdentifierPart(c[i]))
- c[i] = '.';
- }
- return new String(c);
- }
-
- private String firstCharToUpperCase(String s)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(s.substring(0, 1).toUpperCase());
- sb.append(s.substring(1, s.length()));
- return sb.toString();
- }
-
- 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
- {
- StringWriter sw = new StringWriter(2048);
- writePackage(sw);
- writeImports(sw);
- writeClass(sw);
- sw.close();
- byte[] bytes = sw.getBuffer().toString().getBytes();
- 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 sourceFolderPath = null;
- IPath filePath = null;
- ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(clientProject_);
- if (mn!=null)
- {
- sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_);
- IFolder sourceFolder = (IFolder)ResourceUtils.findResource(sourceFolderPath);
- filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();
- }
- else
- {
- // It's a plain old Java project
- JavaCore.create(clientProject_);
-
- sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_);
- IResource sourceFolderResource = ResourceUtils.findResource(sourceFolderPath);
- if (sourceFolderResource instanceof IFolder)
- {
- IFolder sourceFolder = (IFolder) sourceFolderResource;
- filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();
- } else
- {
- // The source must be going directly in the project
- filePath = clientProject_.getFile(new Path(sb.toString())).getFullPath();
- }
-
- }
-
- FileResourceUtils.createFile(WebServicePlugin.getInstance().getResourceContext(), filePath, 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);
- }
-
- 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(replaceInvalidJavaChars(WSDLUtils.resolveDotInPortName(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 2c9103c53..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, 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.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.wst.command.internal.env.core.common.MessageUtils;
-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();
- MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-
- 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( msgUtils_.getMessage("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 b5d87cbd7..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,290 +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.axis.consumption.ui.util;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Vector;
-
-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.Path;
-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.common.J2EEUtils;
-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$
-
- // workaround for Axis-2146 - lower case list of JARs that may include javax.activation.DataHandler
- private static String[] JARLIST = new String[] {
- "activation.jar",
- "geronimo-spec-activation-1.0.2-rc3.jar",
- "geronimo-spec-j2ee-1.4-rc3.jar",
- "geronimo-spec-activation-1.0.2-rc4.jar",
- "geronimo-spec-j2ee-1.4-rc4.jar"
- };
-
- 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;
- IFolder webModuleServerRoot = null;
-
- IVirtualComponent comp = ComponentCore.createComponent(project);
- if (comp != null) {
- // get the module's classpath
-
- if (J2EEUtils.isEARComponent(comp)) {
- moduleClasspath = getClasspathForEARProject(project, comp.getName());
- } else if (J2EEUtils.isWebComponent(comp) || J2EEUtils.isJavaComponent(comp)) {
- needJavaClasspath = true;
- webModuleServerRoot = J2EEUtils.getOutputContainerRoot(comp);
- if (webModuleServerRoot != null) {
- moduleClasspath = new String[] { webModuleServerRoot.getLocation().toOSString() };
- }
- }
-
- // add module classpath to project classpath
- for (int j = 0; j < moduleClasspath.length; j++) {
- projectClasspath.add(moduleClasspath[j]);
- }
-
- 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[] moduleClasspath = new String[0];
- ArrayList utilityJarsClasspath = new ArrayList();
-
- String module;
- IVirtualComponent comp = ComponentCore.createComponent(project);
- module = comp.getName();
- if (J2EEUtils.isEARComponent(comp)) {
- moduleClasspath = getClasspathForEARProject(project, module);
- for (int j = 0; j < moduleClasspath.length; j++) {
- utilityJarsClasspath.add(moduleClasspath[j]);
- }
- }
-
- return (String[]) utilityJarsClasspath.toArray(new String[utilityJarsClasspath.size()]);
- }
-
- 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++) {
- if (!excludeJar(buildPathString[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()]);
- }
-
- // workaround for Axis-2146 - exclude JARs which may include javax.activation.DataHandler
- // from the classpath passed to Axis emitter
-
- private boolean excludeJar(String buildPathString) {
-
- for (int i=0; i<JARLIST.length; i++) {
- if (buildPathString.toLowerCase().endsWith(JARLIST[i])) {
- return true;
- }
- }
- return false;
- }
-
- 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 52f98d9ec..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, 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.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 518496b0b..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, 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.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 8f1a0dab5..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,511 +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.axis.consumption.ui.util;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
-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;
-
-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 b26999ede..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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;
- }
-} \ 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/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 8fe929ee5..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.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.core.common.MessageUtils;
-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 )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- // 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( msgUtils.getMessage( "LABEL_MAPPING_PAIRS" ) );
- mappingLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
- List initValues = new ArrayList();
-
- if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML)
- {
- String[] columns = { msgUtils.getMessage("TABLE_COLUMN_LABEL_PACKAGE"),
- msgUtils.getMessage("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 = { msgUtils.getMessage("TABLE_COLUMN_LABEL_NAMESPACE"),
- msgUtils.getMessage("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 b8c300fbb..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,130 +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.consumption.ui.widgets;
-
-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.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 final String TOOLTIP_PWJB_PAGE = "TOOLTIP_PWJB_PAGE";
-
- private Text folderText_;
- /*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 final String TOOLTIP_PWJB_TEXT_FOLDER = "TOOLTIP_PWJB_TEXT_FOLDER";
-
- 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 final String TOOLTIP_PWJB_CHECKBOX_GENPROXY = "TOOLTIP_PWJB_CHECKBOX_GENPROXY";
-
- 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 )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
-
- parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PWJB_PAGE ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJB_PAGE);
-
- genProxyCheckbox_ = uiUtils.createCheckbox( parent, "CHECKBOX_GENPROXY",
- 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 );
-
- folderText_ = uiUtils.createText( textGroup, "LABEL_FOLDER_NAME",
- TOOLTIP_PWJB_TEXT_FOLDER,
- INFOPOP_PWJB_TEXT_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- folderText_.addListener( SWT.Modify, statusListener );
-
- showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
- "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();
-
- folderText_.setEnabled( enabled );
- showMappingsCheckbox_.setEnabled( enabled );
- }
-
- public void setProxyFolder( String proxyFolder )
- {
- folderText_.setText( proxyFolder );
- }
-
- public String getProxyFolder()
- {
- return folderText_.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 dc09eb23b..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,118 +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.consumption.ui.wizard.client;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-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.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-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.common.MessageUtils;
-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, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
- // AxisProxyWidget
- dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", ClientExtensionOutputCommand.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", WSDL2JavaCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Stub2BeanCommand.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)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- String axisPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- MessageUtils axisMsgUtils = new MessageUtils( axisPluginId_ + ".plugin", this );
-
- widgetRegistry.add( "AxisClientStart",
- axisMsgUtils.getMessage("PAGE_TITLE_WS_AXIS_PROXY"),
- axisMsgUtils.getMessage("PAGE_DESC_WS_AXIS_PROXY"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisProxyWidget();
- }
- } );
-
- widgetRegistry.add( "AxisClientBeanMapping",
- axisMsgUtils.getMessage("PAGE_TITLE_WS_XML2PROXY"),
- msgUtils.getMessage("PAGE_DESC_N2P_MAPPINGS"),
- 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 1970bcd74..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,155 +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 java.util.Vector;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-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.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-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 WSDL2JavaCommand());
- commands.add(new RefreshProjectCommand());
- commands.add(new Stub2BeanCommand());
- 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", WSDL2JavaCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", WSDL2JavaCommand.class, "WsdlURI", null); // URL
- // to
- // URI??
- // RefreshProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", RefreshProjectCommand.class, "Project", null);
- // Stub2BeanCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.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(Stub2BeanCommand.class, "ProxyBean", AxisClientOutputCommand.class, "ProxyBean", null);
-// 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 cb0105380..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"/>
- <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 eeab59f90..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-axis-ui.jar
-@dot
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 0a3d1e91a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.creation.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.axis.consumption.core</project>
- <project>org.eclipse.jst.ws.axis.consumption.ui</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.consumption.ui</project>
- <project>org.eclipse.jst.ws.creation.ui</project>
- <project>org.eclipse.jst.ws.discovery.core</project>
- <project>org.eclipse.jst.ws.ui</project>
- <project>org.eclipse.wst.wsdl</project>
- <project>org.eclipse.wst.ws.parser</project>
- </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/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index a818798ee..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,46 +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.0
-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.axis.creation.ui,
- org.eclipse.jst.ws.internal.axis.creation.ui.command,
- org.eclipse.jst.ws.internal.axis.creation.ui.plugin,
- org.eclipse.jst.ws.internal.axis.creation.ui.task,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl,
- org.eclipse.jst.ws.internal.axis.creation.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.axis.consumption.ui,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.jem.workbench,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.ws,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.web,
- org.wsdl4j,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jem.util,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
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 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html> \ No newline at end of file
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 9d1342e00..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
+++ /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
-###############################################################################
-
-#
-# 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 bd5f93ae3..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
+++ /dev/null
@@ -1,78 +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.BUCheckAxisDeploymentDescriptors"
- 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.TDCheckAxisDeploymentDescriptors"
- 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"/>
- </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"
- 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.java" version="1.3" allow-newer="true"/>
-
- </clientRuntime>
- </extension>
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
deleted file mode 100644
index 667e1516c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
+++ /dev/null
@@ -1,163 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-#
-# Error messages used in this plugin
-#
-MSG_ERROR_INTERAL=IWAB0512E Internal error
-MSG_ERROR_PROJECT_URL=IWAB0514E Unable to get URL for project {0}
-MSG_ERROR_READ_WSDL=IWAB0516E Error in reading WSDL file {0}
-MSG_ERROR_WSDL_NO_PORT=IWAB0518E WSDL file at {0} has no port element
-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_MOVE_RESOURCE=IWAB0523E Error moving resource
-MSG_ERROR_UPDATE_AXIS_WSDD=IWAB0524E Error updating Axis deploy.wsdd file
-MSG_ERROR_LITERAL_SUPPORT_MESSAGE=IWAB0536E Axis 1.1 support for Document/Literal and Document/Literal (Wrapped) is minimal, thus the generated code may contain errors. RPC/Encoded is the recommended style and encoding selection.
-MSG_ERROR_INITIAL_SELECTION=IWAB0018E Error getting initial selection.
-
-
-#
-#JavaToWSDLMethodCommand
-#
-TASK_LABEL_JAVA_TO_WSDL=Create deployment descriptor document model from Java bean.
-TASK_DESC_JAVA_TO_WSDL=Creating deployment descriptor document model from Java bean.
-MSG_ERROR_JAVA_TO_METHOD=IWAB0019E Error in getting method from Java bean.
-
-#
-#DefaultsForServerJavaWSDLTask
-#
-TASK_LABEL_SERVER_JAVA_WSDL_DEFAULTS=DefaultsForJavaWSDLServer
-TASK_DESC_SERVER_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for server side.
-
-#
-#UpdateWEBXMLCommand
-#
-TASK_LABEL_UPDATE_WEB_XML=UpdateWEBXMLCommand
-TASK_DESC_UPDATE_WEB_XML=Update project's web.xml file with Axis servlets
-MSG_ERROR_UPDATE_WEB_XML=IWAB0020E Error in adding servlet in web.xml.
-
-#
-#DefaultsForWSDL2SkeletonTask
-#
-
-#
-#MoveDeploymentFilesTask
-#
-TASK_LABEL_MOVE_DEPLOYMENT_FILES=MoveDeploymentFilesTask
-TASK_DESC_MOVE_DEPLOYMENT_FILES=Move deploy.wsdd and undeploy.wsdd from Java Source to Web Content/WEB-INF
-
-#
-#MoveJavaFilesTask
-#
-TASK_LABEL_MOVE_JAVA_FILES=MoveJavaFilesTask
-TASK_DESC_MOVE_JAVA_FILES=Move server side java files
-
-#
-#Skeleton2WSDLTask
-#
-TASK_LABEL_SKELETON_WSDL=DefaultsForSkeleton2WSDLTask
-TASK_DESC_SKELETON_WSDL=Creates WSDL for a Java bean skeleton.
-
-#
-#UpdateAxisWSDDFileTask
-#
-TASK_LABEL_UPDATE_AXIS_WSDD=UpdateAxisWSDDFileTask
-TASK_DESC_UPDATE_AXIS_WSDD=Update Axis deploy.wsdd with actual service implementation class name
-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.
-
-#
-#WebServiceSkeletonAxisConfigFragment
-#
-
-#
-#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:
-
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-WS_DESC_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-
-#
-#WebServiceAxisBeanClassFragment
-#
-
-#
-#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.
-
-#
-#WebServiceAxisBeanConfigFragment
-#
-
-#
-#WebServiceAxisBeanConfigPage
-#
-TOOLTIP_PBCF_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-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
-
-#
-#WSDLConsumptionTaskFactory
-#
-
-#
-#CopyAxisServerConfigTask
-#
-
-TASK_LABEL_COPY_SERVER_CONFIG_FILES=Copy server-config.wsdd from the server location to the Web Project
-TASK_DESC_COPY_SERVER_CONFIG_FILES=Coping server-config.wsdd from the server location to the Web Project
-
-#
-#BUAxisInputCommand and BUAxisOutputCommand
-#
-
-TASK_LABEL_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_DESC_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_LABEL_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-TASK_DESC_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-
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 0d1ce1173..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,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.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_;
-
- public AxisRunInputCommand() {
- }
-
- public AxisRunInputCommand(AxisWebService ws, String project) {
- ws_ = ws;
- serverProject_ = project;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- javaWSDLParam_ = ws_.getAxisWebServiceInfo().getJavaWSDLParameter();
-
- return Status.OK_STATUS;
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- 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/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 1ea105e6f..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,83 +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.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_;
-
- /**
- * 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();
-
- IServer serviceExistingServer=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_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
deleted file mode 100644
index adb2718db..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
+++ /dev/null
@@ -1,72 +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 java.util.List;
-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.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ComputeAxisSkeletonBeanCommand extends AbstractDataModelOperation
-{
- private List classNames;
- //private String wsdlURI;
- //private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParameter;
-
- public ComputeAxisSkeletonBeanCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- classNames = new Vector();
- if (javaWSDLParameter != null)
- {
- String beanName = javaWSDLParameter.getBeanName();
- if (beanName != null)
- classNames.add(beanName);
- }
- return Status.OK_STATUS;
- }
-
- public List getClassNames()
- {
- return classNames;
- }
-
- /**
- * @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 void setJavaWSDLParam(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/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 ecf057418..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,82 +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.axis.creation.ui.command;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-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.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- *
- * This command copies the server-config.wsdd file to it's proper location in the module.
- *
- */
-
-public class CopyDeploymentFileCommand extends AbstractDataModelOperation
-{
- private String projectName_;
-
- /**
- * Constructor for CopyDeploymentFileCommand.
- * @param String description
- * @param String name
- *
- */
- public CopyDeploymentFileCommand( String projectName )
- {
- projectName_ = projectName;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- try
- {
- IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_ );
- IFolder root = J2EEUtils.getOutputContainerRoot( component );
- IPath path = new Path( "WEB-INF" ).append( "server-config.wsdd" );
- IFile descriptorFile = root.getFile( path );
- IVirtualFile newLocation = component.getRootFolder().getFile( path );
- IPath targetPath = newLocation.getWorkspaceRelativePath();
- IFile targetFile = (IFile)ResourceUtils.findResource( targetPath );
-
- descriptorFile.refreshLocal( 0, null );
-
- if( targetFile != null && targetFile.exists() )
- {
- // The target file already exists so we will just overwrite its contents.
- targetFile.setContents( descriptorFile.getContents(), true, false, null );
- }
- else
- {
- // The target file doesn't exist so we will copy it.
- descriptorFile.copy( targetPath, true, null );
- }
- }
- catch( Throwable exc )
- {
- }
-
- return status;
- }
-}
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 cb5e35d08..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,221 +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.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.common.JavaMOFUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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_;
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public JavaToWSDLMethodCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- }
- /**
- * Default CTOR
- */
- public JavaToWSDLMethodCommand(
- JavaWSDLParameter javaParameter,
- IProject serviceProject) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- 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", msgUtils_.getMessage(
- "MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
- new String[] { qName }));
-
- status = StatusUtils.errorStatus(
- msgUtils_.getMessage(
- "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", msgUtils_.getMessage("MSG_ERROR_READ_BEAN"));
-
- status = StatusUtils.errorStatus(
- msgUtils_.getMessage(
- "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/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 183223875..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,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.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.ws.internal.wsrt.IWebService;
-
-
-public class TDAxisInputCommand extends AbstractDataModelOperation {
-
- private IWebService ws_;
- private String serverProject_;
-
- private String serverServer_;
- private String serviceServerTypeID_;
- private String wsdlURI_;
-
- /**
- * 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();
- serviceServerTypeID_ = ws_.getWebServiceInfo().getServerFactoryId();
- wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
-
- 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_;
- }
-
-}
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 8a4f69e3f..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,178 +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.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.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-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.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class UpdateWEBXMLCommand extends AbstractDataModelOperation {
-
- private MessageUtils msgUtils_;
- private IProject serverProject;
-
- public UpdateWEBXMLCommand( )
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- }
-
- 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;
- }
- 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(
- IProject webProject,
- ServletDescriptor servletDescriptor) {
-
- WebArtifactEdit webEdit = null;
- try {
- //
- WebApp webapp = null;
- IVirtualComponent vc = ComponentCore.createComponent(webProject);
- webEdit = WebArtifactEdit.getWebArtifactEditForWrite(vc);
- if (webEdit != null)
- {
- webapp = (WebApp) webEdit.getDeploymentDescriptorRoot();
-
- boolean foundServlet = false;
-
- List theServlets = webapp.getServlets();
- for (int i = 0; i < theServlets.size(); i++) {
- Servlet aServlet = (Servlet) theServlets.get(i);
- if (aServlet.getServletName().equals(servletDescriptor._name)) {
- foundServlet = true;
- }
- }
-
- if (foundServlet) {
- return Status.OK_STATUS;
- }
-
- 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);
- }
- }
-
- webEdit.save(new NullProgressMonitor());
- }
-
- return Status.OK_STATUS;
- } catch (Exception e) {
-
- return StatusUtils.errorStatus(
- msgUtils_.getMessage("MSG_ERROR_UPDATE_WEB_XML"),
- e);
- }
- finally{
- if (webEdit != null)
- webEdit.dispose();
- }
- }
-
- 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/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 17c333b38..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, 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.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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
- /**
- * 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/BUCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index e0d5f07e7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,21 +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.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class BUCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask
-{
- public BUCheckAxisDeploymentDescriptors()
- {
- }
-}
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 a361b0da3..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,269 +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.jst.ws.internal.axis.creation.ui.task;
-
-
-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.common.JavaWSDLParameter;
-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.MessageUtils;
-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.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation {
-
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private MessageUtils conMsgUtils_;
-
- 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$
-
- public DefaultsForServerJavaWSDLCommand( )
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- conMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
- }
-
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- IStatus status;
- if (javaWSDLParam_ == null) {
- status = StatusUtils.errorStatus( coreMsgUtils_.getMessage("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 ( ResourceUtils.isWebProject(serviceProject_)) {
- if (J2EEUtils.isWebComponent(serviceProject_)){
- moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_);
-
- // should use ModuleCore.getSourceContainers();
-// IContainer container = ResourceUtils.getWebModuleServerRoot(serviceProject_);
-// if (container!=null) {
-// moduleServerRoot = container.getFullPath();
-// }
-
- modulePath = J2EEUtils.getWebContentPath(serviceProject_);
- webinfPath = J2EEUtils.getWebInfPath( serviceProject_ );
-
- }
-
- } catch (Exception e) {
- status = StatusUtils.errorStatus( conMsgUtils_.getMessage("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( conMsgUtils_.getMessage("MSG_ERROR_WRITE_WSDL"), e );
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- String wsdlLocation = ResourceUtils.getWorkspaceRoot().getFile(wsdlPath).getLocation().toString();
-
- javaWSDLParam_.setOutputWsdlLocation(wsdlLocation);
- javaWSDLParam_.setInputWsdlLocation(wsdlLocation);
- 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 = ServerUtils.getEncodedWebComponentURL(serviceProject_, serviceServerTypeID_);
- if (projectURL == null) {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_PROJECT_URL"));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- String serviceURL = projectURL + SERVICE_EXT + simpleBeanName;
- javaWSDLParam_.setUrlLocation(serviceURL);
-
- javaWSDLParam_.setMetaInfOnly(true);
- // String javaOutput = PlatformUtils.getPlatformURL(moduleServerRoot);
- // String output = PlatformUtils.getPlatformURL(modulePath);
-
- String javaOutput = ResourceUtils.findResource(moduleServerRoot).getLocation().toString();
-// String javaOutput = ResourceUtils.getWorkspaceRoot().getFolder(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;
- }
-
- // rm
- /*
- public void setModel(Model model) {
- this.model_ = model;
- }
- */
-
- 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;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
deleted file mode 100644
index d993e8f8e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
+++ /dev/null
@@ -1,121 +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.axis.creation.ui.task;
-
-
-import java.io.File;
-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.Status;
-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.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 MoveDeploymentFilesTask extends AbstractDataModelOperation {
-
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private IProject serverProject;
- private String serviceServerTypeID_;
-
- private JavaWSDLParameter javaWSDLParam_;
-
- public MoveDeploymentFilesTask( )
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- }
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status = Status.OK_STATUS;
- if (javaWSDLParam_ == null) {
- status = StatusUtils.errorStatus(coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- IProject project = serverProject;
- //String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
- String projectURL = ServerUtils.getEncodedWebComponentURL(project, serviceServerTypeID_);
-
- if (projectURL == null) {
- status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] { project.toString()}));
- environment.getStatusHandler().reportError(status);
- return status;
- } else {
- javaWSDLParam_.setProjectURL(projectURL);
- }
-
- try {
- String[] deployFiles = javaWSDLParam_.getDeploymentFiles();
- String javaOutput = javaWSDLParam_.getJavaOutput();
-
- if (deployFiles == null || javaOutput == null) {
- return status;
- }
-
-
- IPath webinfPath = J2EEUtils.getWebInfPath(project );
-
- for (int i = 0; i < deployFiles.length; i++) {
- File f = new File(deployFiles[i]);
- String resourceToMove = f.getName();
- String targetFileName = ResourceUtils.getWorkspaceRoot().getFile(webinfPath.addTrailingSeparator().append(resourceToMove)).getLocation().toString();
- FileUtil.createTargetFile(deployFiles[i], targetFileName, true);
- File deploymentFile = new File(deployFiles[i]);
- deploymentFile.delete();
- deployFiles[i] = targetFileName;
- }
-
- } catch (Exception e) {
- status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[] { e.getLocalizedMessage()}), e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
-
- public void setServerProject(IProject serverProject)
- {
- this.serverProject = serverProject;
- }
-
- public void setServiceServerTypeID(String id)
- {
- serviceServerTypeID_ = id;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
deleted file mode 100644
index fe7083968..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
+++ /dev/null
@@ -1,135 +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.axis.creation.ui.task;
-
-
-import java.io.File;
-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.ServerUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 MoveJavaFilesTask extends AbstractDataModelOperation {
-
- private JavaWSDLParameter javaWSDLParam_;
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private IProject serviceProject_;
- private String serviceServerTypeID_;
-
- // rm private Model model_;
-
- public MoveJavaFilesTask() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- }
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- if (javaWSDLParam_ == null) {
- status = StatusUtils.errorStatus(coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // rm
- /*
- if (model_ == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
- return status;
- }
- */
-
- IProject project = serviceProject_;
- //String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
- String projectURL = ServerUtils.getEncodedWebComponentURL(project, serviceServerTypeID_);
- if (projectURL == null) {
- status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}));
- environment.getStatusHandler().reportError(status);
- return status;
-
- } else {
- javaWSDLParam_.setProjectURL(projectURL);
- }
-
- String[] javaFiles = javaWSDLParam_.getJavaFiles();
- String javaoutput = javaWSDLParam_.getJavaOutput(); // <webproject>/JavaSource
- String output = javaWSDLParam_.getOutput(); // <webproject>/WebContent/META_INF
-
- if(javaFiles == null || javaoutput == null && output == null ){
- return status;
- }
- try {
- for (int i = 0; i < javaFiles.length; i++) {
-// String resourceToMove = javaFiles[i].substring(output.length());
-// String targetFileName = javaoutput + resourceToMove;
-// File resultFile = new File(targetFileName);
- // copy java files that without overwtriting existing ones
-// if (!resultFile.exists()) {
-// FileUtil.createTargetFile(
-// javaFiles[i],
-// javaoutput + resourceToMove);
-// }
- // delete java files from the output directory
- File source = new File(javaFiles[i]);
- source.delete();
- }
- } catch (Exception e) {
- status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[]{e.getLocalizedMessage()}), e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-
- // rm
- /*
- public void setModel(Model model)
- {
- model_ = model;
- }
- */
-
- public void setServiceServerTypeID(String id)
- {
- serviceServerTypeID_ = id;
- }
-}
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 8b113ecdb..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,286 +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.task;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-import javax.wsdl.Binding;
-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.common.JavaWSDLParameter;
-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.command.common.CopyWSDLCommand;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-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 Skeleton2WSDLCommand extends AbstractDataModelOperation
-{
- private static final String IMPL = "Impl"; //$NON-NLS-1$
- private static final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- private static final String DOT = "."; //$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 MessageUtils msgUtils_;
-
- public Skeleton2WSDLCommand( ) {
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.creation.ui.plugin", this );
- }
-
- /**
- * Execute Skeleton2WSDLCommand
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- if (!(environment instanceof EclipseEnvironment))
- {
- IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_NOT_IN_ECLIPSE_ENVIRONMENT", new String[] {"Skeleton2WSDLCommand"}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
- if (javaWSDLParam == null)
- {
- IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("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) {
- StringBuffer beanName = new StringBuffer();
- beanName.append(WSDLUtils.getPackageName(definition));
- beanName.append(DOT);
- try{
- service = (Service) definition.getServices().values().iterator().next();
- port = (Port) service.getPorts().values().iterator().next();
- Binding binding = port.getBinding();
- beanName.append(binding.getQName().getLocalPart());
- beanName.append(IMPL);
- javaWSDLParam.setBeanName(beanName.toString());
-
- javaWSDLParam.setPortTypeName(WSDLUtils.getPortTypeName(definition));
- javaWSDLParam.setServiceName(
- WSDLUtils.getServiceElementName(definition));
- javaWSDLParam.setBeanPackage(WSDLUtils.getPackageName(definition));
- }
- catch(Throwable e){
- e.printStackTrace();
- }
- }
- else {
- IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION", new String[] {wsdlURL}));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // Modify WSDL endpoint
- if (port == null) {
- IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("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);
-
- }
-
- // copy WSDL
- CopyWSDLCommand copyWSDLCommand = new CopyWSDLCommand();
- copyWSDLCommand.setWebServicesParser(webServicesParser);
- copyWSDLCommand.setWsdlURI(wsdlURL);
- copyWSDLCommand.setDestinationURI(outputFile.getLocation().toFile().toURL().toString());
- copyWSDLCommand.setDefinition(definition);
- copyWSDLCommand.setEnvironment(environment);
- IStatus status = copyWSDLCommand.execute(null, null);
- if(status!=null && status.getSeverity()==Status.ERROR) {
- return status;
- }
- }
- catch (Exception e) {
- IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("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 = ResourceUtils.getEncodedWebProjectURL(serverProject);
- String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);
- if (projectURL == null)
- return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_PROJECT_URL", new String[] {serverProject.toString()}));
- 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;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index 31027b3bb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,21 +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.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class TDCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask
-{
- public TDCheckAxisDeploymentDescriptors()
- {
- }
-}
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 d4118fe22..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,207 +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.axis.creation.ui.task;
-
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-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.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.Platform;
-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.ui.util.FileUtil;
-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.ServerUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.common.BundleUtils;
-
-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 MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject serviceProject_;
- private String serviceServerTypeID_;
-
- public UpdateAxisWSDDFileTask()
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- }
-
- /**
- * Execute UpdateAxisWSDDFileTask
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status = Status.OK_STATUS;
- if (javaWSDLParam_ == null) {
- status = StatusUtils.errorStatus(coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // rm
- /*
- if (model_ == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
- return status;
- }
- */
-
- IProject project = serviceProject_;
- //String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
- String projectURL = ServerUtils.getEncodedWebComponentURL(project, serviceServerTypeID_);
- if (projectURL == null) {
- status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}));
- environment.getStatusHandler().reportError(status);
- return status;
- } else {
- javaWSDLParam_.setProjectURL(projectURL);
- }
- String outputLocation = javaWSDLParam_.getJavaOutput();
- if (outputLocation == null) {
- return status;
- }
-// try {
-// if (!project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-// return status;
-// } catch (Exception ex) {
-// status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_INTERAL"), Status.ERROR, ex);
-// environment.getStatusHandler().reportError(status);
-// return status;
-// }
-
-// String webContentPath = ResourceUtils.getWebModuleServerRoot(project).getLocation().toString();
- String webContentPath = J2EEUtils.getWebContentContainer( project ).getLocation().toString();
- try {
-
- if (javaWSDLParam_.getDeploymentFiles() != null
- && javaWSDLParam_.getDeploymentFiles().length > 0) {
-
- String wsdd_deploy = javaWSDLParam_.getDeploymentFiles()[0];
- Path deployPath = new Path(wsdd_deploy);
- String deployBackup =
- deployPath
- .removeLastSegments(1)
- .append(DEPLOY_BAK)
- .toString();
- FileUtil.createTargetFile(wsdd_deploy, deployBackup, true);
- String deployXSL = getPluginFilePath(DEPLOY_XSL).toString();
-
- 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(deployXSL));
- 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).
- transformer.transform(
- new StreamSource(deployBackup),
- new StreamResult(new FileOutputStream(wsdd_deploy)));
-
- }
-
- } catch (Exception e) {
- String[] errorMsgStrings = new String[]{project.toString(), outputLocation.toString(), webContentPath.toString()};
- status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_UPDATE_AXIS_WSDD", errorMsgStrings), e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- private IPath getPluginFilePath(String pluginfileName)
- throws CoreException {
- try {
-
- URL localURL =
- Platform.asLocalURL(
- BundleUtils.getURLFromBundle( WebServiceAxisCreationUIPlugin.ID, pluginfileName));
- return new Path(localURL.getFile());
- } catch (MalformedURLException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisCreationUIPlugin.ID,
- 0,
- msgUtils_.getMessage(
- "MSG_PLUGIN_FILE_URL"),
- e));
- } catch (IOException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisCreationUIPlugin.ID,
- 0,
- msgUtils_.getMessage(
- "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;
- }
-
- // rm
- /*
- public void setModel(Model model)
- {
- model_ = model;
- }
- */
- public void setServiceServerTypeID(String id)
- {
- serviceServerTypeID_ = id;
- }
-}
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 e119a4306..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,224 +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.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.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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;
-
- private MessageUtils msgUtils_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-
-// if (serviceIds_.getServerInstanceId() != null) { // server exists
-// serviceExistingServer_ = ServerCore.findServer(serviceIds_.getServerInstanceId());
-// }
-// if (serviceExistingServer_ != null)
-// {
-// serviceServerTypeID_ = serviceExistingServer_.getServerType().getId();
-// }
-// else
-// {
-// serviceServerTypeID_ = serviceIds_.getServerId();
-// // server will be created in ServerDeployableConfigurationCommand
-// }
-
- //javaWSDLParam
- javaWSDLParam_ = new JavaWSDLParameter();
-
-// if (initialSelection_ == null) {
-// Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-// msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION"), Status.ERROR);
-// env.getStatusHandler().reportError(status);
-// return status;
-// }
-
- if (javaBeanName_ == null) {
- IStatus status = StatusUtils.errorStatus(
- msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"));
- environment.getStatusHandler().reportError(status);
- return status;
- }
-// try {
-//
-// javaBeanName_ = getJavaBeanFromInitialSelection(environment);
-//
-// } catch (CoreException e) {
-// Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-// msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION") + " " //$NON-NLS-1$
-// +e.getCause().toString(), Status.ERROR);
-// 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/BeanClassWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
deleted file mode 100644
index 404c01acc..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
+++ /dev/null
@@ -1,172 +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.widgets.bean;
-
-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.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-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.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class BeanClassWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private String thisPlugin = "org.eclipse.jst.ws.axis.creation.ui";
- private IProject serverProject_ = null;
- private Composite parent_ = null;
- private IWizardContainer context_ = null;
- private JavaResourceFilter filter_ = new JavaResourceFilter();
- private IResource initialResource_ = null;
-
- /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/
- private String INFOPOP_PBCL_PAGE = "PBCL0001";
-
- private Text beanClassText_;
- /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/
- private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002";
-
- private Button beanClassBrowseButton_;
- /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
- private Button beanResourceBrowseButton_;
- /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004";
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, thisPlugin );
-
- parent_ = parent;
-
- Composite group = uiUtils.createComposite( parent, 4 );
-
- group.setToolTipText( msgUtils.getMessage("TOOLTIP_PBCL_PAGE") );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-
- beanClassText_ = uiUtils.createText( group, "LABEL_BEAN_CLASS_NAME",
- "TOOLTIP_PBCL_TEXT_BEAN_CLASS",
- INFOPOP_PBCL_TEXT_BEAN_CLASS,
- SWT.SINGLE | SWT.BORDER);
-
- beanClassBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_CLASSES",
- "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
- INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
- beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseClasses();
- }
- } );
-
- beanResourceBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_FILES",
- "TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE",
- INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE );
- beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseFiles();
- }
- } );
-
- return this;
- }
-
- private void handleBrowseClasses()
- {
- String className = DialogUtils.browseClasses( parent_.getShell(),
- serverProject_, context_ );
-
- if (className!=null) beanClassText_.setText(className);
-
- }
-
- private void handleBrowseFiles()
- {
- IResource topResource = serverProject_;
-
- if (topResource == null)
- {
- topResource = ResourceUtils.getWorkspaceRoot();
- }
-
- IResource resource
- = DialogUtils.browseResources( parent_.getShell(),
- topResource,
- initialResource_,
- filter_ );
-
- if( resource != null )
- {
- IPath path = resource.getFullPath();
- String basename = path.lastSegment();
-
- if( basename != null && basename.length() > 0 )
- {
- String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
- String beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
-
- if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
- {
- beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
- }
-
- beanClassText_.setText(beanClass);
- }
- }
- }
-
- public void setCurrentPage( IWizardPage page )
- {
- context_ = page.getWizard().getContainer();
- }
-
- public void setBeanClassName(String beanClassName)
- {
- beanClassText_.setText(beanClassName);
- }
-
- public String getBeanClassName()
- {
- return beanClassText_.getText().trim();
- }
-
- public void setServerProjectName( String name )
- {
- serverProject_ = (IProject)ResourceUtils.findResource( new Path( name ).makeAbsolute() );
- }
-
- public void setInitialResource( IResource resource )
- {
- initialResource_ = resource;
- }
-
-}
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 b8e08fb7e..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,329 +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.widgets.bean;
-
-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.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.MessageUtils;
-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 String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
-
- 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 final String TOOLTIP_PBCF_PAGE = "TOOLTIP_PBCF_PAGE";
-
- 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 final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-
- private Text wsdlFolderText_;
- /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-
- 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 final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-
- 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 final String TOOLTIP_PBME_TREE_METHODS = "TOOLTIP_PBME_TREE_METHODS";
-
- 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 final String TOOLTIP_PBME_BUTTON_SELECT_ALL = "TOOLTIP_PBME_BUTTON_SELECT_ALL";
-
- 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 final String TOOLTIP_PBME_BUTTON_DESELECT_ALL = "TOOLTIP_PBME_BUTTON_DESELECT_ALL";
-
- 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 baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- MessageUtils baseConUtils = new MessageUtils( baseConPluginId + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
- UIUtils baseConUiUtils = new UIUtils( baseConUtils, pluginId_ );
-
- statusListener_ = statusListener;
- parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBCF_PAGE ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PBCF_PAGE );
-
- Composite configGroup = uiUtils.createComposite( parent, 2 );
-
- uriText_ = uiUtils.createText( configGroup, "LABEL_URI",
- TOOLTIP_PBCF_TEXT_URI,
- INFOPOP_PBCF_TEXT_URI,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- wsdlFolderText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FOLDER_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
- INFOPOP_PBCF_TEXT_WSDL_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- wsdlFileText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FILE_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FILE,
- INFOPOP_PBCF_TEXT_WSDL_FILE,
- SWT.SINGLE | SWT.BORDER );
- wsdlFileText_.addListener( SWT.Modify, statusListener );
-
- uiUtils.createHorizontalSeparator( parent, 6 );
-
- // TODO this group has no TOOLTIP or INFOPOP.
- Group methodsGroup = baseConUiUtils.createGroup( parent, "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, 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, "BUTTON_SELECT_ALL",
- 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, "BUTTON_DESELECT_ALL",
- 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, "LABEL_STYLE_USE", null, null );
-
- // TODO radio buttons have no TOOLTIP or INFOPOP.
- docLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_DOC_LITERAL", null, null );
- rpcLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_LITERAL", null, null );
- rpcEncodedButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_ENCODED", null, null );
-
- showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_BEAN2XML",
- "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();
-
- // TODO Verify that we need to find the WSDL in the eclipse file system.
- //IFile file
- // = ResourceUtils.getWorkspaceRoot().getFileForLocation(new Path(wsdlLocation));
- //IPath wsdlPath = file.getFullPath();
- IPath wsdlPath = new Path( wsdlLocation );
-
- wsdlFolderText_.setText(wsdlPath.removeLastSegments(1).toString());
- wsdlFileText_.setText(wsdlPath.lastSegment());
-
- String location = javaParameter.getUrlLocation();
- uriText_.setText(location == null ? "" : location);
-
- 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( wsdlFolderText_.getText().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(wsdlLocation);
-
- 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;
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- if( wsdlFileText_.getText().equals( "" ) )
- {
- result = StatusUtils.errorStatus( msgUtils.getMessage( "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( msgUtils.getMessage( "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 2b0fe4a03..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,174 +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.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.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 MessageUtils msgUtils_;
- 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();
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
- 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(msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"));
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- }
- }
-
- if (javaBeanName==null || javaBeanName.length()==0)
- {
- IStatus errorStatus = StatusUtils.errorStatus(msgUtils_.getMessage("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(msgUtils_.getMessage("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( msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }));
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- } catch (CoreException ce)
- {
- IStatus errorStatus = StatusUtils.errorStatus( msgUtils_.getMessage("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 ed1c61239..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,127 +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.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);
- 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();
- }
-
-} \ 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/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 9be41d977..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,213 +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.widgets.skeleton;
-
-import java.io.File;
-import java.net.MalformedURLException;
-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.common.ResourceUtils;
-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.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 static final String TOOLTIP_PBSC_PAGE = "TOOLTIP_PBSC_PAGE";
-
- // 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 final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-
- private Text wsdlFolderText_;
- /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-
- 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 final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-
- 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$
- private static final String TOOLTIP_PBSC_TEXT_SKELETON_FOLDER = "TOOLTIP_PBSC_TEXT_SKELETON_FOLDER";
- //
-
- /* 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$
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- String conPluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- String baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
-
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- MessageUtils conMsgUtils = new MessageUtils( conPluginId + ".plugin", this );
- MessageUtils baseConMsgUtils = new MessageUtils( baseConPluginId + ".plugin", this );
- UIUtils uiUtils = new UIUtils( msgUtils, pluginId );
- UIUtils conUiUtils = new UIUtils( conMsgUtils, pluginId );
- UIUtils baseConUiUtils = new UIUtils( baseConMsgUtils, pluginId );
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PBSC_PAGE );
- parent.setToolTipText( msgUtils.getMessage( 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 );
- */
-
- wsdlFolderText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FOLDER_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
- INFOPOP_PBCF_TEXT_WSDL_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- wsdlFileText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FILE_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FILE,
- INFOPOP_PBCF_TEXT_WSDL_FILE,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- skeletonFolderText_ = baseConUiUtils.createCombo( textGroup, "LABEL_SKELETON_ROOT_NAME",
- TOOLTIP_PBSC_TEXT_SKELETON_FOLDER,
- INFOPOP_PBSC_TEXT_SKELETON_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- uiUtils.createHorizontalSeparator( parent, 5 );
-
- showMappingsCheckbox_ = conUiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
- "TOOLTIP_N2P_SHOW_MAPPINGS",
- INFOPOP_N2P_SHOW_MAPPINGS );
-
- return this;
- }
-
- public void setEndpointURI(String endpointURI)
- {
- /*
- if (endpointURI != null)
- uriText_.setText(endpointURI);
- */
- }
-
- public void setOutputWSDLFolder(String outputWSDLFolder)
- {
- if (outputWSDLFolder != null)
- wsdlFolderText_.setText(outputWSDLFolder);
- }
-
- public void setOutputWSDLFile(String outputWSDLFile)
- {
- if (outputWSDLFile != null)
- wsdlFileText_.setText(outputWSDLFile);
- }
-
- 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() {
- String root = getWorkspaceRootLocation();
- File file = new File(root);
- try
- {
- root = file.toURL().toString();
- char lastChar = root.charAt(root.length()-1);
- if (lastChar == '/' || lastChar == '\\')
- root = root.substring(0, root.length()-1);
- }
- catch (MalformedURLException murle)
- {
- }
- javaWSDLParam.setOutput(root + wsdlFolderText_.getText());
- javaWSDLParam.setJavaOutput(root + skeletonFolderText_.getText());
- return javaWSDLParam;
- }
-
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setServerProject(IProject 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();
- }
-} \ 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/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 ad50e0156..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,125 +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.widgets.skeleton;
-
-import java.io.File;
-import java.net.MalformedURLException;
-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;
-
- public SkeletonConfigWidgetDefaultingCommand( )
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- String root = getRootURL();
- javaWSDLParam.setOutput( root + getOutputWSDLFolder());
- javaWSDLParam.setJavaOutput(root + getOutputJavaFolder());
- 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;
- }
-
- private String getRootURL()
- {
- String rootURL = ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().toString();
- File file = new File( rootURL );
-
- try
- {
- rootURL = file.toURL().toString();
-
- char lastChar = rootURL.charAt(rootURL.length()-1);
-
- if (lastChar == '/' || lastChar == '\\')
- {
- rootURL = rootURL.substring(0, rootURL.length()-1);
- }
- }
- catch (MalformedURLException murle)
- {
- }
-
- return rootURL;
- }
-} \ 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/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 6d27e68fd..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,224 +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.axis.creation.ui.wizard.beans;
-
-
-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.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-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.common.MessageUtils;
-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
-
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
-
- //AxisMappingsWidget - as target
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AxisMappingsWidget.class);
-
- //AxisMappingsWidget - as source
-
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.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)
- {
- String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- /*
- widgetRegistry.add( "BeanSelection",
- msgUtils.getMessage("PAGE_TITLE_WSBEAN_CLASS"),
- msgUtils.getMessage("PAGE_DESC_WSBEAN_CLASS"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new BeanClassWidget();
- }
- } );
- */
-
- widgetRegistry.add( "BeanConfig",
- msgUtils.getMessage("PAGE_TITLE_WSBEAN_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_WSBEAN_CONFIG"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new BeanConfigWidget();
- }
- } );
-
- String consPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- MessageUtils consMsgUtils = new MessageUtils( consPluginId_ + ".plugin", this );
-
- widgetRegistry.add( "AxisServiceBeanMapping",
- consMsgUtils.getMessage("PAGE_TITLE_WS_BEAN2XML"),
- consMsgUtils.getMessage("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 2cb0d6e94..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,211 +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.axis.creation.ui.wizard.wsdl;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-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.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.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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, "OutputWSDLFolder", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputWSDLFile", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputJavaFolder", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", SkeletonConfigWidget.class);
-
- // 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(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.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)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- /*
- widgetRegistry.add( "WSDLSelection",
- msgUtils.getMessage("PAGE_TITLE_WS_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WS_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionWidget();
- }
- } );
-
- widgetRegistry.add( "WSDLSelectionTreeWidget",
- msgUtils.getMessage("PAGE_TITLE_WSDL_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WSDL_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionTreeWidget();
- }
- });
- */
-
- widgetRegistry.add( "SkeletonConfig",
- msgUtils.getMessage("PAGE_TITLE_WSSKEL_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_WSSKEL_CONFIG"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new SkeletonConfigWidget();
- }
- } );
-
- widgetRegistry.add( "AxisMappingsWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_XML2BEAN"),
- msgUtils.getMessage("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 eeb2eb3c0..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,342 +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 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.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-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.consumption.ui.task.ValidateWSDLCommand;
-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.ComputeAxisSkeletonBeanCommand;
-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.TDAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.BUCheckAxisDeploymentDescriptors;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveDeploymentFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveJavaFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.TDCheckAxisDeploymentDescriptors;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-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.OpenJavaEditorCommand;
-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 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 BUCheckAxisDeploymentDescriptors());
- commands.add(new CopyAxisJarCommand());
- commands.add(new WaitForAutoBuildCommand());
- commands.add(new Java2WSDLCommand());
- commands.add(new RefreshProjectCommand());
- commands.add(new WSDL2JavaCommand());
- commands.add(new MoveJavaFilesTask());
- commands.add(new UpdateAxisWSDDFileTask());
- commands.add(new UpdateWEBXMLCommand());
- 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 TDCheckAxisDeploymentDescriptors());
- commands.add(new CopyAxisJarCommand());
- commands.add(new WSDL2JavaCommand());
- commands.add(new MoveDeploymentFilesTask());
- commands.add(new Skeleton2WSDLCommand());
- commands.add(new UpdateWEBXMLCommand());
- commands.add(new RefreshProjectCommand());
- commands.add(new BuildProjectCommand());
- commands.add(new AxisOutputCommand(this));
-
- } else {
- 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) {
- 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));
- if (getWebServiceInfo().getServerFactoryId().equals("org.eclipse.jst.server.geronimo.10")) {
- commands.add(new GeronimoAxisDeployCommand(project));
- }
- else {
- commands.add(new AxisDeployCommand());
- }
- commands.add( new CopyDeploymentFileCommand( project ) );
- commands.add(new RefreshProjectCommand());
- if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
- commands.add(new ComputeAxisSkeletonBeanCommand());
- commands.add(new OpenJavaEditorCommand());
- }
- 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 );
-
- //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(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
-
- //CheckAxisDeploymentDescriptorsTask
- //registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", CheckAxisDeploymentDescriptorsTask.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BUCheckAxisDeploymentDescriptors.class, "ServerProject", new StringToIProjectTransformer());
-
- //CopyAxisJarCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-
- //Java2WSDLCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", Java2WSDLCommand.class);
-
- //RefreshProjectCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
- //WSDL2JavaCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-
-
- //MoveJavaFilesTask
- registry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveJavaFilesTask.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", MoveJavaFilesTask.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", MoveJavaFilesTask.class);
-
- //UpdateAxisWSDDFileTask
- registry.addMapping(MoveJavaFilesTask.class, "JavaWSDLParam", UpdateAxisWSDDFileTask.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateAxisWSDDFileTask.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", UpdateAxisWSDDFileTask.class);
-
- //UpdateWEBXMLCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", 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(Java2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
- registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", AxisOutputCommand.class);
-
- // Run extension
-
- // GeronimoAxisDeployCommand
- registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", GeronimoAxisDeployCommand.class);
-
- //AxisDeployCommand
- registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", AxisDeployCommand.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);
-
- // CheckAxisDeploymentDescriptorsTask
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", TDCheckAxisDeploymentDescriptors.class, "ServerProject", projectTransformer);
-
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", WSDL2JavaCommand.class);
-
-// WSDL2JavaCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-
- // MoveDeploymentFilesTask
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", MoveDeploymentFilesTask.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServiceServerTypeID", MoveDeploymentFilesTask.class);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveDeploymentFilesTask.class);
-
- // CopyAxisJarCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
- // Skeleton2WSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", Skeleton2WSDLCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", Skeleton2WSDLCommand.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServiceServerTypeID", Skeleton2WSDLCommand.class);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", Skeleton2WSDLCommand.class);
-
- // UpdateWEBXMLCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", projectTransformer);
-
- // RefreshProjectCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-
- // BuildProjectCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
- // GeronimoAxisDeployCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", GeronimoAxisDeployCommand.class);
-
- // AxisDeployCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- // AxisOutputCommand
- dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisOutputCommand.class);
-
- // ComputeAxisSkeletonBeanCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", ComputeAxisSkeletonBeanCommand.class);
- //dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ComputeAxisSkeletonBeanCommand.class);
- //dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ComputeAxisSkeletonBeanCommand.class);
-
- // OpenJavaEditorCommand
- dataRegistry.addMapping(ComputeAxisSkeletonBeanCommand.class, "ClassNames", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", OpenJavaEditorCommand.class, "Project", projectTransformer);
- }
- 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.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.consumption.ui/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.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"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
deleted file mode 100644
index 95d29077a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-ui.jar
-@dot
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.project b/bundles/org.eclipse.jst.ws.consumption.ui/.project
deleted file mode 100644
index 788372810..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.consumption.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.discovery.core</project>
- <project>org.eclipse.jst.ws.ui</project>
- <project>org.eclipse.wst.wsdl</project>
- <project>org.eclipse.wst.ws.parser</project>
- </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.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 2d0c820e6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,73 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.internal.consumption.ui.action,
- org.eclipse.jst.ws.internal.consumption.ui.command,
- org.eclipse.jst.ws.internal.consumption.ui.command.data,
- org.eclipse.jst.ws.internal.consumption.ui.common,
- org.eclipse.jst.ws.internal.consumption.ui.extension,
- org.eclipse.jst.ws.internal.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.consumption.ui.preferences,
- org.eclipse.jst.ws.internal.consumption.ui.selection,
- org.eclipse.jst.ws.internal.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.binding,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.object,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample,
- org.eclipse.jst.ws.internal.consumption.ui.wizard,
- org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi,
- org.eclipse.jst.ws.internal.consumption.ui.wsil,
- org.eclipse.jst.ws.internal.consumption.ui.wsrt,
- org.eclipse.jst.ws.internal.consumption.ui.server
-Require-Bundle: org.eclipse.wst.ws.parser,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.ws,
- org.eclipse.jem.workbench,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emf,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.j2ee.webservice,
- org.eclipse.jst.j2ee.webservices.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.ws.ui,
- org.wsdl4j,
- org.eclipse.jem.util,
- org.eclipse.wst.wsdl.validation,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.server.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.consumption.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
deleted file mode 100644
index ffb8cb268..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-bin.includes = .,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
-src.includes = schema/
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
deleted file mode 100644
index 8da3a2131..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
deleted file mode 100644
index a113c85cc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
deleted file mode 100644
index eaba51f62..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
deleted file mode 100644
index 1ee05fa2e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
deleted file mode 100644
index 1060dd967..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
deleted file mode 100644
index 590d3965f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
deleted file mode 100644
index 68b7a2651..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
deleted file mode 100644
index 927ad5ad4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
deleted file mode 100644
index 641fe843a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif
deleted file mode 100644
index a3061e6ff..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
deleted file mode 100644
index 5b43cae7b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
deleted file mode 100644
index afb6cb7d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
deleted file mode 100644
index afb6cb7d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
deleted file mode 100644
index 53e7dbd12..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif
deleted file mode 100644
index 11b34b7db..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
deleted file mode 100644
index 618a946cd..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
deleted file mode 100644
index 7c5916fb6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
deleted file mode 100644
index ccd373839..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,121 +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=Web Services Consumption Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-FEATURE_DESCRIPTION=Web services
-
-XP_PUBLIC_UDDI_REGISTRY_TYPES=Public UDDI Registry Types
-XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
-XP_WEB_SERVICE_CLIENT_TYPES=Web Service Client Types
-XP_WEB_SERVICE_TEST=Web Service Test
-XP_WEB_SERVICE_SERVER_RUNTIME_TYPES=Web Service Server Runtime Types
-XP_WEB_SERVICE_CLIENT_PROJECT_TYPE=clientProjectType
-XP_OBJECT_SELECTION_WIDGET=objectSelectionWidget
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-PLUGIN_NEW_WIZARD_NAME_WS_CLIENT=Web Service Client
-PLUGIN_IMPORT_WIZARD_NAME_WS=Web Service
-PLUGIN_NEW_WIZARD_DESC_WS_CLIENT=Access an existing XML web service
-PLUGIN_IMPORT_WIZARD_DESC_WS=A wizard for importing a web service
-IMPORT_WIZARD_DESC_WSIL=Import WSDL references to a WSIL document
-
-#
-# Web Samples IDs
-#
-SAMPLE_TYPE_WEBSERVICES_ID=Web service sample JSPs
-
-#
-# Pop-up actions
-#
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-ACTION_GEN_SAMPLE=Generate Sample JSPs
-
-#
-# Dialogs
-#
-CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG=Hide Generate Java bean Proxy Dialog
-CHECKBOX_SHOW_PROXY2SAMPLE_DIALOG=Hide Proxy To Sample Generation Dialog
-TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY=Hide the dialog for generating the Java bean proxy action.
-TOOLTIP_PPAD_CHECKBOX_PROXY2SAMPLE=Hide the dialog for generating the sample application action.
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-
-PREFERENCE_CATEGORY_SERVER_RUNTIME=Server and Runtime
-PREFERENCE_CATEGORY_PROJECT_TOPOLOGY=Project Topology
-PREFERENCE_CATEGORY_TEST_FACILITY=Test Facility Defaults
-PREFERENCE_CATEGORY_DIALOGS=Popup Dialog Selection
-
-
-#
-# Pop-up actions
-#
-MENU_RUN=&Run
-
-#
-# WebServiceTestPage
-#
-WSEXPLORER_ID=Web Services Explorer
-
-#
-# WebServicePublishPage
-#
-TOOLTIP_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-COMMAND_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-
-#
-# PublicUDDIRegistryType
-#
-PUBLICUDDIREGISTRYTYPE_NAME_IBM=IBM UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST=IBM UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT=Microsoft UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST=Microsoft UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP=SAP UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST=SAP UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS=XMethods Registry
-PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM=NTT Communications Registry
-
-#
-# WSIL proxy
-#
-IMPORT_WIZARD_NAME_WSIL=WSIL
-POPUP_GENERATE_WSIL=Generate WSIL
-
-#
-# Web Service Server Runtime Type
-#
-WEBSERVICETYPE_NAME_WSDL=Skeleton Java bean Web Service
-WEBSERVICETYPE_NAME_JAVA=Java bean Web Service
-
-#
-# Client project type
-#
-LABEL_CLIENT_TYPE_WEB=Web
-LABEL_CLIENT_TYPE_EJB=EJB
-LABEL_CLIENT_TYPE_APP_CLIENT=Application Client
-LABEL_CLIENT_TYPE_CONTAINERLESS=Java
-
-#
-# Handlers Configuration wizard page
-#
-POPUP_ADD_HANDLERS=Configure handlers
-LABEL_HANDLERS_CONFIG=Configure Handlers
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
deleted file mode 100644
index e24fa0975..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,714 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension-point
- id="publicUDDIRegistryType"
- name="%XP_PUBLIC_UDDI_REGISTRY_TYPES"/>
-
- <extension-point
- id="privateUDDIRegistryType"
- name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
- <extension-point
- id="webServiceTest"
- name="%XP_WEB_SERVICE_TEST"
- schema="schema/webServiceTest.exsd"/>
-
- <extension-point
- id="objectSelectionWidget"
- name="%XP_OBJECT_SELECTION_WIDGET"
- schema="schema/objectSelectionWidget.exsd"/>
-
- <!-- UDDI Registry Types -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBMTest"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBMTest">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_IBM"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBM"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBM">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoftTest"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoftTest">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoft"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoft">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAPTest"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAPTest">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_SAP"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAP"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAP">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryXMethods"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryXMethods">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryNTTComm"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryNTTComm">
- </publicUDDIRegistryType>
- </extension>
-
- <!-- Test Facilities -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceTest">
-
- <webServiceTest
- methodsneeded="true"
- name="%SAMPLE_TYPE_WEBSERVICES_ID"
- java="true"
- codegen="true"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.WebServiceWSSampleExecutable"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest">
- </webServiceTest>
-
- <webServiceTest
- methodsneeded="false"
- name="%WSEXPLORER_ID"
- java="false"
- codegen="false"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorerExecutable"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorerExecutable">
- </webServiceTest>
-
- </extension>
-
- <!-- Dynamic Wizards -->
-
- <extension
- point="org.eclipse.ui.newWizards">
- <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.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <description>
- %PLUGIN_NEW_WIZARD_DESC_WS_CLIENT
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ClientWidgetBinding"
- title="%WIZARD_TITLE_WSC"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/gen_sample_wiz.gif"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.GenSampleWidgetBinding"
- title="%WIZARD_TITLE_WSC"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- </dynamicWizard>
- </extension>
-
- <!-- extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/config_handler_wiz.gif"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigServiceHandlersWidgetBinding"
- title="%LABEL_HANDLERS_CONFIG"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
- </dynamicWizard>
- </extension -->
-
- <!-- extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/config_handler_wiz.gif"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigClientHandlersWidgetBinding"
- title="%LABEL_HANDLERS_CONFIG"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
- </dynamicWizard>
- </extension -->
-
- <!-- extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/config_handler_wiz.gif"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigureHandlersWidgetBinding"
- title="%LABEL_HANDLERS_CONFIG"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers">
- </dynamicWizard>
- </extension -->
-
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
- icon="icons/import_ws.gif"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="wsimport">
- <description>
- %PLUGIN_IMPORT_WIZARD_DESC_WS
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/import_ws_wiz.gif"
- name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSWidgetBinding"
- id="wsimport">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%IMPORT_WIZARD_NAME_WSIL"
- icon="icons/wsil/import_wsil.gif"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="wsilimport">
- <description>
- %IMPORT_WIZARD_DESC_WSIL
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/wsil/import_wiz_banner_wsil.gif"
- name="%IMPORT_WIZARD_NAME_WSIL"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSILWidgetBinding"
- id="wsilimport">
- </dynamicWizard>
- </extension>
-
- <!-- Preference Pages -->
-
- <extension
- point="org.eclipse.ui.preferencePages">
-
- <page
- name="%PREFERENCE_CATEGORY_SERVER_RUNTIME"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage"
- id="org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage">
- </page>
-
- <page
- name="%PREFERENCE_CATEGORY_DIALOGS"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.wst.command.internal.env.ui.preferences.ActionDialogsPreferencePage"
- id="org.eclipse.jst.wss.popup.category">
- </page>
-
- <page
- name="%PREFERENCE_CATEGORY_TEST_FACILITY"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.ui.preferences.ScenarioDefaultsPreferencePage"
- id="org.eclipse.jst.ws.internal.ui.preferences.ScenarioDefaultsPreferencePage">
- </page>
-
- <page
- name="%PREFERENCE_CATEGORY_PROJECT_TOPOLOGY"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.ui.preferences.ProjectTopologyPreferencePage"
- id="org.eclipse.jst.ws.internal.ui.preferences.ProjectTopologyPreferencePage">
- </page>
-
- </extension>
-
- <!-- Main Menu Actions -->
-
- <extension point="org.eclipse.ui.actionSets">
-
- <actionSet
- label="%COMMAND_LAUNCH_WS_EXPLORER"
- visible="true"
- id="org.eclipse.jst.ws.consumption">
- <menu
- label="%MENU_RUN"
- path="additions"
- id="org.eclipse.ui.run">
- <separator name="explorer">
- </separator>
- </menu>
- <action
- label="%COMMAND_LAUNCH_WS_EXPLORER"
- icon="icons/registry.gif"
- tooltip="%TOOLTIP_LAUNCH_WS_EXPLORER"
- class="org.eclipse.jst.ws.internal.consumption.ui.action.LaunchWSEAction"
- menubarPath="org.eclipse.ui.run/explorer"
- toolbarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.action.LaunchWSEAction">
- </action>
- </actionSet>
-
- </extension>
-
- <!-- "Don't Show Me" Extensions -->
-
- <extension
- point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
- <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"
- alwayshide="false"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_PROXY2SAMPLE_DIALOG"
- category="org.eclipse.jst.wss.popup.category"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_PROXY2SAMPLE"
- infopop="org.eclipse.jst.ws.consumption.ui.PPAD0005"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- showcheckbox="false"
- alwayshide="false"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- </actionDialogPreferenceType>
-
- <!-- actionDialogPreferenceType
- showcheckbox="false"
- alwayshide="false"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- </actionDialogPreferenceType -->
-
- </extension>
-
- <!-- Popups -->
-
- <extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <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.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsil"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <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.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- <action
- label="%ACTION_GEN_SAMPLE"
- 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.internal.consumption.ui.wizard.client.gensamplewizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- <action
- label="%ACTION_GEN_SAMPLE"
- 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.internal.consumption.ui.wizard.client.gensamplewizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- <!-- objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="webservices.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- 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.internal.consumption.ui.wizard.handlers.service">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers">
- </action>
- <visibility>
- <objectState
- name="type"
- value="Handlers">
- </objectState>
- </visibility>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="webservicesclient.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- 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.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="ejb-jar.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- 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.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="web.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- 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.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="application-client.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- 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.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution -->
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="wsilimport">
- </action>
- </objectContribution>
- </extension>
-
- <!-- Object Selection Widgets -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionTransformer"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget">
- </objectSelectionWidget>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionTransformer"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
- </objectSelectionWidget>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionTransformer"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget">
- </objectSelectionWidget>
- </extension>
-
-
- <extension-point id="wsImpl" name="Web service implementations"/>
- <extension-point id="wsClientImpl" name="Web service client implementations"/>
-
- <!-- serviceType, clientType, and webServiceRuntime are to be deleted in WTP 1.0 M9 -->
- <extension-point id="serviceType" name="Extensions that provide unique combinations of service implementations, scenarios, and module types "/>
- <extension-point id="clientType" name="Extensions that provide unique combinations of client implementations and module types"/>
- <extension-point id="webServiceRuntime" name="Web service runtimes"/>
-
-
- <extension-point id="runtimes" name="Web service runtimes" />
- <extension-point id="serviceRuntimes" name="Combination of a Web service runime, service implementation type, and required facets" />
- <extension-point id="clientRuntimes" name="Combination of a Web service runime, client implementation type, and required facets" />
-
- <extension-point id="tester" name="Web service test facilities"/>
-
-
-
-<!-- Test Extensions beginning -->
-
-<extension point="org.eclipse.jst.ws.consumption.ui.tester">
- <tester
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"
- label="%SAMPLE_TYPE_WEBSERVICES_ID"
- testWSDL="no"
- wsClientImplIds="org.eclipse.jst.ws.client.type.java"
- moduletypes="webmodule"
- methodsneeded="true"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.GSTCWebServiceTester">
- </tester>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.tester">
- <tester
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorer"
- label="%WSEXPLORER_ID"
- testWSDL="yes"
- wsClientImplIds="org.eclipse.jst.ws.client.type.java"
- moduletypes="webmodule"
- methodsneeded="false"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WSEWebServiceTester">
- </tester>
-</extension>
-
-<!-- Test Extensions end -->
-
-<extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
- <webServiceImpl
- id="org.eclipse.jst.ws.wsImpl.java"
- label="%WEBSERVICETYPE_NAME_JAVA"
- resourceTypeMetadata="File IResource CompilationUnit"
- extensionMetadata=".java .class"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget">
- </webServiceImpl>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
- <webServiceClientImpl
- id="org.eclipse.jst.ws.client.type.java"
- label="Java Proxy">
- </webServiceClientImpl>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
- <serviceType
- id="org.eclipse.jst.ws.serviceType.java"
- implId="org.eclipse.jst.ws.wsImpl.java"
- buModuleTypesInclude="jst.web"
- buModuleTypesExclude=""
- tdModuleTypesInclude="jst.web"
- tdModuleTypesExclude="">
- </serviceType>
-</extension>
-
-<extension point="org.eclipse.jst.ws.consumption.ui.clientType">
- <clientType
- id="org.eclipse.jst.ws.clientType.java.webOnly"
- implId="org.eclipse.jst.ws.client.type.java"
- moduleTypesInclude="jst.web"
- moduleTypesExclude="">
- </clientType>
-</extension>
-
-<extension point="org.eclipse.jst.ws.consumption.ui.clientType">
- <clientType
- id="org.eclipse.jst.ws.clientType.java.j2ee"
- implId="org.eclipse.jst.ws.client.type.java"
- moduleTypesInclude="jst.web jst.ejb jst.appclient jst.utility"
- moduleTypesExclude="">
- </clientType>
-</extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="StartClientServer"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientRunCommand"
- class="org.eclipse.jst.ws.internal.consumption.ui.server.StartClientWidgetFactory"/>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
deleted file mode 100644
index 699521323..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="clientProjectType" name="clientProjectType"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <documentation>
- This extension point defines client container types.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="clientProjectType" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.clientProjectType.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="clientProjectType">
- <complexType>
- <attribute name="include" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type only works with these particular project types. For example, if this type only works with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="exclude" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type DOES NOT work with these particular project types. For example, if this type does not work with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This label represents this client project type. It is displayed to the user so it must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A unique identifier for this client project type. This identifier is referenced in the clientProjectType attribute of the webServiceClientType element of an org.eclipse.jst.ws.consumption.ui.webServiceClientType extension.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </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>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
deleted file mode 100644
index 439474dfe..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="objectSelectionWidget" name="objectSelectionWidget"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="objectSelectionWidget" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.objectSelectionWidget.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="objectSelectionWidget">
- <annotation>
- <documentation>
- This extension point entry allows an extender to add new ways of browsing/finding artifacts that can be used to create Web services.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- This class defines Selection Widget to be displayed on the Object Selection page of the Web services wizards. This class must implement the org.eclipse.jst.ws.consumption.ui.widgets.object.IObjectSelectionWidget interface.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This id uniquely identifies this objectSelectionWidget element.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="transformer" type="string">
- <annotation>
- <documentation>
- This attribute specifies a class that must implement the org.eclipse.wst.command.internal.env.core.data.Transformer interface. This interface contains a transform method. Even though the type of the input parameter and the return value are of type Object it is expected that they will be used with the type org.eclipse.jface.viewers.IStructuredSelection. This transformation method allows the extender to modify the initial selection to an IStructuredSelection object that is more readily usable by the runtime server type.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </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>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
deleted file mode 100644
index 3bbe2f214..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="" id="webServiceClientType" name="Web Service Client Types"/>
- </appInfo>
- <documentation>
- This extension point defines Web Service Client types. This is done by defining webServiceClientType elements. These elements refer to a server and a Web Service runtime. These are respectively defined in the webServiceServer element and the webServiceRuntime element.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="webServiceServer" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceRuntime" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceClientType" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceClientType.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceServer">
- <annotation>
- <documentation>
- This element specifies information about a particular server type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="factoryId" type="string" use="required">
- <annotation>
- <documentation>
- This is the factory id for a server. This id is defined by
-the org.eclipse.wst.server.core.serverTypes extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this server should be used as the default server. Note: this default parameter is only used in the absence of other information. If the user has defined a particular server as their default then this parameter is ignored. Should contain a value of either &quot;true&quot; or &quot;false&quot;.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is a local ID for this server. The server attribute of the webserviceClientType element refers to this ID.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtimeTypeIds" type="string">
- <annotation>
- <documentation>
- This attribute is currently a place holder for future development. Please, do not use.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceRuntime">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services runtime.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This label is displayed to the user for this runtime. Therefore, is must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description of this Web Services runtime.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this runtime should be used as the default runtime. Note: this default parameter is only used in the absence of other information. If the user has defined a particular runtime as their default then this parameter is ignored. Should contain a value of either &quot;true&quot; or &quot;false&quot;.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="j2eeversion" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the J2EE versions supported by this runtime. The allowable values are 12, 13, and 14. If more than one J2EE version is supported each J2EE level should be specified with a blank delimiter.(eg. if J2EE version 1.2 and 1.3 are supported then this attribute string would be &quot;12 13&quot;.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceClientType">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services client type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is the ID for this Web Service Client type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- This is the name for this Web Service Client type. It is displayed to the user so it must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="clientType" type="string" use="required">
- <annotation>
- <documentation>
- This is the kind of Web Service Client type being defined. (ie. the value of the Java client is org.eclipse.jst.ws.client.type.java.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtime" type="string" use="required">
- <annotation>
- <documentation>
- This is the runtime ID for this Web Service client type. There should be a corresponding webServiceRuntime element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="server" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the server for this Web Service client type. There should be a corresponding webServiceServer element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="clientProjectType" type="string" use="default" value="org.eclipse.jst.ws.consumption.ui.clientProjectType.Web">
- <annotation>
- <documentation>
- This attribute contains a space delimited list of client project type ids supported by this by this webServiceClientType element. The client project type ids are defined by the org.eclipse.jst.ws.consumption.ui.clientProjectType extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="developBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE development phase. The Command and UI elements in this binding always come first in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="assemblyBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE assembly phase. The Command and UI elements in this binding always come after the development phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="deployBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE deploy phase. The Command and UI elements in this binding always come after the assembly phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="installBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE install phase. The Command and UI elements in this binding always come after the deploy phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
deleted file mode 100644
index ec44bcaf7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceServerRuntimeType" name="Web Service Server Runtime Types"/>
- </appInfo>
- <documentation>
- This extension point defines Web Service Server types. This is done by defining webServiceServerRuntimeType elements. These elements refer to a server and a Web Service runtime. These are respectively defined in the webServiceServer element and the webServiceRuntime element.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="webServiceServer" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceRuntime" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceServerRuntimeType" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceType" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceServer">
- <annotation>
- <documentation>
- This element specifies information about a particular server type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="factoryId" type="string" use="required">
- <annotation>
- <documentation>
- This is the factory id for a server. This id is defined by
-the org.eclipse.wst.server.core.serverTypes extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this server should be used as the default server. Note: this default parameter is only used in the absence of other information. If the user has defined a particular server as their default then this parameter is ignored. Should contain a value of either &quot;true&quot; or &quot;false&quot;.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is a local ID for this server. The server attribute of the webserviceServerRuntimeType element refers to this ID.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtimeTypeIds" type="string">
- <annotation>
- <documentation>
- This attribute is currently a place holder for future development. Please, do not use.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceRuntime">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services runtime.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This label is displayed to the user for this runtime. Therefore, is must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description of this Web Services runtime.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this runtime should be used as the default runtime. Note: this default parameter is only used in the absence of other information. If the user has defined a particular runtime as their default then this parameter is ignored. Should contain a value of either &quot;true&quot; or &quot;false&quot;.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="j2eeversion" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the J2EE versions supported by this runtime. The allowable values are 12, 13, and 14. If more than one J2EE version is supported each J2EE level should be specified with a blank delimiter.(eg. if J2EE version 1.2 and 1.3 are supported then this attribute string would be &quot;12 13&quot;.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceServerRuntimeType">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services server runtime type. An entry for this element defines a valid combination of server, runtime, and webservice type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is the ID for this Web Service Server Runtime type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- This is the name for this Web Service Server Runtime type. It is displayed to the user so it must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtime" type="string" use="required">
- <annotation>
- <documentation>
- This is the runtime ID for this Web Service Server Runtime type. There should be a corresponding webServiceRuntime element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="server" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the server for this Web Service Server Runtime type. There should be a corresponding webServiceServer element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="type" type="string" use="required">
- <annotation>
- <documentation>
- This is the kind of Web Service Runtime type being defined. (eg. the value of a Java Bean Webservice is org.eclipse.jst.ws.type.java)
-There should be a corresponding webServiceType element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="developBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE development phase. The Command and UI elements in this binding always come first in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="assemblyBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE assembly phase. The Command and UI elements in this binding always come after the development phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="deployBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE deploy phase. The Command and UI elements in this binding always come after the assembly phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="installBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE install phase. The Command and UI elements in this binding always come after the deploy phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="requireEJBModule" type="boolean" use="required">
- <annotation>
- <documentation>
- If the Webservice for this Server Runtime Type is required to be in an EJB module then the value of this attribute should be true.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="requireWebModule" type="boolean" use="required">
- <annotation>
- <documentation>
- If the Webservice for this Server Runtime Type is required to be in an Web module then the value of this attribute should be true.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceType">
- <annotation>
- <documentation>
- This element defines a particular Web service kind. Such as a Java Bean web service, a Skeleton Web service, an EJB Web service, etc.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This a unique ID for this Web service type. It is referenced in the webServiceServerRuntimeType element with the type attribute.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This is a translatable label for this web service type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="resourceTypeMetadata" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list class Names. (ie.No package prefix) The classes listed define the allowable Eclipse resources that this web service type understands and turn into a Web service. For example, if a user selects a Java source file in the package explorer view and then starts the Web services wizard a CompilationUnit object will be passed in as part of an IStructuredSelection. By putting &quot;CompilationUnit&quot; as one of the classes in this attribute it indicates that this type can create a Web service from the CompilationUnit.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="extensionMetadata" type="string" use="required">
- <annotation>
- <documentation>
- This attribute allows this Web service type to restrict names of the input files that it understands. For example, if the value is set to &quot;.java .class&quot; it indicates that this Web service type only understands resource names that end with .java or end with .class.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="objectSelectionWidget" type="string" use="required">
- <annotation>
- <documentation>
- On page 2 of the Web service wizard there is an Object selection page. This selection page can be customized using this attribute, since different Web service types may need different methods of selecting them. The value of this attribute should be the id of a org.eclipse.jst.ws.consumption.ui.objectSelectionWidget extension. The predefined id for a Java selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.JavaBeanSelectionWidget. The predefined id for a WSDL selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.WSDLSelectionWidget. The predefined id for an EJB selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.EJBSelectionWidget.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="includeNatures" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type only works with these particular project types. For example, if this type only works with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="excludeNatures" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type DOES NOT work with these particular project types. For example, if this type does not work with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
deleted file mode 100644
index e462b0487..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceTest" name="Web Service Test"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <documentation>
- This extension point defines Web service test facilities that can be plugged into the Web services wizards.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="webServiceTest" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceTest.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceTest">
- <complexType>
- <attribute name="methodsneeded" type="boolean">
- <annotation>
- <documentation>
- This attribute indicates if this test facility need to methods from a proxy bean.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- The value of this attribute is displayed to the user for this test facility. It must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="java" type="boolean">
- <annotation>
- <documentation>
- This attribute indicates whether this test facility is intended for clients that generate a Java bean as output.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="codegen" type="boolean">
- <annotation>
- <documentation>
- This attribute indicates if this test facility generates code or not, such as JSP files.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string">
- <annotation>
- <documentation>
- This attribute contains a class name. The class must implement org.eclipse.jst.ws.ext.WebServiceExecutable. This class allows the extender to provide the Commands that will execute for this test facility.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- This is a unique identifier for this test facility.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </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>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties
deleted file mode 100644
index 14c89180f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties
+++ /dev/null
@@ -1,579 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-PLUGIN_NEW_WIZARD_NAME_WS_CLIENT=Web Service Client
-#
-# Web services "Internet" preferences extension.
-#
-
-#
-# Web Samples IDs
-#
-
-#
-# Pop-up actions
-#
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-
-#
-# Dialogs
-#
-CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG=Show Generate Java bean Proxy Dialog
-TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY=Show the dialog for generating the Java bean proxy action.
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-#
-
-#
-# Preferences Tooltips
-#
-
-#
-#Server Runtime Preferences
-#
-TOOLTIP_SRPF_COMBO_SERVER=The preferred server type
-TOOLTIP_SRPF_COMBO_RUNTIME=The preferred Web service runtime
-TOOLTIP_SRPF_COMBO_J2EE=The preferred J2EE version
-
-#
-# Pop-up actions
-#
-
-#
-# General messages.
-#
-MSG_ERROR_TASK_EXCEPTED=IWAB0234E An internal error occurred. Details: {0}
-MSG_ERROR_NO_SERVER_RUNTIME=No suitable server can be found for the {0} Web service runtime. Go to Window > Preferences. Select Server > Installed Runtimes and configure one of the following: {1}
-
-
-
-
-#
-#Runtime labels
-#
-
-
-#
-# Wizard page task labels and descriptions
-# (used only for progress indication).
-#
-
-#
-# Common wizard strings.
-#
-LABEL_FOLDER_NAME=Folder:
-LABEL_JSP_FOLDER_NAME=JSP folder:
-LABEL_WEB_PROJECT_NAME=Web project:
-LABEL_WEBSERVICETYPE=Web service type:
-LABEL_J2EE_VERSION=J2EE version:
-LABEL_NA=N/A
-
-BUTTON_BROWSE=Browse...
-BUTTON_BROWSE_FILES=Browse files...
-BUTTON_USE_ABSOLUTE_LOCATION=Use absolute location URI for WSDL input statements
-BUTTON_USE_INLINE_SCHEMA=Use inline schema
-
-BOTTOMUP_LABEL=Bottom up
-TOPDOWN_LABEL=Top down
-CLIENT_LABEL=Client
-COMBINED_TYPE_AND_RUNTIME_LABEL={0} {1}
-
-
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-#
-# WebServiceClientSelectionPage
-#
-
-#
-# WebServiceServerSelectionPage
-#
-
-#
-# WebServiceProjectPage
-#
-PAGE_TITLE_WS_PROJECT=Web Services
-PAGE_DESC_WS_PROJECT=Review your Web service options and make any necessary changes before proceeding to the next page.
-BUTTON_START_WEB_PROJECT=Start Web service in Web project
-GROUP_SCENARIO_SERVICE=Service
-GROUP_SCENARIO_CLIENT=Client proxy
-LABEL_WEBSERVICECLIENTTYPE=Client proxy type:
-
-
-
-# Items common to WebServiceRuntimeSelectionPage and WebServiceClientRuntimeSelectionPage
-# WebServiceRuntimeSelectionPage
-PAGE_TITLE_WS_RUNTIME_SELECTION=Service Deployment Configuration
-PAGE_DESC_WS_RUNTIME_SELECTION=Choose from the list of runtimes and deployment servers, or use the default settings.
-LABEL_RUNTIMES_LIST=Web service runtime:
-LABEL_SERVERS_LIST=Server:
-LABEL_EDIT_BUTTON=Edit...
-LABEL_SERVICE_EAR_MODULE=Service EAR module:
-LABEL_CLIENT_EAR_MODULE=Client EAR module:
-LABEL_CLIENT_MODULE=Client module:
-LABEL_SERVICE_MODULE=Service module:
-LABEL_CLIENT_PROJECT=Client project:
-LABEL_SERVICE_PROJECT=Service project:
-LABEL_CLIENT_EAR_PROJECT=Client EAR project:
-LABEL_SERVICE_EAR_PROJECT=Service EAR project:
-
-#
-# Client component type labels
-#
-LABEL_CLIENT_COMP_TYPE_WEB=Web
-LABEL_CLIENT_COMP_TYPE_EJB=EJB
-LABEL_CLIENT_COMP_TYPE_APP_CLIENT=Application Client
-LABEL_CLIENT_COMP_TYPE_CONTAINERLESS=Java
-
-
-TOOLTIP_PWRS_TEXT_RUNTIME=The runtime to be used.
-TOOLTIP_PWRS_TEXT_SERVER=The server to be used.
-TOOLTIP_PWRS_J2EE_VERSION=J2EE version to be used.
-
-LABEL_SELECTION_VIEW_TITLE=Server-Side Deployment Selection:
-LABEL_SELECTION_VIEW_RUNTIME=Choose Web service runtime first
-LABEL_SELECTION_VIEW_SERVER=Choose server first
-LABEL_SELECTION_VIEW_EXPLORE=Explore options
-
-LABEL_TREE_EXISTING_SERVERS=Existing Servers
-LABEL_TREE_SERVER_TYPES=Server Types
-
-MSG_INVALID_SRT_SELECTIONS=This server and runtime combination is not supported. Choose a different server or runtime to proceed through the Web services wizard.
-MSG_NO_RUNTIME=No runtime specified for the {0} scenario.
-MSG_NO_SERVER=No server specified for the {0} scenario.
-MSG_ERROR_STUB_ONLY={0} has only stub runtimes associated with it. Choose a different server or configure a non-stub runtime in the server preferences.
-
-MSG_SERVER_TARGET_MISMATCH=The project, {0}, has a server target which is not compatible with the selected server type
-MSG_J2EE_MISMATCH=The project, {0}, has a different J2EE level from the selected J2EE level
-MSG_SERVICE_PROJECT_EMPTY=The service project {0} cannot be empty. Select a service project {0}.
-MSG_SERVICE_EAR_EMPTY=The service EAR {0} cannot be empty. Select a service EAR {0}.
-MSG_CLIENT_PROJECT_EMPTY=The client project {0} cannot be empty. Select a client project {0}.
-MSG_CLIENT_EAR_EMPTY=The client EAR {0} cannot be empty. Select a client EAR {0}.
-MSG_INVALID_EJB_PROJECT={0} is not an EJB project. Choose an EJB project, or enter a new EJB project name.
-MSG_INVALID_WEB_PROJECT={0} is not a Web project. Choose a Web project, or enter a new Web project name.
-MSG_INVALID_PROJECT_TYPE={0} is not a {1} project. Choose a {1} project, or enter a new project name.
-MSG_MODULE=module
-MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME=The flexible project preference is off. Therefore, project names and module names must be the same for new modules.
-
-MSG_SAME_CLIENT_AND_SERVICE_EARS=Your selected service and client {0} modules have the same name. Proceeding with this configuration may result in runtime errors.
-MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS=Your selected service and client {0} modules have the same name. Proceeding with this configuration will result in runtime errors.
-MSG_SAME_CLIENT_AND_SERVICE_PROJECTS=Your selected service and client projects are the same. Proceeding with this configuration will result in errors.
-MSG_WRONG_CLIENT_PROJECT_TYPE=The selected client project, {0}, is not a {1} project. Please select a {1} project or enter a new project name.
-MSG_CLIENT_SUB=client
-MSG_SERVICE_SUB=service
-MSG_GENERAL_PROJECT_AND_EAR=Select the {0} project and the EAR project with which you want it to be associated.
-MSG_EAR_PROJECT_WILL_BE_CREATED=If an EAR or project does not exist or is currently unassociated, it will be created and \nassociated as required when you click Next.
-
-MSG_EAR_WILL_BE_ASSOCIATED=The selected {0} project will be associated with the EAR project.
-MSG_PROJECT_WILL_BE_CREATED=The {0} project will be created and associated with the EAR project.
-MSG_EAR_WILL_BE_CREATED=The {0} EAR project will be created and associated with the project.
-MSG_PROJECT_AND_EAR_CREATED=The {0} project and EAR project will be created and associated with one another.
-
-# WebServiceClientRuntimeSelectionPage
-PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION=Client Environment Configuration
-PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION=Choose from the list of supported runtimes and servers for the client environment, or use the default settings.
-
-LABEL_CLIENT_SELECTION_VIEW_TITLE=Client-Side Environment Selection:
-LABEL_CLIENT_TYPE=Client Project type:
-LABEL_SERVICE_TYPE=Service Project type:
-LABEL_WEB=Web
-LABEL_EJB=EJB
-LABEL_NO_LABEL=
-
-#
-# Items common to WebServiceMappingsPage, WebServiceMappingsPage (client), and WebServiceSOAPBindingPage
-#
-PAGE_MSG_VALIDATION_INTERNAL_ERROR=An internal error occurred during page validation. See logs for details.
-
-#
-# WebServiceMappingsPage
-#
-PAGE_TITLE_WS_XML2BEAN=Web Service Skeleton XML to Java Mappings
-PAGE_DESC_N2P_MAPPINGS=Define custom mapping for namespace to package.
-MSG_MAPPING_DUPLICATE_ENTRIES=Duplicate {0} mapped to the same {1}.
-
-
-#
-# The two ITEM_* strings are entries in a list box of mappings.
-# There are two forms, one when the page is in Java-to-XML mode:
-# <java-bean-name>, <encoding-style>
-# and one when the page is in XML-to-Java mode:
-# <xml-namespace-uri>:<xml-short-name>, <encoding-style>
-# where:
-# <java-bean-name> is a fully-qualified Java class name
-# <xml-namespace-uri> is the namespace of an XML type
-# <xml-short-name> is the XML type name within the namespace
-# <encoding-style> is the encoding style (SOAP or Literal XML)
-#
-
-#
-# WebServiceProxyPage
-#
-BUTTON_GENERATE_PROXY=Generate a proxy
-
-#
-# WebServiceSkeletonConfigPage
-#
-PAGE_DESC_WSSKEL_CONFIG=Define a skeleton Java bean as a Web service.
-PAGE_TITLE_WSSKEL_CONFIG=Web Service Skeleton Java Bean Configuration
-TOOLTIP_PBSC_TEXT_SKELETON_FOLDER=Folder for generated Java skeleton.
-TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE=Browse folders.
-LABEL_SKELETON_ROOT_NAME=Skeleton folder:
-
-#
-# WebServiceBeanClassPage
-#
-LABEL_BEAN_CLASS_NAME=Bean:
-PAGE_MSG_BEAN_CANNOT_BE_EMPTY=Please select a Java bean class.
-BUTTON_BROWSE_CLASSES=Browse classes...
-
-
-#
-# WebServiceTestPage
-#
-PAGE_TITLE_WSTEST=Web Service Test Page
-PAGE_DESC_WSTEST=Select a test facility
-LABEL_TEST_TYPES=Test Facility
-CHECKBOX_TEST_WEBSERVICE=Test the Web service
-CHECKBOX_MONITOR_WEBSERVICE=Monitor the Web service
-MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST=An error occurred. Unable to launch WSDL test facility.
-
-#
-# WebServiceExplorerPage
-#
-BUTTON_LAUNCH_SERVICE_TEST=Launch
-
-#
-# WebServiceClientTestPage
-#
-PAGE_TITLE_WS_SAMPLE=Web Service Client Test
-PAGE_DESC_WS_SAMPLE=Do you want to test the generated proxy?
-BUTTON_TEST=Test the generated proxy
-LABEL_TEST_TYPES=Test facility
-BUTTON_RUN_TEST=Run test on server
-LABEL_METHODS=Methods
-MSG_ERROR_JTS_JSP_GEN=IWAB0313E Error encountered while generating the sample.
-LABEL_JSP_PROJECT_NAME=JSP project:
-MSG_ERROR_JTS_PROXY_NOT_COMPILED=IWAB0357E The Generated proxy was not found. WebService sample jsps cannot be generated.
-MSG_ERROR_MALFORMED_URL=IWAB0358E Test client URL is malformed.
-
-#
-# WebServiceISDPage
-#
-
-#
-# WebServiceBeanConfigPage
-#
-
-#
-# WebServiceBeanMethodsPage
-#
-BUTTON_SELECT_ALL=Select All
-BUTTON_DESELECT_ALL=Deselect All
-TOOLTIP_PBME_BUTTON_SELECT_ALL=Select all methods
-TOOLTIP_PBME_BUTTON_DESELECT_ALL=Deselect all methods
-
-#
-# WebServiceEJBConfigPage
-#
-
-#
-# WebServiceWSDLSelectionPage
-#
-PAGE_TITLE_WSDL_SELECTION=Web Service WSDL File Selection
-PAGE_DESC_WSDL_SELECTION=Select a WSDL file.
-
-
-#
-# WebServicePublishPage
-#
-PAGE_TITLE_WS_PUBLISH=Web Service Publication
-PAGE_DESC_WS_PUBLISH=Do you want to publish your Web service?
-PAGE_TITLE_WS_FIND=Find a Web service
-PAGE_DESC_WS_FIND=Do you want to find a Web service?
-BUTTON_WS_PUBLISH=Launch the Web Services Explorer to publish this Web service to a UDDI Registry
-BUTTON_WS_PUBLISH_PRIVATE_UDDI=Launch the Web Services Explorer to publish this Web service to the Unit Test UDDI Registry
-BUTTON_WS_FIND=Launch the Web Services Explorer to find a Web service from a UDDI Registry
-BUTTON_WS_FIND_PRIVATE_UDDI=Launch the Web Services Explorer to find a Web service from the Unit Test UDDI Registry
-LABEL_PUBLIC_UDDI_REGISTRIES=Public UDDI Registry
-
-#
-# EJB UI strings
-#
-LABEL_EJB_BEAN_NAME=EJB bean
-TABLE_TITLE_EJB_BEAN_NAMES=Stateless EJB beans
-TABLE_TITLE_EJB_PROJECT_NAME=EJB project
-LABEL_EAR_PROJECTS=EAR projects
-TOOLTIP_EAR_PROJECTS=Enterprise application projects.
-TOOLTIP_TABLE_BEAN_NAMES=Select an EJB.
-
-#
-# Tooltips for WebServiceWSDLSelectionPage
-#
-TOOLTIP_PWWS_PAGE=
-
-#
-# Tooltips for beans.WebServiceBeanClassPage
-#
-TOOLTIP_PBCL_PAGE=
-TOOLTIP_PBCL_TEXT_BEAN_CLASS=Selected Java bean.
-TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE=Browse classes.
-TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE=Browse Java files.
-
-
-#
-# Tooltips for beans.WebServiceTestPage
-#
-TOOLTIP_PSTP_COMBOBOX_TEST=Test facilities available to test the service.
-TOOLTIP_PSTP_LAUNCH_BUTTON=Launch the selected test facility.
-
-
-
-
-#
-# Tooltips for WebServiceRuntimeSelectionPage
-#
-TOOLTIP_PWRS_PAGE=
-TOOLTIP_PWRS_LIST_RUNTIMES=Select from the following deployment runtime(s).
-TOOLTIP_PWRS_LIST_SERVERS=Select from application server(s).
-TOOLTIP_PWRS_RADIO_SERVER=Server oriented selection.
-TOOLTIP_PWRS_RADIO_RUNTIME=Runtime oriented selection.
-TOOLTIP_PWRS_RADIO_EXPLORE=Explore combinations.
-TOOLTIP_PWRS_COMBO_PROJECT=Web project.
-
-#
-# Tooltips for WebServiceClientRuntimeSelectionPage
-#
-TOOLTIP_PWCR_COMBO_CLIENT_TYPE=Client project type.
-TOOLTIP_PWCR_COMBO_SERVICE_TYPE=Service project type.
-
-
-#
-# Tooltips for WebServiceProjectPage
-#
-TOOLTIP_PWPR_COMBO_TYPE=Web service implementation type.
-TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE=Service defaults for this wizard scenario.
-TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY=Enable/disable proxy generation for this scenario.
-TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT=Start Web service in Web project for this scenario.
-TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS=Launch the Web Services Explorer to publish the Web service in this scenario to a UDDI Registry.
-TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE=Select this to explore the Web service created.
-TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE=Select this to monitor the SOAP traffics of this Web service.
-TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT=Client proxy defaults for this wizard scenario.
-TOOLTIP_PWPR_COMBO_CLIENTTYPE=Client proxy selection type.
-
-#
-# Tooltips for WebServicePublishPage
-#
-TOOLTIP_PWPB_PAGE=
-TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH=Publish the Web service.
-
-
-#
-# WSIL proxy
-#
-
-PAGE_WSIL_IMPORT=WSIL Import Page
-TITLE_WSIL_IMPORT=WSIL Import
-DESC_WSIL_IMPORT=Import WSDL references to a WSIL document
-PAGE_TITLE_WS_SELECTION=Web Service Selection Page
-PAGE_DESC_WS_SELECTION=Enter a web service URI.
-
-PAGE_MSG_LOADING_WEB_SERVICE_URI=Loading Web service URI...
-PAGE_MSG_INVALID_WEB_SERVICE_URI=Invalid Web service URI. Enter an URI to a WSDL, WSIL or HTML document.
-PAGE_MSG_NO_SUCH_FILE=File "{0}" does not exists.
-PAGE_MSG_SELECTION_MUST_BE_WSDL=Selection must be WSDL.
-PAGE_MSG_INVALID_WSIL_FILE_NAME=Invalid WSIL file name. WSIL file name must end with .wsil
-
-
-
-MSG_ERROR_URI_NOT_RESOLVABLE=IWAB0469E "{0}" is not resolvable.
-MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT=IWAB0551E WSDL file at {0} has no service element.
-
-LABEL_WSIL_URI=WSIL URI:
-LABEL_BROWSE=Browse
-LABEL_WSDL=WSDL:
-LABEL_WSDL_URI=WSDL URI
-LABEL_IMPORT=Import...
-LABEL_ADD=Add
-LABEL_REMOVE=Remove
-LABEL_WS_SELECTION=Enter an URI to a WSDL, WSIL or HTML document:
-LABEL_SELECT_WSDL=Select a WSDL
-LABEL_VALIDATE_MESSAGES=WSDL validation messages:
-
-
-TOOLTIP_WSIL_IMPORT_PAGE=This page allows you to add WSDL references to a WSIL document.
-TOOLTIP_WSIL_TEXT_WSIL=Enter the location of a new or existing WSIL document.
-TOOLTIP_WSIL_BUTTON_BROWSE_WSIL=Browse for a WSIL document.
-TOOLTIP_WSIL_TABLE_WSDL=Enter the URIs of the WSDLs that are going to be added as service references.
-TOOLTIP_PCON_PAGE=Select a web service for consumption.
-TOOLTIP_PCON_TEXT_WS=Enter an URI to a WSDL, WSIL or HTML document.
-TOOLTIP_PCON_BUTTON_BROWSE_WS=Browse for a web service resource.
-TOOLTIP_VALIDATE_TEXT_MESSAGE=Messages from WSDL validation.
-TOOLTIP_TABLE_VALIDATE_MESSAGE=Use the Web Service Profile Compliance and Validation preference to enable or disable WSDL validation.
-
-#
-# Tooltips for client.WebServiceClienTestPage
-#
-TOOLTIP_PWSM_PAGE=
-TOOLTIP_PWSM_CHECKBOX_TEST=Enable/disable Test.
-TOOLTIP_PWSM_COMBOBOX_TEST=Select the test type.
-TOOLTIP_PWSM_CHECKBOX_LAUNCH=Run test on a server.
-TOOLTIP_PWSM_TEXT_JSP_FOLDER=Destination folder of generated sample files.
-TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE=Browse folders.
-TOOLTIP_PWSM_BUTTON_SELECT_ALL=Select all methods.
-TOOLTIP_PWSM_BUTTON_DESELECT_ALL=Deselect all methods.
-TOOLTIP_PWSM_COMBO_PROJECT=Web project for generated sample.
-TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER=Destination folder of generated sample files.
-TOOLTIP_PWSM_TREE_METHODS=Methods to generate into the sample.
-TOOLTIP_PWSM_EAR_PROJECT=EAR project for the generated sample.
-
-#
-# HTTP Basic Auth
-#
-DIALOG_TITLE_HTTP_BASIC_AUTH=HTTP Basic Authentication
-LABEL_URL=URL:
-LABEL_HTTP_BASIC_AUTH_USERNAME=User name:
-LABEL_HTTP_BASIC_AUTH_PASSWORD=Password:
-
-TOOLTIP_HTTP_BASIC_AUTH_USERNAME=Enter your HTTP basic authentication user name.
-TOOLTIP_HTTP_BASIC_AUTH_PASSWORD=Enter your HTTP basic authentication password.
-
-#
-# Web Service Server Runtime Type
-#
-
-
-#
-# Client project type
-#
-
-#
-# Generate Handler Skeleton
-#
-TASK_LABEL_GEN_HANDLER_SKELETON=Generate handler skeleton command
-TASK_DESC_GEN_HANDLER_SKELETON=Generate handler skeleton command
-MSG_ERROR_GENERATE_HANDLER_SKELETON=IWAB0359E Error in generating handler skeleton.
-MSG_ERROR_WRITE_FILE=IWAB0360E Error in writing file {0}.
-
-#
-# Handlers Configuration wizard page
-#
-LABEL_HANDLERS_CONFIG=Handler Configuration
-LABEL_BUTTON_ADD=Add
-LABEL_BUTTON_REMOVE=Remove
-LABEL_BUTTON_MOVE_UP=Move Up
-LABEL_BUTTON_MOVE_DOWN=Move Down
-LABEL_BUTTON_GEN_SKELETON=Generate skeleton classes for new handlers
-LABEL_COMBO_SOURCE_LOC=Output folder:
-LABEL_COMBO_WS_CLIENT_REF=Client Service Reference:
-LABEL_COMBO_WS_SERVICE_DESC=Service Description:
-
-LABEL_HANDLER_NAME=Name
-LABLE_HANDLER_CLASS=Class Name
-LABEL_HANDLER_PORT=Port Name
-
-DIALOG_TITLE_WS_ADD_HANDLER=Add New Handler
-LABEL_TEXT_HANDLER_NAME=Name:
-LABEL_TEXT_HANDLER_CLASS=Class name:
-LABEL_TEXT_HANDLER_PORT=Port name:
-
-PAGE_TITLE_SERVICE_HDLR_CONFIG=Service Handlers Configuration
-PAGE_DESC_SERVICE_HDLR_CONFIG=Configure service-side handlers
-PAGE_TITLE_CLIENT_HDLR_CONFIG=Client Handlers Configuration
-PAGE_DESC_CLIENT_HDLR_CONFIG=Configure client-side handlers
-
-TOOLTIP_EDIT_WS_HANDLERS=Configure Web Service Handlers
-TOOLTIP_BUTTON_GEN_SKELETON=Select to generate skeleton classes for new handlers.
-TOOLTIP_COMBO_SOURCE_LOC=Select the output location for file generation.
-TOOLTIP_TEXT_HANDLER_NAME=Handler name
-TOOLTIP_TEXT_HANDLER_CLASS=Handler class name
-TOOLTIP_TEXT_HANDLER_PORT=Handler port component name
-TOOLTIP_WS_CLIENT_REF=Select a client service-reference to show its handlers.
-TOOLTIP_WS_SERVICE_DESC=Select a service description to show its handlers.
-
-#
-# OpenJavaEditorCommand
-#
-MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR=IWAB0029E Unable to open class {0} from project {1} in the Java editor.
-
-#
-# CheckIfServiceProject
-#
-MSG_WARN_IS_SERVICE_PROJECT=The selected client project, {0}, contains the Web service. Proceeding with this configuration may result in runtime errors when invoking the Web service. Would you like to proceed?
-MSG_USER_ABORTED=User pressed cancel in warning dialog which warned about the selected client project being the service project.
-
-
-#
-# Missing third party file error message
-#
-MSG_MISSING_THIRD_PARTY_FILES=Missing third party files. Refer to http://www.eclipse.org/webtools/wst/components/ws/download_instructions_for_jars.html
-
-#
-# WSDLSelectionOutputCommand
-#
-MSG_WARNING_NO_SERVICE_ELEMENT=The WSDL file does not contain a Service element. Therefore a service interface and Java proxy will not be generated and as a result, a Java test client will not be launched. Click OK to proceed, or click Cancel to select another WSDL file. Alternately, exit the wizard and use the WSDL editor to create a Service WSDL document.
-
-#
-# CheckWSDLValidationCommand
-#
-STILL_VALIDATING_WSDL=Wizard WSDL validation in Progress. \n- Click Cancel to cancel the current WSDL validation and continue. \n- Click Cancel and Update to update the preference to always cancel incomplete WSDL validation while traversing the wizard. \n- Click Wait to wait for WSDL validation to complete.
-CANCEL_VALIDATION_LABEL=Cancel
-CANCEL_VALIDATION_DESCRIPTION=Cancel the current WSDL validation and continue
-CANCEL_ALL_VALIDATION_LABEL=Cancel and Update
-CANCEL_ALL_VALIDATION_DESCRIPTION=Update the preference to always cancel incomplete WSDL validation while traversing the wizard.
-WAIT_VALIDATION_LABEL=Wait
-WAIT_VALIDATION_DESCRIPTION=Wait for WSDL validation to complete
-TASK_LABEL_CHECK_WSDL_VALIDATION=Check for WSDL validation
-TASK_DESC_CHECK_WSDL_VALIDATION=Check if WSDL validation has completed
-WAIT_FOR_WSDL=Do not continue with wizard. Wait for WSDL validation to complete.
-
-#
-# WSDLValidation messages
-#
-MESSAGE_VALIDATE_NO_WSDL=Wizard WSDL validation is disable.
-MESSAGE_VALIDATE_REMOTE_WSDL=Wizard WSDL validation is only enabled for remote files.
-MESSAGE_VALIDATE_ALL_WSDL=Wizard WSDL validation is enabled.
-MESSAGE_VALIDATE_IN_PROGRESS=WSDL validation in progress ...
-ERROR_MESSAGES_IN_VALIDATION=The WSDL file contains validation error(s).
-WARNING_MESSAGES_IN_VALIDATION=The WSDL file contains validation warning(s).
-WARNING_IF_CONTINUE=Continuing with the wizard may result in generation or runtime problem.
-VALIDATION_COMPLETED=WSDL valication completes with no warning or error.
-TOOLTIP_VALIDATE_TEXT_MESSAGE_SUMMARY=WSDL validation preference can be changed using the Web Services Profile Compliance and Validation preference.
-
-#
-# Start server page
-#
-PAGE_TITLE_WS_START_SERVER=Server startup page
-PAGE_DESC_WS_START_SERVER=Start the server from this page.
-LABEL_START_SERVER_TEXT1=In order to proceed the server "{0}" must be started.
-LABEL_START_SERVER_TEXT2=Once the server is started the "next" button will be enabled.
-LABEL_START_SERVER_TEXT3=The "back" button can be used while the server is starting to
-LABEL_START_SERVER_TEXT4=change any previous settings in this wizard.
-LABEL_START_SERVER_BUTTON=Start server
-TOOLTIP_START_SERVER_BUTTON=Start the server
-TEXT_SERVER_STATUS=Currently the server is {0}.
-TEXT_SERVER_MSG=Server {0}
-TEXT_SERVER_STARTED=started
-TEXT_SERVER_STARTING=starting
-TEXT_SERVER_STOPPED=stopped
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java
deleted file mode 100644
index 1266fece9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java
+++ /dev/null
@@ -1,60 +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.ui.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.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java
deleted file mode 100644
index c442e74e6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java
+++ /dev/null
@@ -1,97 +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.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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-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.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- * This command checks to see if the selected client project is the
- * service project. If so, the user is warned.
- */
-public class CheckForServiceProjectCommand extends AbstractDataModelOperation
-{
- MessageUtils msgUtils;
- //SelectionListChoices runtime2ClientTypes;
- String clientProjectName;
- String wsdlURI;
- WebServicesParser webServicesParser;
-
- public CheckForServiceProjectCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- }
-
-
- public void setClientProjectName(String name)
- {
- clientProjectName = name;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.env.core.common.Environment)
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
- IStatus status = Status.OK_STATUS;
- if (clientProjectName==null || wsdlURI==null || wsdlURI.length()==0 || webServicesParser==null)
- return status;
-
- if (clientProjectName==null || clientProjectName.length()==0)
- return status;
-
- IProject clientProject = ProjectUtilities.getProject(clientProjectName);
- ValidationUtils vu = new ValidationUtils();
- boolean isServiceProject = vu.isProjectServiceProject(clientProject, wsdlURI, webServicesParser);
- if (isServiceProject)
- {
- IStatus wStatus = StatusUtils.warningStatus( msgUtils.getMessage("MSG_WARN_IS_SERVICE_PROJECT", new String[]{clientProjectName}) );
- try
- {
- environment.getStatusHandler().report(wStatus);
- }
- catch (StatusException se)
- {
- //User decided to abort. Return an error status
- IStatus eStatus = StatusUtils.errorStatus( msgUtils.getMessage("MSG_USER_ABORTED") );
- return eStatus;
- }
- }
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
deleted file mode 100644
index d5a349c88..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
+++ /dev/null
@@ -1,251 +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.ui.command;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-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.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-
-public class GenerateHandlerSkeletonCommand extends AbstractDataModelOperation
-{
-
- private MessageUtils msgUtils_;
- private IPath outputLocation_;
- private String[] handlerNames_;
- private boolean genSkeleton_;
- private String handlerNameForEdit_ = null;
-
- public GenerateHandlerSkeletonCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- }
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- MultiStatus status = null;
- IStatus returnStatus = Status.OK_STATUS;
-
- if (!genSkeleton_) return returnStatus;
-
- int i;
- boolean error = false;
-
- IStatus writeStatus;
-
-
- for (i=0; i<handlerNames_.length; i++)
- {
- writeStatus = writeFile(env, handlerNames_[i], outputLocation_, monitor );
- // handle status return
- if (writeStatus.getSeverity() == Status.ERROR)
- { // write status is OK or ERROR
- error = true;
- if (status == null)
- {
- status = StatusUtils.multiStatus( msgUtils_.getMessage("MSG_ERROR_GENERATE_HANDLER_SKELETON"), new IStatus[0] );
- }
- status.add(writeStatus);
- }
- }
-
- if (error)
- {
- env.getStatusHandler().reportError(status);
- returnStatus = status;
- }
-
- return returnStatus;
- }
-
- private IStatus writeFile (IEnvironment env, String className, IPath outputLocation, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- int index;
-
- String simpleClassName = className;
- String packageName = null;
- IPath filePath = outputLocation;
- if (className != null) {
- index = className.lastIndexOf('.');
- if (index != -1) {
- simpleClassName = className.substring(index + 1);
- packageName = className.substring(0, index);
-
- String packageSegment = packageName;
- int j = 0;
- j = packageSegment.indexOf('.');
- while (j != -1) {
- filePath = filePath.append(packageSegment.substring(0, j));
- packageSegment = packageSegment.substring(j + 1);
- j = packageSegment.indexOf('.');
- }
- filePath = filePath.append(packageSegment);
- }
- else {
- packageName = "";
- }
- }
-
- filePath = filePath.append(simpleClassName);
-
- filePath = filePath.addFileExtension("java");
-
- // check if Handler already exists; do not overwrite existing Handlers
- IResource workspaceRes = ResourceUtils.findResource(filePath);
- if (workspaceRes!=null && workspaceRes.exists()) {
- return status;
- }
-
- if (handlerNameForEdit_ == null){
- handlerNameForEdit_ = className;
- }
-
- OutputStream outputStream = FileResourceUtils.newFileOutputStream( EnvironmentUtils.getResourceContext(env), filePath, monitor, env.getStatusHandler());
- // create buffered writer for writing file
- BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(outputStream));
- try {
- if (packageName.length() != 0) {
- bw.write("package " +packageName+";");
- bw.newLine();
- bw.newLine();
- }
- bw.write("import javax.xml.rpc.handler.GenericHandler;");
- bw.newLine();
- bw.write("import javax.xml.rpc.handler.MessageContext;");
- bw.newLine();
- bw.write("import javax.xml.namespace.QName;");
- bw.newLine();
- bw.newLine();
-
- bw.write("public class "+simpleClassName+" extends GenericHandler");
- bw.newLine();
- bw.write("{");
- bw.newLine();
- bw.newLine();
-
- bw.write(" public QName[] getHeaders ()");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body");
- bw.newLine();
- bw.write(" return null;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
- bw.newLine();
- bw.write(" public boolean handleRequest( MessageContext context )");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body or delete method to use GenericHandler");
- bw.newLine();
- bw.write(" return true;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
- bw.newLine();
- bw.write(" public boolean handleResponse( MessageContext context )");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body or delete method to use GenericHandler ");
- bw.newLine();
- bw.write(" return true;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
- bw.newLine();
- bw.write(" public boolean handleFault( MessageContext context )");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body or delete method to use GenericHandler");
- bw.newLine();
- bw.write(" return true;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
-
- bw.newLine();
- bw.write("}");
- bw.close();
- status = Status.OK_STATUS;
- }
- catch (IOException e)
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_WRITE_FILE", new String[]{ className }), e );
- if (bw != null) {
- try {
- bw.close();
- } catch (IOException e1) {
- }
- }
- }
- return status;
- }
-
- public void setOutputLocation(IPath outputLocation)
- {
- this.outputLocation_ = outputLocation;
- }
-
- public void setHandlerNames (String[] handlerNames)
- {
- this.handlerNames_ = handlerNames;
- }
-
- public void setGenSkeletonEnabled(boolean genSkeleton)
- {
- this.genSkeleton_ = genSkeleton;
- }
-
- public IProject getProject(){
- IProject project = null;
- if (outputLocation_!=null){
- project = ResourceUtils.getProjectOf(outputLocation_);
- }
- return project;
- }
-
- public List getClassNames(){
- List classes = new ArrayList();
- if (handlerNameForEdit_!=null){
- classes.add(handlerNameForEdit_);
- }
- return classes;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
deleted file mode 100644
index 405ecc8a9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
+++ /dev/null
@@ -1,93 +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.ui.command;
-
-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.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class OpenJavaEditorCommand extends AbstractDataModelOperation
-{
- private List classNames;
- private IProject project;
-
- public OpenJavaEditorCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- OpenJavaEditorJob job = new OpenJavaEditorJob(classNames, project);
- job.setPriority(Job.LONG);
- job.schedule();
- return Status.OK_STATUS;
- }
-
- public void setClassNames(List classNames)
- {
- this.classNames = classNames;
- }
-
- public void setProject(IProject project)
- {
- this.project = project;
- }
-
- private class OpenJavaEditorJob extends UIJob
- {
- private List classNames;
- private IProject project;
-
- public OpenJavaEditorJob(List classNames, IProject project)
- {
- super("org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorJob");
- this.classNames = classNames;
- this.project = project;
- }
-
- public IStatus runInUIThread(IProgressMonitor monitor)
- {
- if (project != null && classNames != null)
- {
- IJavaProject javaProject = JavaCore.create(project);
- for (Iterator it = classNames.iterator(); it.hasNext();)
- {
- String className = (String)it.next();
- try
- {
- IType type = javaProject.findType(className);
- JavaUI.openInEditor(type);
- }
- catch (Throwable t)
- {
- return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.ERROR, WebServiceConsumptionUIPlugin.ID, 0, WebServiceConsumptionUIPlugin.getMessage("MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR", new String[]{className, project.getName()}), t);
- }
- }
- return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.OK, WebServiceConsumptionUIPlugin.ID, 0, "", null);
- }
- else
- return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.ERROR, WebServiceConsumptionUIPlugin.ID, 0, WebServiceConsumptionUIPlugin.getMessage("MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR", new String[]{classNames != null ? classNames.toString() : "", project != null ? project.getName() : ""}), null);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
deleted file mode 100644
index 2fd36bd24..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
+++ /dev/null
@@ -1,81 +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.consumption.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.wst.command.internal.env.core.common.MessageUtils;
-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.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSIAPContext;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSISSBPContext;
-import org.eclipse.wst.ws.internal.preferences.WSIComplianceUtils;
-
-
-
-public class WSINonCompliantRuntimeCommand extends AbstractDataModelOperation
-{
-
- private IProject serviceProject_;
- private MessageUtils msgUtils_;
-
- public WSINonCompliantRuntimeCommand()
- {
- String pluginId = "org.eclipse.wst.ws.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- }
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- PersistentWSISSBPContext wsiSSBPContext = WSPlugin.getInstance().getWSISSBPContext();
- PersistentWSIAPContext wsiAPContext = WSPlugin.getInstance().getWSIAPContext();
- Vector statusSSBP = new Vector();
- statusSSBP.add( new Status( WSIComplianceUtils.getWSISeverity(serviceProject_, wsiSSBPContext), "id", 0,
- msgUtils_.getMessage("WSI_SSBP_INCOMPLIANT_RUNTIME"), null ) );
- Status[] statusesSSBP = (Status[]) statusSSBP.toArray(new Status[statusSSBP.size()]);
-
- Vector statusAP = new Vector();
- statusAP.add( new Status( WSIComplianceUtils.getWSISeverity(serviceProject_, wsiAPContext), "id", 0,
- msgUtils_.getMessage("WSI_AP_INCOMPLIANT_RUNTIME"), null ));
- Status[] statusesAP = (Status[]) statusAP.toArray(new Status[statusAP.size()]);
-
- if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesSSBP, serviceProject_, wsiSSBPContext))
- {
- if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesAP, serviceProject_, wsiAPContext))
- {
- return Status.OK_STATUS;
- }
- else
- {
- return StatusUtils.errorStatus( msgUtils_.getMessage("NOT_OK") );
- }
- }
- else
- {
- return StatusUtils.errorStatus( msgUtils_.getMessage("NOT_OK") );
- }
- }
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject_ = serviceProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java
deleted file mode 100644
index 8387d2e62..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java
+++ /dev/null
@@ -1,40 +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.ui.command.data;
-
-import java.net.MalformedURLException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-
-public class EclipseIPath2URLStringTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- String s = value.toString();
- if (s.indexOf(":") < 0)
- {
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(value.toString());
- if (res.exists())
- {
- try
- {
- s = res.getLocation().toFile().toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- }
- }
- }
- return s;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java
deleted file mode 100644
index 37c5817d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.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.consumption.ui.command.data;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class ProjectName2IProjectTransformer implements Transformer
-{
- 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.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
deleted file mode 100644
index 3ba0cd072..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
+++ /dev/null
@@ -1,38 +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 Apr 20, 2004
- */
-package org.eclipse.jst.ws.internal.consumption.ui.command.data;
-
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-/*
- * Transforms a server instance id to an IServer
- */
-public class ServerInstToIServerTransformer implements Transformer {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object)
- */
- public Object transform(Object value) {
-
- String existingServerInstId = (String)value;
- IServer serverInst = null;
- if (existingServerInstId != null) {
- serverInst = ServerCore.findServer(existingServerInstId);
- }
- return serverInst;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java
deleted file mode 100644
index e1160c50a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.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.ui.command.data;
-
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerName2IServerTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- {
- String serverName = value.toString();
- 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(serverName))
- return server;
- }
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java
deleted file mode 100644
index a603ed932..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java
+++ /dev/null
@@ -1,35 +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 May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishFragment extends SequenceFragment
-{
- public FinishFragment()
- {
- add(new FinishTestFragment() );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
deleted file mode 100644
index 6943c0fee..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
+++ /dev/null
@@ -1,570 +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.ui.common;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetHelper;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-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.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-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;
-import org.eclipse.wst.server.core.ServerUtil;
-
-
-public class ServerSelectionUtils
-{
- /*
- * Returns reasonable defaults for server factory id and instance id based on
- * an existing project
- * index [0] contains factoryId, index[1] contains instance Id.
- * @deprecated
- */
- public static String[] getServerInfoFromExistingProject(IProject project, String componentName, String runtimeId, boolean askExtenders)
- {
- String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-
- // If the project has been added to an existing server, pick that server
- //IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
- IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(project), null);
- IServer firstSupportedServer = getFirstSupportedServer(configuredServers, runtimeId );
- if (firstSupportedServer != null)
- {
- serverInfo[0] = firstSupportedServer.getServerType().getId();
- serverInfo[1] = firstSupportedServer.getId();
- return serverInfo;
-
- }
-
-
- //Does the project have a runtime-target?
- IRuntime runtimeTarget = getRuntimeTarget(project.getName());
- if (runtimeTarget != null)
- {
- //Look for an existing server which is compatible with the runtime-target
- IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
- if (compatibleServers!=null && compatibleServers.length > 0)
- {
- IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, runtimeId);
- if (firstSupportedCompatServer != null)
- {
- serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
- serverInfo[1] = firstSupportedCompatServer.getId();
- return serverInfo;
-
- }
- }
-
- //No existing compatible server was found. Choose a compatible server type.
-
- //If the preferred server is compatible with the project's runtime target, use it.
- PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pFactoryId = ctx.getServerFactoryId();
- IServerType serverType = ServerCore.findServerType(pFactoryId);
- if (serverType!=null){
- String serverRuntimeId = serverType.getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
- {
- serverInfo[0] = pFactoryId;
- return serverInfo;
- }
- }
-
- //The preferred server was not compatible. Pick the first valid compatible server type.
- String factoryId = getFirstSupportedServerType(runtimeTarget, runtimeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
-
- if (askExtenders)
- {
- ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
- if (recommendedServerInfo!=null)
- {
- if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
- serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-
- if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
- serverInfo[1] = recommendedServerInfo.getServerInstanceId();
-
- return serverInfo;
- }
-
- }
-
- //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
- String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
- List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
- String[] compatServerInfo = getCompatibleExistingServer(runtimes,runtimeId);
- if ( compatServerInfo != null)
- {
- return compatServerInfo;
- }
-
- //No existing compatible server, pick a type.
- String factoryId = getFirstSupportedServerType(runtimes, runtimeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
-
- /*
- * Returns reasonable defaults for server factory id and instance id based on
- * an existing project
- * index [0] contains factoryId, index[1] contains instance Id.
- */
- /*
- public static String[] getServerInfoFromExistingProject(IProject project, String runtimeId, boolean askExtenders)
- {
- String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-
- // If the project has been added to an existing server, pick that server
- IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
- IServer firstSupportedServer = getFirstSupportedServer(configuredServers, runtimeId );
- if (firstSupportedServer != null)
- {
- serverInfo[0] = firstSupportedServer.getServerType().getId();
- serverInfo[1] = firstSupportedServer.getId();
- return serverInfo;
-
- }
-
-
- //Does the project have a runtime-target?
- IRuntime runtimeTarget = getRuntimeTarget(project.getName());
- if (runtimeTarget != null)
- {
- //Look for an existing server which is compatible with the runtime-target
- IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
- if (compatibleServers!=null && compatibleServers.length > 0)
- {
- IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, runtimeId);
- if (firstSupportedCompatServer != null)
- {
- serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
- serverInfo[1] = firstSupportedCompatServer.getId();
- return serverInfo;
-
- }
- }
-
- //No existing compatible server was found. Choose a compatible server type.
-
- //If the preferred server is compatible with the project's runtime target, use it.
- PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pFactoryId = ctx.getServerFactoryId();
- IServerType serverType = ServerCore.findServerType(pFactoryId);
- if (serverType!=null){
- String serverRuntimeId = serverType.getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
- {
- serverInfo[0] = pFactoryId;
- return serverInfo;
- }
- }
-
- //The preferred server was not compatible. Pick the first valid compatible server type.
- String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
-
- if (askExtenders)
- {
- ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
- if (recommendedServerInfo!=null)
- {
- if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
- serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-
- if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
- serverInfo[1] = recommendedServerInfo.getServerInstanceId();
-
- return serverInfo;
- }
-
- }
-
- //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
- String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
- List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
- List suppRuntimes = getRuntimeTargetsSupportedByWSRuntime(runtimes, runtimeId);
- String[] compatServerInfo = getCompatibleExistingServer(suppRuntimes,typeId);
- if ( compatServerInfo != null)
- {
- return compatServerInfo;
- }
-
- //No existing compatible server, pick a type.
- String factoryId = getFirstSupportedServerType(suppRuntimes, typeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
- */
-
- /*
- * Given a list of existing servers, this returns the first one that is supported
- * by the given Web service runtime id.
- * Returns null of there are no supported servers in the array.
- */
- public static IServer getFirstSupportedServer(IServer[] servers, String webServiceRuntimeId)
- {
- //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
- if (servers != null && servers.length > 0) {
- for (int i = 0; i < servers.length; i++)
- {
- String serverFactoryId = servers[i].getServerType().getId();
- if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportServer(webServiceRuntimeId, serverFactoryId))
- {
- return servers[i];
- }
- }
- }
- return null;
- }
-
-
- /*
- * Returns the factory id of a server type compatible with the Web service type and the runtime target.
- * Returns null if there are none.
- */
- public static String getFirstSupportedServerType(IRuntime runtimeTarget, String webServiceRuntimeId)
- {
- String runtimeId = runtimeTarget.getRuntimeType().getId();
- WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(webServiceRuntimeId);
- String[] serverFactoryIds = wsrt.getServerFactoryIds();
- for (int i=0; i<serverFactoryIds.length; i++)
- {
- IServerType serverType = ServerCore.findServerType(serverFactoryIds[i]);
- if (serverType!=null){
- String serverRuntimeId = serverType.getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeId))
- {
- return serverFactoryIds[i];
- }
- }
- }
- return null;
- }
-
-
- /*
- * Return the factory id of the first server type compatible with the runtimeTargets and webServiceRuntimeId.
- * Returns null if there are none.
- */
- public static String getFirstSupportedServerType(List runtimeTargets, String webServiceRuntimeId)
- {
- for (int i=0; i<runtimeTargets.size(); i++ )
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- String factoryId = getFirstSupportedServerType(runtimeTarget, webServiceRuntimeId);
- if (factoryId != null && factoryId.length()>0)
- return factoryId;
- }
-
- return null;
- }
- /*
- * Return the factory id of the first server type compatible with the runtimeTargets and typeId.
- * Returns null if there are none.
- * @deprecated
- */
- /*
- public static String getFirstSupportedServerType(List runtimeTargets, String typeId)
- {
- for (int i=0; i<runtimeTargets.size(); i++ )
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
- if (factoryId != null && factoryId.length()>0)
- return factoryId;
- }
-
- return null;
- }
- */
- public static IRuntime getRuntimeTarget(String projectName)
- {
- if( projectName != null && projectName.length() > 0 ){ //$NON-NLS-1$
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if( project != null && project.exists() ){
- return ServerCore.getProjectProperties(project).getRuntimeTarget();
- }
- }
- return null;
- }
-
- public static IServer getFirstExistingServerFromFactoryId(String factoryId)
- {
- IServer[] servers = ServerCore.getServers();
- if (servers==null || servers.length!=0)
- return null;
- else
- {
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- if (server.getServerType().getId().equals(factoryId))
- {
- return server;
- }
- }
- }
- return null;
- }
-
- public static IServer[] getCompatibleExistingServers(IRuntime runtime)
- {
- if (runtime == null)
- return null;
-
- IServer[] servers = ServerCore.getServers();
- if (servers==null || servers.length==0)
- return null;
-
- ArrayList compatibleServersList = new ArrayList();
- String runtimeId = runtime.getRuntimeType().getId();
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- String serverRuntimeId = server.getRuntime().getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeId))
- compatibleServersList.add(server);
-
- }
- if (compatibleServersList.size()<1)
- return null;
-
-
- Object[] compatibleServersArray = compatibleServersList.toArray();
- IServer[] compatibleServers = new IServer[compatibleServersArray.length];
- for (int j=0; j<compatibleServersArray.length; j++)
- {
- compatibleServers[j] = (IServer)compatibleServersArray[j];
- }
-
- return compatibleServers;
- }
-
-
- /*
- * Returns the factory Id and instance id of the first exiting server compatible
- * with the runtime targets and typeId
- * Returns null if there are none.
- * The item at [0] is the factory id.
- * The item at [1] is the instance id.
- * @deprecated
- */
- public static String[] getCompatibleExistingServer(List runtimeTargets, String webServiceRuntimeId)
- {
- String[] serverInfo = new String[2];
- for (int i=0; i<runtimeTargets.size(); i++ )
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- IServer[] existingCompatServers = getCompatibleExistingServers(runtimeTarget);
- IServer compatServer = getFirstSupportedServer(existingCompatServers, webServiceRuntimeId);
- if (compatServer != null)
- {
- serverInfo[0] = compatServer.getServerType().getId();
- serverInfo[1] = compatServer.getId();
- return serverInfo;
- }
- }
- return null;
- }
-
- /*
- * Returns the factory Id and instance id of the first exiting server compatible
- * with the runtime targets and typeId
- * Returns null if there are none.
- * The item at [0] is the factory id.
- * The item at [1] is the instance id.
- * @deprecated
- */
- /*
- public static String[] getCompatibleExistingServer(List runtimeTargets, String typeId)
- {
- String[] serverInfo = new String[2];
- for (int i=0; i<runtimeTargets.size(); i++ )
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- IServer[] existingCompatServers = getCompatibleExistingServers(runtimeTarget);
- IServer compatServer = getFirstSupportedServer(existingCompatServers, typeId);
- if (compatServer != null)
- {
- serverInfo[0] = compatServer.getServerType().getId();
- serverInfo[1] = compatServer.getId();
- return serverInfo;
- }
- }
- return null;
- }
- */
-
- public static ServerInfo getExtenderRecommendation(IProject project)
- {
- try
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "serverDefaulter");
- for (int i=0; i<elements.length; i++)
- {
- Object serverDefaulterObject = elements[i].createExecutableExtension("class");
- if (serverDefaulterObject instanceof IServerDefaulter)
- {
- IServerDefaulter serverDefaulter = (IServerDefaulter)serverDefaulterObject;
- ServerInfo serverInfo = serverDefaulter.recommendDefaultServer(project);
- if (serverInfo != null)
- return serverInfo;
- }
-
- }
- } catch (CoreException ce)
- {
- return null;
- }
-
- return null;
- }
-
- /**
- * Use this method to get a server factory id and instance id that is compatible with the given Web
- * service runtime.
- * @param webServiceRuntimeId
- * @param j2eeVersion String representation of the int values in J2EEVersionConstants i.e. "12", "13", "14"
- * @return String[] index [0] contains factoryId, index[1] contains instance Id.
- */
- public static String[] getServerFromWebServceRuntimeAndJ2EE(String webServiceRuntimeId, String j2eeVersion)
- {
- String[] serverInfo = new String[2];
-
- //Get all possible valid servers. If there are none, we can't default intelligently, return null.
-
- WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(webServiceRuntimeId);
- String[] validServerFactoryIds = wsrt.getServerFactoryIds();
- if (validServerFactoryIds==null || validServerFactoryIds.length<1)
- return null;
-
- //Get all existing servers
- IServer[] servers = ServerCore.getServers(); //Get all existing servers
-
- //Get the preferred server.
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String prefServerFactoryId = context.getServerFactoryId();
-
- boolean preferredIsValid = containsString(validServerFactoryIds, prefServerFactoryId)
- && isServerValid(prefServerFactoryId, j2eeVersion);
- if (preferredIsValid)
- {
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- String thisFactoryId = server.getServerType().getId();
-
- if (thisFactoryId.equals(prefServerFactoryId))
- {
- serverInfo[0] = prefServerFactoryId;
- serverInfo[1] = server.getId();
- return serverInfo;
- }
- }
- }
-
- //Either the preferred server was not valid or it was valid but does not exist.
- //Check the existing servers for validity
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- String thisFactoryId = server.getServerType().getId();
-
- boolean thisServerValid = containsString(validServerFactoryIds, thisFactoryId)
- && isServerValid(thisFactoryId, j2eeVersion);
- if (thisServerValid)
- {
- serverInfo[0] = thisFactoryId;
- serverInfo[1] = server.getId();
- return serverInfo;
- }
- }
-
- //None of the existing servers is valid. Pick the preferred one if valid. Otherwise, pick the
- //first valid server type.
- if (preferredIsValid)
- {
- serverInfo[0] = prefServerFactoryId;
- return serverInfo;
- }
- else
- {
- for (int i=0; i<validServerFactoryIds.length; i++ )
- {
- boolean isValid = isServerValid(validServerFactoryIds[i], j2eeVersion);
- if (isValid)
- {
- serverInfo[0] = validServerFactoryIds[i];
- return serverInfo;
- }
- }
- }
-
- //We can't determine a valid server selection. Return null.
- return null;
- }
-
- private static boolean isServerValid(String serverFactoryId, String j2eeVersion)
- {
- if (serverFactoryId==null || serverFactoryId.length()==0 || j2eeVersion==null || j2eeVersion.length()==0)
- return true;
-
- String runtimeTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
- if (runtimeTargetId == null || runtimeTargetId.length()==0)
- return false;
- String webModuleType = IServerTargetConstants.WEB_TYPE;
- boolean isValid = ServerUtils.isTargetValidForProjectType(runtimeTargetId, j2eeVersion, webModuleType);
- return isValid;
- }
- /*
- * Returns true is a contains b, false otherwise.
- */
- private static boolean containsString(String[] a, String b)
- {
- if (a==null || a.length<0 || b == null || b.length()==0 )
- return false;
-
- for (int i=0; i<a.length; i++)
- {
- String s = a[i];
- if (s.equals(b))
- {
- return true;
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
deleted file mode 100644
index e31aa9fd4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
+++ /dev/null
@@ -1,376 +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.ui.common;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-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.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class ValidationUtils
-{
- MessageUtils msgUtils;
-
- /**
- *
- */
- public ValidationUtils()
- {
- String pluginId = WebServiceConsumptionUIPlugin.ID; //"org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils( pluginId + ".plugin", this );
- }
-
- public IStatus validateProjectTargetAndJ2EE(String projectName, String compName, String earName, String earCompName, String serverFactoryId, String j2eeLevel)
- {
- IProject p = ProjectUtilities.getProject(projectName);
- IProject earP = null;
- if (earName!=null && !earName.equalsIgnoreCase("")) {
- earP = ProjectUtilities.getProject(earName);
- }
- IStatus targetStatus = doesProjectTargetMatchServerType(p, serverFactoryId);
- if (earP!=null && targetStatus.getSeverity()==Status.OK)
- {
- //check the EAR
- IStatus earTargetStatus = doesProjectTargetMatchServerType(earP, serverFactoryId);
- if(earTargetStatus.getSeverity()==Status.ERROR)
- {
- return earTargetStatus;
- }
- }
- else
- {
- return targetStatus;
- }
-
-
- //Validate service side J2EE level
- IStatus j2eeStatus = doesProjectMatchJ2EELevel(p, compName, j2eeLevel);
- if(earP!=null && j2eeStatus.getSeverity()==Status.OK)
- {
- IStatus earJ2EEStatus = doesProjectMatchJ2EELevel(earP, earCompName, j2eeLevel);
- if(earJ2EEStatus.getSeverity()==Status.ERROR)
- {
- return earJ2EEStatus;
- }
- }
- else
- {
- return j2eeStatus;
- }
-
- return Status.OK_STATUS;
- }
-
- private IStatus doesProjectTargetMatchServerType(IProject p, String serverFactoryId)
- {
- if (p!=null && p.exists())
- {
- IRuntime projectTarget = ServerSelectionUtils.getRuntimeTarget(p.getName());
- if (projectTarget!=null)
- {
- String projectTargetId = projectTarget.getRuntimeType().getId();
- String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
- if (serverTargetId!=null && serverTargetId.length()>0)
- {
- if(!projectTargetId.equals(serverTargetId))
- {
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_SERVER_TARGET_MISMATCH",new String[]{p.getName()}) );
- }
- }
- }
- }
- return Status.OK_STATUS;
- }
-
- private IStatus doesProjectMatchJ2EELevel(IProject p, String compName, String j2eeLevel)
- {
-
- try {
- if (p!=null && p.exists())
- {
- int projectJ2EELevel = J2EEUtils.getJ2EEVersion(p);
- if (projectJ2EELevel!=-1)
- {
- String projectJ2EELevelString = String.valueOf(projectJ2EELevel);
- if (j2eeLevel!=null && j2eeLevel.length()>0)
- {
- if (!projectJ2EELevelString.equals(j2eeLevel))
- {
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_J2EE_MISMATCH",new String[]{p.getName()}) );
- }
- }
- }
- }
- } catch(Exception e){
-
- }
-
- return Status.OK_STATUS;
- }
-
- public IStatus validateProjectType(String projectName, SelectionListChoices runtime2ClientTypes)
- {
- IStatus status = Status.OK_STATUS;
- IProject p = ProjectUtilities.getProject(projectName);
- if (p==null || !p.exists())
- {
- //Project does not exist which means a new project of the correct type will be created
- //We're done. All is good.
- return status;
- }
-
- //If the project exists, we should see it in the project list for the selected client
- //project type.
- String[] projectNames = runtime2ClientTypes.getChoice().getChoice().getList().getList();
- for (int i=0; i<projectNames.length; i++)
- {
- if (projectName.equals(projectNames[i]))
- {
- //Found the project. All is good.
- return status;
- }
- }
-
- //Didn't find the project. Return an error.
- //Get the label for the client type id
- String clientTypeLabel = getClientTypeLabel(runtime2ClientTypes.getChoice().getList().getSelection());
- String message = msgUtils.getMessage("MSG_WRONG_CLIENT_PROJECT_TYPE",new String[]{projectName, clientTypeLabel});
- IStatus eStatus = StatusUtils.errorStatus( message );
- return eStatus;
-
- }
-
-
- private String getClientTypeLabel( String type )
- {
- if (type.equals(IModuleConstants.JST_WEB_MODULE))
- {
- return msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_WEB");
- }
- else if (type.equals(IModuleConstants.JST_EJB_MODULE))
- {
- return msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_EJB");
- }
- else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
- {
- return msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_APP_CLIENT");
- }
- else if (type.equals(IModuleConstants.JST_UTILITY_MODULE))
- {
- return msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_CONTAINERLESS");
- }
- else
- {
- //No known label, return the typeId itself.
- return type;
- }
- }
-
- /**
- *
- * @param p
- * @param wsdlURL
- * @param parser
- * @return
- */
- public boolean isProjectServiceProject(IProject p, String wsdlURL, WebServicesParser parser)
- {
- if (p==null || wsdlURL==null || wsdlURL.length()==0 || parser==null)
- return false;
-
- IResource wsXML = getWebServcesXML(p);
- if (wsXML==null)
- return false;
-
-
- //Make a list of all the wsdl-port's in webservices.xml
- WebServicesManager wsm = WebServicesManager.getInstance();
- //WebServiceEditModel wsEditModel = wsm.getWSEditModel(p);
- //WebServices ws = wsEditModel.getWebServices();
- Iterator wsDescs = wsm.getInternalWebServicesDescriptions().iterator();
- ArrayList wsdlPortList = new ArrayList();
- while(wsDescs.hasNext())
- {
- WebServiceDescription wsDesc = (WebServiceDescription)wsDescs.next();
- Iterator pcs = wsDesc.getPortComponents().iterator();
- while(pcs.hasNext())
- {
- PortComponent pc = (PortComponent)pcs.next();
- WSDLPort wsdlPort = pc.getWsdlPort();
- wsdlPortList.add(new QualifiedName(wsdlPort.getNamespaceURI(), wsdlPort.getLocalPart()));
- }
- }
-
- ArrayList portList = getPortNamesFromWsdl(wsdlURL, parser);
-
- //If any of the QualifiedNames in portList equals any of the QualifiedNames
- //in wsdlPortList, this is the service project. Return true.
- Object[] ports = portList.toArray();
- Object[] wsdlPorts = wsdlPortList.toArray();
- for (int i = 0; i < ports.length; i++)
- {
- QualifiedName portName = (QualifiedName) ports[i];
- for (int j = 0; j < wsdlPorts.length; j++)
- {
- QualifiedName wsdlPortName = (QualifiedName) wsdlPorts[j];
- if (portName.equals(wsdlPortName))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * @deprecated
- *
- */
- private IResource getWebServcesXML(IProject p)
- {
- //
-// J2EENature nature = (J2EENature) J2EENature.getRegisteredRuntime(p);
-// if (nature == null)
-// return null;
-
-// IResource moduleRoot = nature.getModuleServerRoot();
-// IResource moduleRoot = ResourceUtils.getWebModuleServerRoot(p);
- IResource moduleRoot = J2EEUtils.getFirstWebContentContainer(p);
- if (!(moduleRoot instanceof IContainer))
- return null;
-
- IResource webServicesXML=null;
-// if (nature instanceof J2EEWebNatureRuntime)
- if (ResourceUtils.isWebProject(p))
- {
- StringBuffer wsPath = new StringBuffer();
- wsPath.append("WEB-INF/");
- wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
- webServicesXML = ((IContainer)moduleRoot).findMember(wsPath.toString());
- }
- else //Must be an Application Client Module or an EJB Module
- {
- StringBuffer wsPath = new StringBuffer();
- wsPath.append("META-INF/");
- wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
- webServicesXML = ((IContainer)moduleRoot).findMember(wsPath.toString());
- }
-
- return webServicesXML;
- }
-
- private ArrayList getPortNamesFromWsdl(String wsdlURL, WebServicesParser parser)
- {
- ArrayList portNameList = new ArrayList();
- Definition def = parser.getWSDLDefinition(wsdlURL);
- Map services = def.getServices();
- Service service = null;
- for (Iterator it = services.values().iterator(); it.hasNext();)
- {
- service = (Service)it.next();
- String namespace = service.getQName().getNamespaceURI();
- Map ports = service.getPorts();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- portNameList.add(new QualifiedName(namespace, port.getName()));
- }
- }
-
- return portNameList;
-
- }
-
- private class QualifiedName
- {
- String namespaceURI;
-
- String localPart;
-
- /**
- * @param namespaceURI
- * @param localPart
- */
- public QualifiedName(String namespaceURI, String localPart)
- {
- super();
- this.namespaceURI = namespaceURI;
- this.localPart = localPart;
- }
-
- /**
- * @return Returns the localPart.
- */
- public String getLocalPart()
- {
- return localPart;
- }
-
- /**
- * @param localPart
- * The localPart to set.
- */
- public void setLocalPart(String localPart)
- {
- this.localPart = localPart;
- }
-
- /**
- * @return Returns the namespaceURI.
- */
- public String getNamespaceURI()
- {
- return namespaceURI;
- }
-
- /**
- * @param namespaceURI
- * The namespaceURI to set.
- */
- public void setNamespaceURI(String namespaceURI)
- {
- this.namespaceURI = namespaceURI;
- }
-
- public boolean equals(QualifiedName qn)
- {
- return (qn.getNamespaceURI().equals(namespaceURI) && qn.getLocalPart()
- .equals(localPart));
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
deleted file mode 100644
index b93d947e9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
+++ /dev/null
@@ -1,108 +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.ui.extension;
-
-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.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallClientFragment;
-import org.eclipse.wst.ws.internal.extensions.RunClientFragment;
-
-public class ClientRootFragment extends SequenceFragment
-{
- public ClientRootFragment()
- {
- add( new SimpleFragment( new PreClientDevelopCommand(), "" ) );
- add( new DevelopClientFragment() );
- add( new SimpleFragment( new PreClientAssembleCommand(), "" ) );
- add( new AssembleClientFragment() );
- add( new SimpleFragment( new PreClientDeployCommand(), "" ) );
- add( new DeployClientFragment() );
- add( new SimpleFragment( new PreClientInstallCommand(), "" ) );
- add( new InstallClientFragment() );
- add( new SimpleFragment( new PreClientRunCommand(),
- "org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientRunCommand" ) );
- add( new RunClientFragment() );
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- registry.addMapping( PreClientDevelopCommand.class, "WebService", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", DevelopClientFragment.class );
-
- // Map the PreClientDevelopCommand into the dataObject.
- registry.addMapping( PreClientDevelopCommand.class, "DataObject", DataObjectCommand.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", AssembleClientFragment.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", DeployClientFragment.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", InstallClientFragment.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", RunClientFragment.class );
-
- //Mappings from framework to framework commands
- registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "J2eeLevel", PreClientAssembleCommand.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", PreClientInstallCommand.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientRunCommand.class );
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
deleted file mode 100644
index bd0b2f51a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
+++ /dev/null
@@ -1,106 +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.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.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-public class PreClientAssembleCommand extends AbstractDataModelOperation
-{
- private IWebServiceClient webServiceClient_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private String j2eeLevel_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- System.out.println("In Pre client assemble command.");
-
- // Check if EAR module is req'd, ie. !=null
- if (earProject_==null)
- return Status.OK_STATUS;
-
- //Create the client EAR module
- CreateModuleCommand command = new CreateModuleCommand();
- command.setProjectName(earProject_);
- command.setModuleName(ear_);
- command.setModuleType(CreateModuleCommand.EAR);
- command.setServerFactoryId(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
- command.setServerInstanceId( webServiceClient_.getWebServiceClientInfo().getServerInstanceId() );
- command.setJ2eeLevel(j2eeLevel_);
- command.setEnvironment( environment );
- IStatus status = command.execute( null, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- return status;
- }
-
-
- //Associate the client 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( null, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError( 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;
- }
-
-
- public void setJ2eeLevel( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public void setWebService( IWebServiceClient webServiceClient )
- {
- webServiceClient_ = webServiceClient;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java
deleted file mode 100644
index 28203c621..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java
+++ /dev/null
@@ -1,26 +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.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;
-
-public class PreClientDeployCommand extends AbstractDataModelOperation
-{
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
deleted file mode 100644
index 8cd9bb3ec..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
+++ /dev/null
@@ -1,313 +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.ui.extension;
-
-import java.util.Set;
-
-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.j2ee.internal.J2EEVersionConstants;
-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.command.common.CreateModuleCommand;
-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.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-public class PreClientDevelopCommand extends AbstractDataModelOperation
-{
-
- private TypeRuntimeServer typeRuntimeServer_;
- private String clientRuntimeId_;
- private IContext context_;
- private ISelection selection_;
- private String project_;
- private String module_;
- private String moduleType_;
- private String earProject_;
- private String ear_;
- private IWebServiceClient webServiceClient_;
- private String j2eeLevel_;
- private ResourceContext resourceContext_;
- private boolean test_;
- private String wsdlURI_;
- private Object dataObject_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- 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
- .getClientRuntime(clientRuntimeId_);
- WebServiceClientInfo wsInfo = new WebServiceClientInfo();
-
- System.out.println("In Pre client develop command.");
-
- wsInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
- wsInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
- wsInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
- wsInfo.setWsdlURL(wsdlURI_);
-
- webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
- WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
- context_ = new SimpleContext(true, true, true, true, true, true, test_,
- false, scenario, resourceContext_.isOverwriteFilesEnabled(),
- resourceContext_.isCreateFoldersEnabled(), resourceContext_
- .isCheckoutFilesEnabled());
-
- IStatus status = Status.OK_STATUS;
-
- // Create the client module if needed.
- IProject project = ProjectUtilities.getProject(project_);
- if (!project.exists())
- {
- RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRequiredFacetVersions();
- Set facetVersions = FacetUtils.getInitialFacetVersionsFromTemplate(moduleType_);
- FacetMatcher fm = FacetUtils.match(rfv, facetVersions);
- if (fm.isMatch())
- {
- CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
- command.setProjectName(project_);
- command.setTemplateId(moduleType_);
- command.setRequiredFacetVersions(rfv);
- command.setServerFactoryId(typeRuntimeServer_.getServerId());
- command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- //command.setFacetMatcher(fm);
- status = command.execute( monitor, adaptable );
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- }
- }
- }
- else
- {
- //TODO add the necessary facets
- }
-
-
- //int intModuleType = convertModuleType(moduleType_);
-
- //CreateModuleCommand command = new CreateModuleCommand();
- //command.setProjectName(project_);
- //command.setModuleName(module_);
- //command.setModuleType(intModuleType);
- //command.setServerFactoryId(typeRuntimeServer_.getServerId());
- //command.setJ2eeLevel(j2eeLevel_);
- //command.setEnvironment( environment );
- //IStatus status = command.execute( null, null );
-
- // rsk todo -- once the clientProjectType extension is gone, determination
- // of what type of module to create will have to be done.
- //if (moduleType_.equals(ID_WEB)) command.setModuleType(CreateModuleCommand.WEB);
- //if (moduleType_.equals(ID_EJB)) command.setModuleType(CreateModuleCommand.EJB);
- //if (moduleType_.equals(ID_APP_CLIENT)) command.setModuleType(CreateModuleCommand.APPCLIENT);
-
- //command.setServerInstanceId( typeRuntimeServer_.getServerInstanceId() );
-
-
-
- return status;
- }
-
- private String getJ2EELevelFromExistingProject()
- {
- IProject project = ProjectUtilities.getProject(project_);
- if (project != null && project.exists())
- {
- //If the project has the "jst.web", "jst.ejb", or "jst.appclient" facet, deduce a J2EE version.
- int j2eeLevelInt = J2EEUtils.getJ2EEVersion(project);
- if (j2eeLevelInt != -1)
- {
- return String.valueOf(j2eeLevelInt);
- }
- }
-
- //TODO Figure out the J2EE version from the facets to add to a project.
- return String.valueOf(J2EEVersionConstants.J2EE_1_4_ID); //for now, just return something
- }
-
- /*
- private int convertModuleType(String type)
- {
- if (type.equals(IModuleConstants.JST_WEB_MODULE))
- {
- return CreateModuleCommand.WEB;
- }
- else if (type.equals(IModuleConstants.JST_EJB_MODULE))
- {
- return CreateModuleCommand.EJB;
- }
- else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
- {
- return CreateModuleCommand.APPCLIENT;
- }
- else if (type.equals(IModuleConstants.JST_EAR_MODULE))
- {
- return CreateModuleCommand.EAR;
- }
- else
- {
- return -1;
- }
- }
- */
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
- {
- typeRuntimeServer_ = typeRuntimeServer;
- }
-
- public void setClientRuntimeId( String id)
- {
- clientRuntimeId_ = id;
- }
-
- public void setClientJ2EEVersion( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public String getJ2eeLevel()
- {
- return j2eeLevel_;
- }
-
- public IWebServiceClient getWebService()
- {
- return webServiceClient_;
- }
-
- 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 moduleType)
- {
- moduleType_ = moduleType;
- }
-
- public String getEarProject()
- {
- return earProject_;
- }
-
- public String getEar()
- {
- return ear_;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setTestService(boolean testService)
- {
- test_ = testService;
- }
-
- public void setWsdlURI(String uri)
- {
- wsdlURI_ = uri;
- }
-
- public void setDataObject( Object object )
- {
- dataObject_ = object;
- }
-
- public Object getDataObject()
- {
- Object result = null;
-
- if( dataObject_ != null && dataObject_ instanceof IWebService )
- {
- // The data object has already been set with an IWebService
- // so we will keep this value.
- result = dataObject_;
- }
- else
- {
- result = webServiceClient_;
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
deleted file mode 100644
index 30f7ff28f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
+++ /dev/null
@@ -1,104 +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.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.IWebServiceClient;
-
-public class PreClientInstallCommand extends AbstractDataModelOperation
-{
- private IWebServiceClient webServiceClient_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- if (webServiceClient_.getWebServiceClientInfo().getServerInstanceId()==null)
- {
- CreateServerCommand createServerCommand = new CreateServerCommand();
- createServerCommand.setServerFactoryid(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
- createServerCommand.setEnvironment( environment );
- IStatus createServerStatus = createServerCommand.execute(null, null);
- if (createServerStatus.getSeverity()==Status.OK)
- {
- webServiceClient_.getWebServiceClientInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
- }
- else
- {
- if (createServerStatus.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError( createServerStatus );
- }
- return createServerStatus;
- }
- }
-
-
-
- AddModuleToServerCommand command = new AddModuleToServerCommand();
- command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().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( null, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError( 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;
- }
-
- public void setWebService( IWebServiceClient webServiceClient )
- {
- webServiceClient_ = webServiceClient;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
deleted file mode 100644
index 85a3b0a0e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
+++ /dev/null
@@ -1,47 +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.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.StartServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-public class PreClientRunCommand extends AbstractDataModelOperation
-{
- private IWebServiceClient webServiceClient_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- System.out.println("In Pre client run command.");
- StartServerCommand command = new StartServerCommand();
- command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
- command.setEnvironment( environment );
- IStatus status = command.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- }
- return status;
- }
-
- public void setWebService( IWebServiceClient webServiceClient )
- {
- webServiceClient_ = webServiceClient;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
deleted file mode 100644
index da888cadc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
+++ /dev/null
@@ -1,135 +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.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-/**
-* 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 WebServiceConsumptionUIPlugin extends AbstractUIPlugin
-{
- // 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.consumption.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceConsumptionUIPlugin instance_;
-
- private PersistentServerRuntimeContext serverRuntimeContext_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceConsumptionUIPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceConsumptionUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
- * @return The WebServiceConsumptionUIPlugin singleton.
- */
- static public WebServiceConsumptionUIPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * 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 )
- {
- MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.consumption.ui.plugin", instance_ );
-
- if( key.startsWith("%"))
- {
- key = key.substring( 1, key.length() );
- }
-
- return msgUtils.getMessage(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;
- }
- }
-
- public PersistentServerRuntimeContext getServerRuntimeContext()
- {
- if (serverRuntimeContext_ == null)
- {
- serverRuntimeContext_ = new PersistentServerRuntimeContext();
- serverRuntimeContext_.load();
- }
- return serverRuntimeContext_;
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
deleted file mode 100644
index 946f456f7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
+++ /dev/null
@@ -1,131 +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.ui.preferences;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-/**
- *
- */
-public class PersistentServerRuntimeContext extends PersistentContext {
-
- private String PREFERENCE_SERVER = "PREFERENCE_SERVER";
- private String PREFERENCE_RUNTIME = "PREFERENCE_RUNTIME";
- private String PREFERENCE_J2EE_VERSION = "PREFERENCE_J2EE_VERSION";
-
- private String SERVER_FACTORY_ID_DEFAULT = "org.eclipse.jst.server.tomcat.50";
- private String RUNTIME_ID_DEFAULT = "org.eclipse.jst.ws.axis.creation.axisWebServiceRT";
- private String J2EE_VERSION_DEFAULT = "14";
-
- public PersistentServerRuntimeContext()
- {
- super(WebServiceConsumptionUIPlugin.getInstance());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.Context#load()
- */
- public void load() {
- //Defaults will be set via the .ini customization. They are hard coded to default values in the
- //absence of a .ini file.
- String serverDefault = getDefaultString(PREFERENCE_SERVER);
- if (serverDefault==null || serverDefault.length()==0)
- {
- setDefault(PREFERENCE_SERVER, SERVER_FACTORY_ID_DEFAULT);
- }
-
- String runtimeDefault = getDefaultString(PREFERENCE_RUNTIME);
- if (runtimeDefault==null || runtimeDefault.length()==0)
- {
- setDefault(PREFERENCE_RUNTIME, RUNTIME_ID_DEFAULT);
- }
-
- String j2eeDefault = getDefaultString(PREFERENCE_J2EE_VERSION);
- if (j2eeDefault==null || j2eeDefault.length()==0)
- {
- setDefault(PREFERENCE_J2EE_VERSION, J2EE_VERSION_DEFAULT);
- }
-
-
- }
-
- public String getDefaultServerFactoryId()
- {
- return getDefaultString(PREFERENCE_SERVER);
- }
-
- public String getDefaultRuntimeId()
- {
- return getDefaultString(PREFERENCE_RUNTIME);
- }
-
- public String getDefaultJ2EEVersion()
- {
- return getDefaultString(PREFERENCE_J2EE_VERSION);
- }
-
- public String getServerFactoryId()
- {
- String value = getValueAsString(PREFERENCE_SERVER);
- /*
- if (value==null || value.length()==0)
- {
- value = SERVER_FACTORY_ID_DEFAULT;
- setServerFactoryId(value);
- }
- */
- return value;
- }
-
- public String getRuntimeId()
- {
- String value = getValueAsString(PREFERENCE_RUNTIME);
- /*
- if (value==null || value.length()==0)
- {
- value = RUNTIME_ID_DEFAULT;
- setRuntimeId(value);
- }
- */
- return value;
- }
-
- public String getJ2EEVersion()
- {
- String value = getValueAsString(PREFERENCE_J2EE_VERSION);
- /*
- if (value==null || value.length()==0)
- {
- value = J2EE_VERSION_DEFAULT;
- setJ2EEVersion(value);
- }
- */
- return value;
- }
-
- public void setServerFactoryId(String id)
- {
- setValue(PREFERENCE_SERVER,id);
- }
-
- public void setRuntimeId(String id)
- {
- setValue(PREFERENCE_RUNTIME, id);
- }
-
- public void setJ2EEVersion(String version)
- {
- setValue(PREFERENCE_J2EE_VERSION, version);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
deleted file mode 100644
index e0d4eacff..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
+++ /dev/null
@@ -1,391 +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.ui.preferences;
-
-import java.util.ArrayList;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-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.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-
-
-/**
- *
- */
-public class ServerRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener
-{
- private String pluginId_= "org.eclipse.jst.ws.consumption.ui";
- private MessageUtils msgUtils_;
-
- /* CONTEXT_ID SRPF0001 for server preference on the server runtime preference page */
- private String INFOPOP_SRPF_SERVER_PREF = pluginId_ + ".SRPF0001";
- private Combo server_;
-
- /* CONTEXT_ID SRPF0002 for runtime preference on the server runtime preference page */
- private String INFOPOP_SRPF_RUNTIME_PREF = pluginId_ + ".SRPF0002";
- private Combo runtime_;
-
- /* CONTEXT_ID SRPF0003 for J2EE version preference on the server runtime preference page */
- private String INFOPOP_SRPF_J2EE_PREF = pluginId_ + ".SRPF0003";
- private Combo j2eeVersion_;
-
- SelectionListChoices serverToRuntimeToJ2EE_;
-
- public void init(IWorkbench workbench) { }
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent)
- {
-
- msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
- 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);
-
- server_ = uiUtils.createCombo(page,"LABEL_SERVERS_LIST",
- "TOOLTIP_SRPF_COMBO_SERVER",
- INFOPOP_SRPF_SERVER_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
- runtime_ = uiUtils.createCombo(page,"LABEL_RUNTIMES_LIST",
- "TOOLTIP_SRPF_COMBO_RUNTIME",
- INFOPOP_SRPF_RUNTIME_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
- j2eeVersion_ = uiUtils.createCombo(page,"LABEL_J2EE_VERSION",
- "TOOLTIP_SRPF_COMBO_J2EE",
- INFOPOP_SRPF_J2EE_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
- initializeValues();
- startListening();
- return page;
- }
-
- private void initializeValues()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- serverToRuntimeToJ2EE_ = WebServiceRuntimeExtensionUtils2.getServerToRuntimeToJ2EE();
-
-
- setServerItems(serverToRuntimeToJ2EE_.getList().getList());
- String defaultServerText = context.getServerFactoryId();
- serverToRuntimeToJ2EE_.getList().setSelectionValue(defaultServerText);
- setServerSelection(defaultServerText);
-
- setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
- String defaultRuntimeText = context.getRuntimeId();
- serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(defaultRuntimeText);
- setRuntimeSelection(defaultRuntimeText);
-
- setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
- String defaultJ2EEVersion = context.getJ2EEVersion();
- serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(defaultJ2EEVersion);
- setJ2EESelection(defaultJ2EEVersion);
-
- }
-
- public void handleEvent(Event event)
- {
- if (server_ == event.widget)
- {
- handleServerSelected();
- }
- else if (runtime_ == event.widget)
- {
- handleRuntimeSelected();
- }
- else if (j2eeVersion_ == event.widget)
- {
- handleJ2EESelected();
- }
- }
-
- private void handleServerSelected()
- {
- stopListening();
-
- String selectedText = getServerSelection();
- serverToRuntimeToJ2EE_.getList().setSelectionValue(selectedText);
-
- //Update the runtime -------------------------------
- setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
- if (serverToRuntimeToJ2EE_.getChoice().getList().getList().length > 0)
- serverToRuntimeToJ2EE_.getChoice().getList().setIndex(0);
-
- String newRuntimeText = serverToRuntimeToJ2EE_.getChoice().getList().getSelection();
- if (newRuntimeText!=null && newRuntimeText.length()>0)
- setRuntimeSelection(newRuntimeText);
-
- //Update the j2ee version -------------------------------
- if (newRuntimeText!=null && newRuntimeText.length()>0)
- {
- setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
- if (serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList().length > 0)
- serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setIndex(0);
-
- String newJ2EEText = serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getSelection();
- if (newJ2EEText!=null && newJ2EEText.length()>0)
- setJ2EESelection(newJ2EEText);
- }
- else
- {
- setJ2EEItems(new String[0]);
- }
-
- startListening();
- }
-
- private void handleRuntimeSelected()
- {
- stopListening();
-
- String selectedText = getRuntimeSelection();
- serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(selectedText);
-
- //Update the j2ee version -------------------------------
- setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
- if (serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList().length > 0)
- serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setIndex(0);
-
- String newJ2EEText = serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getSelection();
- if (newJ2EEText!=null && newJ2EEText.length()>0)
- setJ2EESelection(newJ2EEText);
-
- startListening();
- }
-
- private void handleJ2EESelected()
- {
- stopListening();
-
- String selectedText = getJ2EESelection();
- serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(selectedText);
-
- startListening();
- }
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- setToDefaults();
- }
-
- private void setToDefaults()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-
- String defaultServerText = context.getDefaultServerFactoryId();
- serverToRuntimeToJ2EE_.getList().setSelectionValue(defaultServerText);
- setServerSelection(defaultServerText);
-
- setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
- String defaultRuntimeText = context.getDefaultRuntimeId();
- serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(defaultRuntimeText);
- setRuntimeSelection(defaultRuntimeText);
-
- setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
- String defaultJ2EEVersion = context.getDefaultJ2EEVersion();
- serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(defaultJ2EEVersion);
- setJ2EESelection(defaultJ2EEVersion);
- }
-
- /**
- * 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()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- context.setServerFactoryId(getServerSelection());
- context.setRuntimeId(getRuntimeSelection());
- context.setJ2EEVersion(getJ2EESelection());
- }
-
- protected void performApply()
- {
- performOk();
- }
-
-
- private void startListening()
- {
- server_.addListener(SWT.Selection,this);
- runtime_.addListener(SWT.Selection,this);
- j2eeVersion_.addListener(SWT.Selection,this);
- }
-
- private void stopListening()
- {
- server_.removeListener(SWT.Selection, this);
- runtime_.removeListener(SWT.Selection, this);
- j2eeVersion_.removeListener(SWT.Selection, this);
- }
-
- private void setServerItems(String[] factoryIds)
- {
-
- if (factoryIds != null)
- {
- ArrayList serverLabelsList = new ArrayList();
- for (int i=0;i<factoryIds.length;i++)
- {
- //String thisServerLabel = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryIds[i]);
- String thisServerLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(factoryIds[i]);
- if (thisServerLabel!=null && thisServerLabel.length()>0)
- {
- serverLabelsList.add(thisServerLabel);
- }
-
- }
- String[] serverLabels = convertToStringArray(serverLabelsList.toArray());
- server_.setItems(serverLabels);
- }
-
- }
-
- private void setRuntimeItems(String[] ids)
- {
- if (ids != null)
- {
- String[] runtimeLabels = new String[ids.length];
- for (int i=0;i<ids.length;i++)
- {
- //runtimeLabels[i] = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(ids[i]);
- runtimeLabels[i] = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(ids[i]);
- }
- runtime_.setItems(runtimeLabels);
- }
-
- }
-
- private void setJ2EEItems(String[] versions)
- {
- if (versions != null)
- {
- String[] j2eeLabels = new String[versions.length];
- for (int i = 0; i < versions.length; i++)
- {
- String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
- if (label != null && label.length()>0)
- j2eeLabels[i] = label;
- else
- j2eeLabels[i] = msgUtils_.getMessage("LABEL_NA");
- }
- j2eeVersion_.setItems(j2eeLabels);
-
- //Disable the combo if it has no items.
- if (j2eeLabels.length > 0)
- j2eeVersion_.setEnabled(true);
- else
- j2eeVersion_.setEnabled(false);
- }
-
- }
-
- private String getServerSelection()
- {
- String serverLabel = server_.getText();
- //return WebServiceServerRuntimeTypeRegistry.getInstance().getServerFactoryId(serverLabel);
- return WebServiceRuntimeExtensionUtils2.getServerFactoryId(serverLabel);
- }
-
- private String getRuntimeSelection()
- {
- String runtimeLabel = runtime_.getText();
- //return WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeId(runtimeLabel);
- return WebServiceRuntimeExtensionUtils2.getRuntimeId(runtimeLabel);
- }
-
- private String getJ2EESelection()
- {
- String j2eeLabel = j2eeVersion_.getText();
- return J2EEUtils.getJ2EEVersionFromLabel(j2eeLabel);
- }
-
- private void setServerSelection(String factoryId)
- {
- //String label = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryId);
- String label = WebServiceRuntimeExtensionUtils2.getServerLabelById(factoryId);
- setSelection(server_,label);
- }
-
- private void setRuntimeSelection(String id)
- {
- //String label = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(id);
- String label = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(id);
- setSelection(runtime_,label);
- }
-
- private void setJ2EESelection(String version)
- {
- String label = J2EEUtils.getLabelFromJ2EEVersion(version);
- setSelection(j2eeVersion_, label);
- }
-
- 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 String[] convertToStringArray(Object[] a)
- {
- if (a==null) return new String[0];
-
- int length = a.length;
- String[] sa = new String[length];
- for (int i=0; i<length; i++)
- {
- Object obj = a[i];
- if (obj instanceof String)
- {
- sa[i] = (String)obj;
- }
- }
- return sa;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
deleted file mode 100644
index 932c8af51..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
+++ /dev/null
@@ -1,29 +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.ui.selection;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.Selection;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class SelectionTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- IStructuredSelection inSelection = (IStructuredSelection)value;
- Selection outSelection = new Selection();
-
- outSelection.setSelection( inSelection.toArray() );
-
- return outSelection;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java
deleted file mode 100644
index ea986fdb7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java
+++ /dev/null
@@ -1,56 +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.ui.server;
-
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 StartClientWidgetContributor implements INamedWidgetContributor
-{
- private IServer server_;
- private MessageUtils msgUtils_;
-
- public StartClientWidgetContributor( IServer server )
- {
- server_ = server;
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.ui.plugin", this );
- }
-
- public String getDescription()
- {
- return msgUtils_.getMessage( "PAGE_DESC_WS_START_SERVER" );
- }
-
- public String getName()
- {
- return "";
- }
-
- public String getTitle()
- {
- return msgUtils_.getMessage( "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.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java
deleted file mode 100644
index 09ea36778..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java
+++ /dev/null
@@ -1,57 +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.ui.server;
-
-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.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.IWebServiceClient;
-
-public class StartClientWidgetFactory implements INamedWidgetContributorFactory
-{
- private IWebServiceClient webserviceClient_;
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- IServer server = null;
-
- if( webserviceClient_ != null )
- {
- server = ServerCore.findServer(webserviceClient_.getWebServiceClientInfo().getServerInstanceId() );
- }
-
- if( server != null && server.getServerState() != IServer.STATE_STARTED )
- {
- return new StartClientWidgetContributor( server );
- }
-
- return null;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", StartClientWidgetFactory.class );
- }
-
- public void setWebService( IWebServiceClient webserviceClient )
- {
- webserviceClient_ = webserviceClient;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
deleted file mode 100644
index f0f19a587..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
+++ /dev/null
@@ -1,444 +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.ui.server;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-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.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-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.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.environment.NullStatusHandler;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartServerWidget extends SimpleWidgetDataContributor
-{
- private IServer server_;
- private IStatus status_;
- private Listener statusListener_;
- private Button button_;
- private JobChangeAdapter jobChangeAdapter_;
- private Text serverStateText_;
- private ProgressMonitorPart progressMonitor_;
- private MessageUtils msgUtils_;
- private String pluginId_;
- private Composite buttonGroup_;
-
- /*CONTEXT_ID SSWP0001 Start the server button. */
- private String INFOPOP_SSWP_SERVER_BUTTON = "SSWP0001";
-
- public StartServerWidget( IServer server )
- {
- pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-
- server_ = server;
-
- jobChangeAdapter_ = new JobChangeAdapter()
- {
- public void done(final IJobChangeEvent event)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- setServerState();
- progressMonitor_.done();
- reportErrorIfRequired( (StartServerJob)event.getJob() );
- }
- }
- });
- }
- };
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- statusListener_ = statusListener;
-
- UIUtils uiUtils = new UIUtils( msgUtils_, pluginId_ );
- Composite group = uiUtils.createComposite( parent, 1 );
-
- Text text1 = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
- text1.setText( msgUtils_.getMessage( "LABEL_START_SERVER_TEXT1", new String[]{ server_.getName() } ));
-
- Text text2 = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
- text2.setText( msgUtils_.getMessage( "LABEL_START_SERVER_TEXT2", new String[]{ server_.getName() } ));
-
- Text text3 = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
- text3.setText( msgUtils_.getMessage( "LABEL_START_SERVER_TEXT3", new String[]{ server_.getName() } ));
-
- Text text4 = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
- text4.setText( msgUtils_.getMessage( "LABEL_START_SERVER_TEXT4", new String[]{ server_.getName() } ));
-
- buttonGroup_ = uiUtils.createComposite( group, 2,-1, 0 );
- serverStateText_ = uiUtils.createText( buttonGroup_, null, null, null, SWT.READ_ONLY );
- serverStateText_.setLayoutData( new GridData() );
-
- button_ = uiUtils.createPushButton( buttonGroup_,
- "LABEL_START_SERVER_BUTTON",
- "TOOLTIP_START_SERVER_BUTTON",
- INFOPOP_SSWP_SERVER_BUTTON );
-
- button_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- serverStateText_.setText( getStateMessage( "TEXT_SERVER_STATUS", "TEXT_SERVER_STARTING" ) );
- progressMonitor_.beginTask( getStateMessage( "TEXT_SERVER_MSG", "TEXT_SERVER_STARTING" ), IProgressMonitor.UNKNOWN );
- button_.setEnabled( false );
- buttonGroup_.pack();
- startServerJob();
- }
- } );
-
- progressMonitor_ = new ProgressMonitorPart( group, new GridLayout() );
- progressMonitor_.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-
- setServerState();
- return this;
- }
-
- public IStatus getStatus()
- {
- return status_;
- }
-
- private void setServerState()
- {
- int state = server_.getServerState();
-
- switch( state )
- {
- case IServer.STATE_STARTED:
- {
- status_ = Status.OK_STATUS;
- button_.setEnabled( false );
- serverStateText_.setText( getStateMessage( "TEXT_SERVER_STATUS", "TEXT_SERVER_STARTED" ) );
-
- break;
- }
-
- case IServer.STATE_STARTING:
- {
- status_ = StatusUtils.errorStatus( "" );
- button_.setEnabled( false );
- serverStateText_.setText( getStateMessage( "TEXT_SERVER_STATUS", "TEXT_SERVER_STARTING" ) );
- progressMonitor_.beginTask( getStateMessage( "TEXT_SERVER_MSG", "TEXT_SERVER_STARTING" ), IProgressMonitor.UNKNOWN );
-
- // The server is still starting so we need to reconnect to the job
- // that is starting it.
- startServerJob();
- break;
- }
-
- default:
- {
- status_ = StatusUtils.errorStatus( "" );
- button_.setEnabled( true );
- serverStateText_.setText( getStateMessage( "TEXT_SERVER_STATUS", "TEXT_SERVER_STOPPED" ) );
- break;
- }
- };
-
- statusListener_.handleEvent( null );
- buttonGroup_.pack();
- }
-
- private String getStateMessage( String mainKey, String subKey )
- {
- return msgUtils_.getMessage( mainKey, new String[]{ msgUtils_.getMessage( subKey ) } );
- }
-
- // Connect to an existing server thread otherwise start a new one.
- private void startServerJob()
- {
- IJobManager jobManager = Platform.getJobManager();
- Job[] jobs = jobManager.find( StartServerFamily );
- StartServerJob startServerJob = null;
-
- // There may be more than one job starting for different servers.
- // Therefore, we need to find the one for our server if it is available.
- for( int index = 0; index < jobs.length; index++ )
- {
- StartServerJob jobFound = (StartServerJob)jobs[index];
-
- if( jobFound.getServer() == server_ )
- {
- startServerJob = jobFound;
- break;
- }
- }
-
- if( startServerJob != null )
- {
- synchronized( StartServerFamily )
- {
- IStatus status = startServerJob.getStatus();
-
- // We are using status to determine if the job has completed or not.
- // Normally, we would not get here if the job had already completed,
- // but there is a slim window where the job manager gives us the job
- // and then it immediately completes.
- if( status == null )
- {
- // The job had not completed yet so we will add a job change listener.
- // We are adding the job listener here so that we don't have to assume
- // that this instance of this widget is the same as the previous instance.
- // If startServerJob already has "jobChangeAdapter_" added to it this
- // method call will not have an effect.(Which is what we want.)
- startServerJob.addJobChangeListener( jobChangeAdapter_ );
-
- // Note: this job was reporting progress to different progressMonitor_
- // control. We need to tell the job that it should report progress
- // to our new progressMonitor_ control on this wizard page.
- ProgressMonitorWrapper monitor = (ProgressMonitorWrapper)startServerJob.getMonitor();
- monitor.setMonitor( progressMonitor_ );
- }
- else
- {
- // The job completed before we had a chance to add the job change listener
- // Therefore, we will just call jobChangeAdapter_ directly to notify
- // the UI that the job has completed.
- jobChangeAdapter_.done( null );
- }
- }
- }
- else
- {
- startServerJob = new StartServerJob();
- startServerJob.addJobChangeListener( jobChangeAdapter_ );
- startServerJob.schedule();
- }
- }
-
- private void reportErrorIfRequired( StartServerJob serverJob )
- {
- IStatus status = serverJob.getStatus();
-
- if( status.getSeverity() == Status.ERROR )
- {
- Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- EclipseStatusHandler handler = new EclipseStatusHandler( shell );
-
- handler.reportError( status );
- }
- }
-
- final private static String StartServerFamily = "StartServerFamily";
-
- // This class is used to start up the server in an Eclipse job.
- private class StartServerJob extends Job
- {
- private IStatus status_ = null;
- private ProgressMonitorWrapper envMonitor_;
-
- public StartServerJob()
- {
- super( "StartServerJob" );
-
- envMonitor_ = new ProgressMonitorWrapper( progressMonitor_ );
- }
-
- public IServer getServer()
- {
- return server_;
- }
-
- public ProgressMonitorWrapper getMonitor()
- {
- return envMonitor_;
- }
-
- public boolean belongsTo(Object family)
- {
- return family == StartServerFamily;
- }
-
- protected IStatus run(IProgressMonitor monitor)
- {
- NullStatusHandler handler = new NullStatusHandler();
- TransientResourceContext resourceContext = new TransientResourceContext();
- EclipseEnvironment environment = new EclipseEnvironment( null,resourceContext, handler );
- StartServerCommand serverCommand = new StartServerCommand( false, false );
-
- serverCommand.setServerInstanceId( server_.getId() );
- serverCommand.setEnvironment( environment );
-
- try
- {
- setStatus( serverCommand.execute( envMonitor_, null ) );
- }
- catch( Throwable exc )
- {
- exc.printStackTrace();
- setStatus( StatusUtils.errorStatus( exc ) );
- }
-
- return Status.OK_STATUS;
- }
-
- // Calls to this method need to first synchronize on the
- // StartServerFamily object.
- public IStatus getStatus()
- {
- return status_;
- }
-
- private void setStatus( IStatus status )
- {
- synchronized( StartServerFamily )
- {
- status_ = status;
- }
- }
- }
-
- private class ProgressMonitorWrapper implements IProgressMonitor
- {
- private IProgressMonitor monitor_ = new NullProgressMonitor();
-
- public ProgressMonitorWrapper( IProgressMonitor monitor )
- {
- monitor_ = monitor;
- }
-
- public void setMonitor( IProgressMonitor monitor )
- {
- monitor_ = monitor;
- }
-
- public void beginTask(final String name, final int totalWork)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.beginTask( name, totalWork );
- }
- }
- } );
- }
-
- public void done()
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.done();
- }
- }
- } );
- }
-
- public void internalWorked(final double work)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.internalWorked( work );
- }
- }
- } );
- }
-
- public boolean isCanceled()
- {
- return progressMonitor_.isDisposed() ? false : monitor_.isCanceled();
- }
-
- public void setCanceled(boolean value)
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.setCanceled( value );
- }
- }
-
- public void setTaskName(final String name)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.setTaskName( name );
- }
- }
- } );
- }
-
- public void subTask( final String name)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.subTask( name );
- }
- }
- } );
- }
-
- public void worked(final int work)
- {
- Display.getDefault().asyncExec( new Runnable()
- {
- public void run()
- {
- if( !progressMonitor_.isDisposed() )
- {
- monitor_.worked( work );
- }
- }
- } );
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
deleted file mode 100644
index ea63d68a7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
+++ /dev/null
@@ -1,120 +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.ui.widgets;
-
-import java.util.List;
-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.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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;
-
-
-/**
- * AbstractHandlersWidgetDefaultingCmd
- *
- * Initialize and load the handlers data
- */
-public abstract class AbstractHandlersWidgetDefaultingCmd extends AbstractDataModelOperation
-{
-
- private IStructuredSelection initialSelection_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- IStatus status = Status.OK_STATUS;
-
- IStructuredSelection selection = initialSelection_;
- if (selection == null) {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED") );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-
- return status;
-
- }
-
-
- public List getClientHandlers(){
- return null;
- }
-
- public void setInitialSelection(IStructuredSelection initSelection){
- this.initialSelection_ = initSelection;
- }
-
- public IStructuredSelection getInitialSelection(){
- return this.initialSelection_;
- }
-
- protected IResource getResourceFromInitialSelection()
- {
- if (initialSelection_ != null && initialSelection_.size() == 1)
- {
- Object obj = initialSelection_.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- return resource;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- public IProject getProject(){
-
- IResource resource = getResourceFromInitialSelection();
- if (resource != null)
- {
- return ResourceUtils.getProjectOf( resource.getFullPath() );
- }
-
- return null;
- }
-
- public String getComponentName(){
- IResource resource = getResourceFromInitialSelection();
- if (resource!=null) {
- IPath absolutePath = resource.getFullPath();
- if (absolutePath.isAbsolute()) {
- return absolutePath.segment(1);
- }
- }
- return null;
- }
-
-// public WebServiceEditModel getWebServiceEditModel() {
-// WebServicesManager wsm = new WebServicesManager();
-// IProject project = getProject();
-// return wsm.getWSEditModel(project);
-// }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
deleted file mode 100644
index 3e4f0bd83..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
+++ /dev/null
@@ -1,266 +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 May 12, 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.consumption.ui.widgets;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-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.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.Text;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-
-public class AddHandlerDialog extends Dialog implements Listener {
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private MessageUtils msgUtils_;
- private boolean validateOn_;
- private boolean isClient_;
- private String className;
- private String name;
- private String selectedPortName;
-
- private Text classNameText;
- private Text nameText;
- private Combo portNameCombo;
-
- // ----TOOLTIPS Section----
- /* CONTEXT_ID AHDL0001 for the Handler Config Page */
- private final String INFOPOP_TEXT_HANDLER_NAME = "AHDL0001"; //$NON-NLS-1$
- private final String TOOLTIP_TEXT_HANDLER_NAME = "TOOLTIP_TEXT_HANDLER_NAME";
-
- /* CONTEXT_ID AHDL0002 for the Handler Config Page */
- private final String INFOPOP_TEXT_HANDLER_CLASS = "AHDL0002"; //$NON-NLS-1$
- private final String TOOLTIP_TEXT_HANDLER_CLASS = "TOOLTIP_TEXT_HANDLER_CLASS";
-
- /* CONTEXT_ID AHDL0001 for the Handler Config Page */
- private final String INFOPOP_TEXT_HANDLER_PORT = "AHDL0003"; //$NON-NLS-1$
- private final String TOOLTIP_TEXT_HANDLER_PORT = "TOOLTIP_TEXT_HANDLER_PORT";
-
- private Button beanClassBrowseButton_;
- /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
- public AddHandlerDialog( Shell shell, boolean isClientHandler)
- {
- super(shell);
- isClient_ = isClientHandler;
- }
-
- protected Control createContents(Composite parent) {
- Composite comp = (Composite) super.createContents(parent);
- parent.getShell().pack();
- return comp;
- }
-
- protected Control createDialogArea(Composite parent) {
- validateOn_ = false;
- msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
- Shell thisShell = parent.getShell();
- if (thisShell == null) {
- thisShell = createShell();
- }
- thisShell.setText(msgUtils_.getMessage("DIALOG_TITLE_WS_ADD_HANDLER"));
-
- Composite composite = (Composite) super.createDialogArea(parent);
-
- Composite sourceLocationComp = uiUtils.createComposite(composite, 3);
-
- classNameText = uiUtils.createText(sourceLocationComp, "LABEL_TEXT_HANDLER_CLASS", TOOLTIP_TEXT_HANDLER_CLASS, INFOPOP_TEXT_HANDLER_CLASS, SWT.SINGLE | SWT.BORDER);
- classNameText.addListener(SWT.Modify,this);
-
- beanClassBrowseButton_ = uiUtils.createPushButton( sourceLocationComp, "BUTTON_BROWSE_CLASSES",
- "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
- INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
- beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseClasses();
- }
- } );
-
- nameText = uiUtils.createText(sourceLocationComp, "LABEL_TEXT_HANDLER_NAME", TOOLTIP_TEXT_HANDLER_NAME, INFOPOP_TEXT_HANDLER_NAME, SWT.SINGLE | SWT.BORDER );
- nameText.addListener(SWT.Modify, this);
-
- // dummy label for column 3.
- new Label( sourceLocationComp, SWT.NONE );
-
- if (!isClient_){
- portNameCombo = uiUtils.createCombo(sourceLocationComp, "LABEL_TEXT_HANDLER_PORT", TOOLTIP_TEXT_HANDLER_PORT, INFOPOP_TEXT_HANDLER_PORT, SWT.SINGLE | SWT.BORDER );
- portNameCombo.addListener(SWT.Modify, this);
-
- // dummy label for column 3.
- new Label( sourceLocationComp, SWT.NONE );
- }
- validateOn_ = true;
- return composite;
- }
-
- private void handleBrowseClasses()
- {
- Shell shell = getShell();
- IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
-
- if( itype != null )
- {
- classNameText.setText(itype.getFullyQualifiedName());
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
- */
- public void handleEvent(Event event) {
- if (!validateOn_)
- return;
- if (classNameText == event.widget) {
- handleClassNameTextEvent();
- validateTextFieldEntries();
- return;
- }
- if (nameText == event.widget) {
- handleNameTextEvent();
- validateTextFieldEntries();
- return;
- }
- if (portNameCombo == event.widget) {
- handlePortNameTextEvent();
- validateTextFieldEntries();
- return;
- }
- }
-
- private void handleClassNameTextEvent(){
- className = classNameText.getText();
- if (className.lastIndexOf(".java") != -1){
- nameText.setText(className.substring(0, className.lastIndexOf(".java")));
- }
- else {
- nameText.setText(className);
- }
-
- if (className.lastIndexOf(".") != -1){
- nameText.setText(className.substring(className.lastIndexOf(".")+1, className.length()));
- }
- name = nameText.getText();
- }
-
- private void handleNameTextEvent() {
- name = nameText.getText();
-
- }
-
- private void handlePortNameTextEvent(){
- selectedPortName = portNameCombo.getText();
- }
-
- private void disableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(false);
- }
-
- private void enableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(true);
- }
-
- private void validateTextFieldEntries(){
- if (classNameText.getText().equals("")){
- disableOKButton();
- return;
- }
- if (nameText.getText().equals("")){
- disableOKButton();
- return;
- }
- if (!isClient_){
- if (portNameCombo.getText()!=null && portNameCombo.getText().equals("")){
- disableOKButton();
- return;
- }
- else if (portNameCombo.getText()==null) {
- disableOKButton();
- return;
- }
- }
-
- enableOKButton();
-
-
- }
-
- /**
- * @return Returns the className.
- */
- public String getClassName() {
- if (className.lastIndexOf(".java") != -1){
- return className.substring(0, className.lastIndexOf(".java"));
- }
- else {
- return className;
- }
- }
- /**
- * @param className The className to set.
- */
- public void setClassName(String className) {
- this.className = className;
- }
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
- /**
- * @param name The name to set.
- */
- public void setName(String name) {
- this.name = name;
- }
- /**
- * @return Returns the portName.
- */
- public String getPortName() {
- return selectedPortName;
- }
- /**
- * @param portName The portName to set.
- */
- public void setPortNames(String[] portNames) {
- portNameCombo.setItems(portNames);
- portNameCombo.select(0);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
deleted file mode 100644
index 33697f3fa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
+++ /dev/null
@@ -1,108 +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.ui.widgets;
-
-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.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ValidateWSDLJob;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-
-public class CheckWSDLValidationCommand extends AbstractDataModelOperation
-{
- private static MessageUtils msgUtils_;
-
- public CheckWSDLValidationCommand () {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IJobManager jobManager = Platform.getJobManager();
- Job[] jobs = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
- ValidateWSDLJob existingValidateWSDLJob = null;
-
- if( jobs.length > 0 )
- {
- for (int i=0; i<jobs.length; i++) {
- existingValidateWSDLJob = (ValidateWSDLJob)jobs[i];
-
- if (existingValidateWSDLJob.getState() != Job.NONE) {
- if (ignoreWSDLValidation(env)) {
- // if don't want to wait for validation, cancel existing validation job
- existingValidateWSDLJob.cancel();
- return Status.OK_STATUS;
- } else {
- // wait for WSDL validation
- return StatusUtils.errorStatus( msgUtils_.getMessage("WAIT_FOR_WSDL") );
- }
- }
- }
- }
-
- return Status.OK_STATUS;
-
- }
-
- private boolean ignoreWSDLValidation(IEnvironment env) {
- if (!WSPlugin.getInstance().getWaitForWSDLValidationContext().getPersistentWaitForWSDLValidation())
- return true; // do not want to wait for WSDL validation, i.e. Ignore all
-
- // give a warning message with the options to stop, ignore this one, or
- // ignore all coming messages
- IStatus status_ = StatusUtils.warningStatus( msgUtils_.getMessage("STILL_VALIDATING_WSDL") );
- // adding all messages from WSI Incompliances
-
- Choice ignoreChoice = new Choice('C', msgUtils_
- .getMessage("CANCEL_VALIDATION_LABEL"), msgUtils_
- .getMessage("CANCEL_VALIDATION_DESCRIPTION"));
- Choice ignoreAllChoice = new Choice('A', msgUtils_
- .getMessage("CANCEL_ALL_VALIDATION_LABEL"), msgUtils_
- .getMessage("CANCEL_ALL_VALIDATION_DESCRIPTION"));
- Choice cancelChoice = new Choice('W', msgUtils_
- .getMessage("WAIT_VALIDATION_LABEL"), msgUtils_
- .getMessage("WAIT_VALIDATION_DESCRIPTION"));
-
- Choice result = env.getStatusHandler().report(status_,
- new Choice[] { ignoreChoice, ignoreAllChoice, cancelChoice });
-
- // if the user closes the message box or selects ignore continue
- if (result == null
- || (result.getLabel().equals(ignoreChoice.getLabel()))) {
- return true;
- // if the user selects ignore all, change the preference
- } else if (result.getLabel().equals(ignoreAllChoice.getLabel())) {
- // update ignore WSDL validation preference
- WSPlugin.getInstance().getWaitForWSDLValidationContext().setWaitForWSDLValidation(false);
- return true;
- }
- // if the user selects to cancel , do not continue with the command
- else if (result.getLabel().equals(cancelChoice.getLabel())) {
- return false;
- }
- return true;
- }
-
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
deleted file mode 100644
index 929471640..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,264 +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.ui.widgets;
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-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.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-/**
- * ClientHandlersWidgetDefaultingCommand
- *
- * Initialize and load the handlers data
- */
-public class ClientHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
- private HandlerTableItem[] handlers_;
-
- private MessageUtils msgUtils_;
-
- private Hashtable wsRefsToHandlersTable_;
-
- private Hashtable refNameToServiceRefObj_;
-
-// private WebServiceEditModel wsEditModel_;
-
- private WebServicesManager webServicesManager_;
-
- private IProject project_;
-
- private WebServicesResource wsClientRes_;
-
- private String serviceRefName_ = null;
-
- private Collection wsServiceRefs_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- IStatus status = Status.OK_STATUS;
-
- webServicesManager_ = new WebServicesManager();
-
- IStructuredSelection selection = getInitialSelection();
- if (selection == null) {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED") );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- status = processHandlers();
- return status;
-
- }
-
- public IStatus processHandlers() {
- try {
- Vector handlers = new Vector();
- wsRefsToHandlersTable_ = new Hashtable();
- refNameToServiceRefObj_ = new Hashtable();
-
-// wsEditModel_ = getWebServiceEditModel();
-
- wsServiceRefs_ = getWSServiceRefsFromSelection();
-
- if (wsServiceRefs_ != null) {
- Iterator wsRefsIter = wsServiceRefs_.iterator();
- for (int i = 0; i < wsServiceRefs_.size(); i++) {
-
- ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next();
-
- List wsHandlers = wsServiceRef.getHandlers();
- HandlerTableItem[] handlerItems = new HandlerTableItem[wsHandlers.size()];
- for (int k = 0; k < wsHandlers.size(); k++) {
-
- Handler wsHandler = (Handler) wsHandlers.get(k);
-
- HandlerTableItem handlerItem = new HandlerTableItem();
- handlerItem.setHandler(wsHandler);
- handlerItem.setHandlerName(wsHandler.getHandlerName());
- handlerItem.setHandlerClassName(wsHandler.getHandlerClass().getQualifiedName());
- handlerItem.setWsDescRef(wsServiceRef);
- handlerItems[k] = handlerItem;
- handlers.add(handlerItem);
- }
- String wsServiceRefName = wsServiceRef.getServiceRefName();
- wsRefsToHandlersTable_.put(wsServiceRefName, handlerItems);
- refNameToServiceRefObj_.put(wsServiceRefName, wsServiceRef);
-
- }
-
- handlers_ = (HandlerTableItem[]) handlers.toArray(new HandlerTableItem[0]);
- }
- }
- catch (Exception e) {
- return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), e);
- }
- return Status.OK_STATUS;
- }
-
- public HandlerTableItem[] getAllHandlers() {
- return this.handlers_;
- }
-
- public Hashtable getHandlers() {
- return wsRefsToHandlersTable_;
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean getGenSkeletonEnabled() {
- return true;
- }
-
- /**
- * @return Returns the sourceOutputLocation_.
- */
- public IPath[] getSourceOutputLocation() {
- IPath[] locations = null;
- if (project_==null)
- project_ = getProject();
- if (project_ != null) {
- locations = ResourceUtils.getAllJavaSourceLocations(project_);
- }
-
- return locations;
- }
-
- /**
- * @return Returns the wsEditModel.
- */
-// public WebServiceEditModel getWsEditModel() {
-// return wsEditModel_;
-// }
-
- public String getServiceRefName() {
- return this.serviceRefName_;
- }
-
- public WebServicesResource getWsClientResource() {
- return wsClientRes_;
- }
-
- public IProject getClientProject() {
- return project_;
- }
-
- private Collection getWSServiceRefsFromSelection() {
-
- IStructuredSelection initSel = getInitialSelection();
- if (initSel != null && initSel.size() == 1) {
- Object obj = initSel.getFirstElement();
- ServiceRef serviceRef = null;
- if (obj instanceof ServiceRef) {
- // Client ServiceRef
- serviceRef = (ServiceRef) obj;
- serviceRefName_ = serviceRef.getServiceRefName();
- project_ = ProjectUtilities.getProject(serviceRef);
- }
- else if (obj instanceof WebServiceNavigatorGroupType) {
- WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
- serviceRef = wsngt.getServiceRef();
- serviceRefName_ = serviceRef.getServiceRefName();
- project_ = ProjectUtilities.getProject(serviceRef);
- }
-
- if (project_==null){
- project_ = getProject();
- }
- if (project_==null){
- return null;
- }
-
- List clientWSResourceList = webServicesManager_.get13ServiceRefs(project_);
- if (!clientWSResourceList.isEmpty())
- wsClientRes_ = (WebServicesResource)clientWSResourceList.get(0);
-
- if (J2EEUtils.isWebComponent(project_)) {
- WebArtifactEdit webEdit = null;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(project_);
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(vc);
- if (webEdit != null)
- {
- WebApp webApp = (WebApp) webEdit.getDeploymentDescriptorRoot();
- if (webApp != null) {
- return webServicesManager_.getServiceRefs(webApp);
- }
- }
- }
- finally{
- if(webEdit!=null)
- webEdit.dispose();
- }
- }
- //TODO Remove old Nature refs
-// else if (J2EEUtils.isAppClientComponent(project_, componentName_)){
-// ApplicationClientNatureRuntime rt = ApplicationClientNatureRuntime.getRuntime(project_);
-// if (rt!=null) {
-// ApplicationClient appClient = rt.getApplicationClient();
-// if (appClient != null){
-// return webServicesManager_.getServiceRefs(appClient);
-// }
-// }
-// }
-// else if (J2EEUtils.isEJBComponent(project_, componentName_)){
-// EJBNatureRuntime rt = EJBNatureRuntime.getRuntime(project_);
-// if(rt!=null){
-// EJBJar ejbJar = rt.getEJBJar();
-// if (ejbJar !=null){
-// return webServicesManager_.getServiceRefs(ejbJar);
-// }
-// }
-// }
-
-
- }
- return null;
- }
-
- public Hashtable getRefNameToServiceRef() {
- return this.refNameToServiceRefObj_;
- }
-
- public Collection getWsServiceRefs(){
- return this.wsServiceRefs_;
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
deleted file mode 100644
index 9626b82f5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,223 +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.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-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.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientFactoryImpl;
-import org.eclipse.jst.ws.internal.common.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-
-/*
- * Provide a way to externalize the edited fields and create new handlers
- *
- */
-public class ClientHandlersWidgetOutputCommand extends AbstractDataModelOperation
-{
-
- //private List handlerTableItems_;
- private Hashtable oldWSServiceRefsToHandlersTable_;
-
- private Hashtable newWSServiceRefsToHandlersTable_;
-
-// private WebServiceEditModel wsEditModel_;
-
- private Hashtable handlersTable_;
-
- private IProject project_;
-
- private Collection wsServiceRefs_;
-
- private EditModel editModel_;
-
- private Object accessorKey_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- IStatus status = Status.OK_STATUS;
-
- try {
-
- oldWSServiceRefsToHandlersTable_ = new Hashtable();
- newWSServiceRefsToHandlersTable_ = new Hashtable();
-
- if (wsServiceRefs_ != null) {
- Iterator wsRefsIter = wsServiceRefs_.iterator();
- for (int i = 0; i < wsServiceRefs_.size(); i++) {
-
- ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next();
-
- List wsHandlers = wsServiceRef.getHandlers();
- oldWSServiceRefsToHandlersTable_.put(wsServiceRef, wsHandlers);
- newWSServiceRefsToHandlersTable_.put(wsServiceRef, new ArrayList());
- }
-
- Enumeration e = handlersTable_.keys();
- while (e.hasMoreElements()) {
-
- String serviceRefName = (String) e.nextElement();
- List handlerTableItems_ = (List) handlersTable_.get(serviceRefName);
- if (handlerTableItems_ != null) {
- // form Handler tables
- for (int i = 0; i < handlerTableItems_.size(); i++) {
-
- HandlerTableItem hti = (HandlerTableItem) handlerTableItems_.get(i);
- Object wsModelRef = hti.getWsDescRef();
- if (wsModelRef != null && wsModelRef instanceof ServiceRef) {
- ServiceRef wsRef = (ServiceRef) wsModelRef;
-
- Object handler = hti.getHandler();
- if (handler != null && handler instanceof Handler) {
- // clone it
- Handler clonedHandler = (Handler) EtoolsCopyUtility.createCopy((Handler) handler);
- ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(clonedHandler);
- }
- else {
- // create it
- Webservice_clientFactory wsClientFactory = new Webservice_clientFactoryImpl();
- Handler newHandler = wsClientFactory.createHandler();
- newHandler.setHandlerName(hti.getHandlerName());
-
- JavaClass javaClass = JavaMOFUtils.getJavaClass(hti.getHandlerClassName(), project_);
- if (javaClass != null) {
- newHandler.setHandlerClass(javaClass);
- }
-
- ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(newHandler);
- }
-
- }
-
- }
- }
- }
-
- // add handlers to ports
- addHandlersToServiceRefs();
- getJ2EEEditModel();
-
- // save the resource
- //TODO Remove old Nature refs
-// if (J2EEUtils.getJ2EEVersion(project_) == J2EEVersionConstants.J2EE_1_4_ID) {
-// editModel_.save(accessorKey_);
-// }
-// else {
-// if (wsClientRes_!=null)
-// wsClientRes_.save(new HashMap());
-// }
- }
- }
- catch (Exception e)
- {
- return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), e);
- }
- finally {
- if (editModel_ != null)
- editModel_.releaseAccess(accessorKey_);
- }
- return status;
- }
-
- private void addHandlersToServiceRefs() {
- try {
- Enumeration refsToHandlers = newWSServiceRefsToHandlersTable_.keys();
- while (refsToHandlers.hasMoreElements()) {
- ServiceRef serviceRef = (ServiceRef) refsToHandlers.nextElement();
- if (serviceRef != null) {
-
- List handlers = (List) newWSServiceRefsToHandlersTable_.get(serviceRef);
- List modelHandlers = (List) oldWSServiceRefsToHandlersTable_.get(serviceRef);
- modelHandlers.clear();
- modelHandlers.addAll(handlers);
- }
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * @param handlerTableItems
- * The handlerTableItems to set.
- */
- // public void setAllHandlersList(List handlerTableItems) {
- // this.handlerTableItems_ = handlerTableItems;
- // }
- public void setHandlersTable(Hashtable handlersTable) {
- this.handlersTable_ = handlersTable;
- }
-
- /**
- * @param wsEditModel
- * The wsEditModel to set.
- */
-// public void setWsEditModel(WebServiceEditModel wsEditModel) {
-// this.wsEditModel_ = wsEditModel;
-// }
-
- public void setClientProject(IProject project) {
- this.project_ = project;
- }
-
- public void setWsClientResource(WebServicesResource wsRes) {
- }
-
- public void setWsServiceRefs(Collection wsRefs) {
- this.wsServiceRefs_ = wsRefs;
- }
-
- public void getJ2EEEditModel() {
- //TODO Remove old Nature refs
-// accessorKey_ = new Object();
-// if (ResourceUtils.isWebProject(project_)) {
-// J2EEWebNatureRuntime rt = J2EEWebNatureRuntime.getRuntime(project_);
-// if (rt != null) {
-// editModel_ = rt.getWebAppEditModelForWrite(accessorKey_);
-// }
-// }
-// else if (ResourceUtils.isAppClientProject(project_)){
-// ApplicationClientNatureRuntime rt = ApplicationClientNatureRuntime.getRuntime(project_);
-// if (rt!=null) {
-// editModel_ = rt.getAppClientEditModelForWrite(accessorKey_);
-// }
-// }
-// else if (ResourceUtils.isEJBProject(project_)){
-// EJBNatureRuntime rt = EJBNatureRuntime.getRuntime(project_);
-// if(rt!=null){
-// editModel_ = rt.getEJBEditModelForWrite(accessorKey_);
-// }
-// }
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
deleted file mode 100644
index 006524c6e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
+++ /dev/null
@@ -1,111 +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.ui.widgets;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class ClientWizardWidget extends SimpleWidgetDataContributor
-{
- private WebServiceClientTypeWidget clientWidget_;
- private PreferencesSelectionWidget preferencesWidget_;
-
- /*CONTEXT_ID PWPR0013 for the test service checkbox of the project page*/
- private String INFOPOP_PWPR_CHECKBOX_TEST_SERVICE = "PWPR0013";
- private Button testService_;
-
- /*CONTEXT_ID PWPR0014 for the monitor service checkbox of the project page*/
- private String INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE = "PWRPR0014";
- private Button monitorService;
-
- /*CONTEXT_ID PWPR0001 for the Project Page*/
- private String INFOPOP_PWPR_PAGE = "PWPR0001";
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- UIUtils utils = new UIUtils( msgUtils, pluginId );
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PWPR_PAGE );
-
- Composite clientComposite = utils.createComposite( parent, 1 );
-
- clientWidget_ = new WebServiceClientTypeWidget();
- clientWidget_.addControls(clientComposite, statusListener );
-
-
- // Create test service check box.
- Composite testGroup = utils.createComposite(clientComposite,1);
-
- testService_ = utils.createCheckbox( testGroup, "CHECKBOX_TEST_WEBSERVICE",
- "TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE",
- INFOPOP_PWPR_CHECKBOX_TEST_SERVICE );
-
- // Create monitor service check box.
- monitorService = utils.createCheckbox(testGroup, "CHECKBOX_MONITOR_WEBSERVICE", "TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE", INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE);
-
- // Create the preferences controls.
- preferencesWidget_ = new PreferencesSelectionWidget();
- preferencesWidget_.addControls( clientComposite, statusListener );
-
- return this;
- }
-
- public void setResourceContext( ResourceContext context )
- {
- preferencesWidget_.setResourceContext( context );
- }
-
- public ResourceContext getResourceContext()
- {
- return preferencesWidget_.getResourceContext();
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- clientWidget_.setTypeRuntimeServer( ids );
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientWidget_.getTypeRuntimeServer();
- }
-
- public Boolean getTestService()
- {
- return new Boolean( testService_.getSelection() );
- }
-
- public void setTestService( Boolean value )
- {
- testService_.setSelection( value.booleanValue() );
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean(monitorService.getSelection());
- }
-
- public void setMonitorService(Boolean value)
- {
- monitorService.setSelection(value.booleanValue());
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
deleted file mode 100644
index 86154f1ec..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,75 +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.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.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.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class ClientWizardWidgetDefaultingCommand extends AbstractDataModelOperation
-{
- public Boolean getTestService()
- {
- return new Boolean( getScenarioContext().getTestWebService() );
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean( getScenarioContext().getMonitorWebService());
- }
-
- public ResourceContext getResourceContext()
- {
- return WebServicePlugin.getInstance().getResourceContext();
- }
-
- // Current ScenarioContext is used to default the first page of the wizard. The
- // properties in ScenarioContext are mapped individual. Therefore, ScenarioContext
- // should not also be mapped.
- protected ScenarioContext getScenarioContext()
- {
- return WebServicePlugin.getInstance().getScenarioContext();
- }
-
- // TODO Set client name defaults here.
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- // rskreg
- //WebServiceClientTypeRegistry registry = WebServiceClientTypeRegistry.getInstance();
- String type = getScenarioContext().getClientWebServiceType();
- //String runtime = registry.getAllClientRuntimes()[0];
- String runtime = WebServiceRuntimeExtensionUtils2.getAllRuntimesForClientSide()[0];
- //String server = registry.getAllClientServerFactoryIds()[0];
- String server = WebServiceRuntimeExtensionUtils2.getAllClientServerFactoryIds()[0];
- TypeRuntimeServer result = new TypeRuntimeServer();
- // rskreg
-
- result.setTypeId( type );
- result.setRuntimeId( runtime );
- result.setServerId( server );
-
- return result;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
deleted file mode 100644
index c331d46f2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,75 +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.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.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class ClientWizardWidgetOutputCommand extends AbstractDataModelOperation
-{
- private boolean testService_;
- private boolean monitorService;
- private ResourceContext resourceContext_;
- private TypeRuntimeServer clientIds_;
-
- public boolean getTestService()
- {
- return testService_;
- }
-
- public void setTestService( boolean testService )
- {
- testService_ = testService;
- }
-
- public boolean getMonitorService()
- {
- return monitorService;
- }
-
- public void setMonitorService(boolean monitorService)
- {
- this.monitorService = monitorService;
- }
-
- public ResourceContext getResourceContext()
- {
-
- return resourceContext_;
- }
-
- public void setResourceContext( ResourceContext context )
- {
- resourceContext_ = context;
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientIds_;
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer clientIds )
- {
- clientIds_ = clientIds;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
deleted file mode 100644
index a83a3e9f0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
+++ /dev/null
@@ -1,585 +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.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-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.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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * ConfigClientHandlersTreeWidget
- *
- */
-public class ConfigClientHandlersTableWidget extends SimpleWidgetDataContributor {
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private MessageUtils msgUtils_ = null;
- private Composite parent_;
- private boolean isGenSkeletonEnabled_;
- private String outputLocation_;
- private Combo webServiceRefCombo_;
- private Table handlersTable_;
- private TableViewer tableViewer_;
- private Button addButton_;
- private Button removeButton_;
- private Button genSkeletonRadioButton_;
- private Combo sourceLocationCombo_;
-
- private Hashtable pathsTable_ = new Hashtable();
- private Hashtable wsRefsToHandlers_;
- private Hashtable refNameToServiceRef_;
- private Vector orderedHandlers_;
- //private ServiceRef serviceRef_;
- private String serviceRefName_;
- private int DEFAULT_COLUMN_WIDTH = 150;
-
- // ----TOOLTIPS Section----
- /* CONTEXT_ID HDLR0001 for the Handler Config Page */
- private final String INFOPOP_HDLR_WS_HANDLERS = "HDLR0001"; //$NON-NLS-1$
- private final String TOOLTIP_EDIT_WS_HANDLERS = "TOOLTIP_EDIT_WS_HANDLERS";
-
- /* CONTEXT_ID HDLR0002 for the Handler Config Page */
- private final String INFOPOP_HDLR_GEN_SKELETON = "HDLR0002"; //$NON-NLS-1$
- private final String TOOLTIP_BUTTON_GEN_SKELETON = "TOOLTIP_BUTTON_GEN_SKELETON";
-
- /* CONTEXT_ID HDLR0003 for the Handler Config Page */
- private final String INFOPOP_COMBO_SOURCE_LOC = "HDLR0003"; //$NON-NLS-1$
- private final String TOOLTIP_COMBO_SOURCE_LOC = "TOOLTIP_COMBO_SOURCE_LOC";
-
- /* CONTEXT_ID HDLR0004 for the Handler Config Page */
- private final String INFOPOP_WS_CLIENT_REF = "HDLR0004"; //$NON-NLS-1$
- private final String TOOLTIP_WS_CLIENT_REF = "TOOLTIP_WS_CLIENT_REF";
-
- // ------------------------
-
- public ConfigClientHandlersTableWidget() {
- super();
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
- msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
- parent_ = parent;
-
- // Web service reference combo
- Composite webServiceRefComp = uiUtils.createComposite(parent_, 2);
- webServiceRefCombo_ = uiUtils.createCombo(webServiceRefComp, "LABEL_COMBO_WS_CLIENT_REF", TOOLTIP_WS_CLIENT_REF, INFOPOP_WS_CLIENT_REF,
- SWT.READ_ONLY);
- webServiceRefCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleWebServiceRefCombo(evt);
- }
- });
-
- Composite displayComp = new Composite(parent_, SWT.NONE);
- GridLayout gridlayout = new GridLayout(2, false);
- displayComp.setLayout(gridlayout);
- displayComp.setLayoutData(uiUtils.createFillAll());
-
- Composite handlersComp = uiUtils.createComposite(displayComp, 1);
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING
- | GridData.VERTICAL_ALIGN_FILL);
- handlersComp.setLayoutData(griddata);
- handlersComp.setSize(130, 600);
-
- Composite buttonsComp = uiUtils.createComposite(displayComp, 1);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonsComp.setLayoutData(griddata);
-
- Text handlersText = new Text(handlersComp, SWT.READ_ONLY);
- handlersText.setText(msgUtils_.getMessage("LABEL_HANDLERS_CONFIG"));
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- handlersText.setLayoutData(gd);
-
- handlersTable_ = uiUtils.createTable(handlersComp, TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION);
- handlersTable_.setHeaderVisible(true);
- handlersTable_.setLinesVisible(true);
-
- // empty space
- Label wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- Button moveUpButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_UP", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- moveUpButton.setLayoutData(griddata);
- moveUpButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveUpButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- Button moveDownButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_DOWN", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- moveDownButton.setLayoutData(griddata);
- moveDownButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveDownButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- // empty space
- wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- addButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_ADD", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- addButton_.setLayoutData(griddata);
- addButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleAddButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- removeButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_REMOVE", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- removeButton_.setLayoutData(griddata);
- removeButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleRemoveButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
- enableRemove(false);
-
- // table stuff
- String[] columns_ = new String[] { msgUtils_.getMessage("LABEL_HANDLER_NAME"), msgUtils_.getMessage("LABLE_HANDLER_CLASS")};
-
- for (int i = 0; i < columns_.length; i++) {
- TableColumn tableColumn = new TableColumn(handlersTable_, i);
- tableColumn.setText(columns_[i]);
- tableColumn.setAlignment(SWT.LEFT);
- tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
- tableColumn.setResizable(true);
- }
-
- tableViewer_ = new TableViewer(handlersTable_);
- Control control = tableViewer_.getControl();
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- control.setLayoutData(data);
-
- tableViewer_.setColumnProperties(columns_);
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() {
-
- public void selectionChanged(SelectionChangedEvent event) {
- enableRemove(true);
- }
- });
-
- // gen skeleton check box
- genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, "LABEL_BUTTON_GEN_SKELETON", TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
- genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleGenSkeletonRadioButton();
- }
- });
-
- // source location combo
- Composite sourceLocationComp = uiUtils.createComposite(parent_, 2);
- sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, "LABEL_COMBO_SOURCE_LOC", TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC,
- SWT.READ_ONLY);
- sourceLocationCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleSourceLocationCombo(evt);
- }
- });
-
- return this;
- }
-
- // Called at start
- private void populateHandlersTable() {
- try {
-
- int sizeOfHandlers = wsRefsToHandlers_.size();
-
- String[] wsRefNames = (String[]) wsRefsToHandlers_.keySet().toArray(new String[0]);
- webServiceRefCombo_.setItems(wsRefNames);
- webServiceRefCombo_.select(0);
-
- if (sizeOfHandlers < 1) {
- webServiceRefCombo_.select(0);
- webServiceRefCombo_.setEnabled(false);
- }
- else {
- if (serviceRefName_ != null) {
- int index = webServiceRefCombo_.indexOf(serviceRefName_);
- if (index != -1) webServiceRefCombo_.select(index);
- }
- else
- webServiceRefCombo_.select(0);
- }
-
- // get webServiceRef hint
- String wsRef = webServiceRefCombo_.getText();
-
- if (wsRefsToHandlers_.get(wsRef) != null) {
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRef);
- tableViewer_.setInput(orderedHandlers_);
- tableViewer_.refresh();
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- /**
- * @return Returns the handlers.
- */
- public List getAllHandlersList() {
- // convert to a ArrayList and return as List
- List list = new ArrayList();
- if (orderedHandlers_ != null && !orderedHandlers_.isEmpty()) list.addAll(orderedHandlers_);
-
- return list;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public IStatus getStatus() {
- IStatus finalStatus = Status.OK_STATUS;
-
- return finalStatus;
- }
-
- private void handleAddButtonSelected(SelectionEvent event) {
-
- AddHandlerDialog dialog = dialog = new AddHandlerDialog(parent_.getShell(), true);
- dialog.create();
- dialog.getShell().setSize( 500, 200 );
-
- int result = dialog.open();
-
- if (result == Window.OK) {
- String name = dialog.getName();
- String className = dialog.getClassName();
-
- HandlerTableItem hi = new HandlerTableItem();
- hi.setHandlerName(name);
- hi.setHandlerClassName(className);
- String wsRefName = webServiceRefCombo_.getText();
- ServiceRef serviceRef = (ServiceRef) refNameToServiceRef_.get(wsRefName);
- hi.setWsDescRef(serviceRef);
-
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRefName);
- orderedHandlers_.add(hi);
-
- }
-
- refresh();
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event) {
- handleDeleteKeyPressed();
- }
-
- private void handleMoveUpButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- if (index != -1) {
- if (index > 0) {
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());
- Object object = orderedHandlers_.remove(index);
- orderedHandlers_.insertElementAt(object, index - 1);
- tableViewer_.refresh();
- }
- }
-
- }
-
- private void handleMoveDownButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- if (index != -1) {
- if (index < orderedHandlers_.size() - 1) {
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());
- Object object = orderedHandlers_.remove(index);
- orderedHandlers_.insertElementAt(object, index + 1);
- tableViewer_.refresh();
- }
- }
-
- }
-
- public void handleSourceLocationCombo(SelectionEvent event) {
- outputLocation_ = sourceLocationCombo_.getText();
- }
-
- public void handleGenSkeletonRadioButton() {
- if (genSkeletonRadioButton_.isEnabled()) {
- if (genSkeletonRadioButton_.getSelection())
- this.isGenSkeletonEnabled_ = true;
- else
- this.isGenSkeletonEnabled_ = false;
- }
- }
-
- public void handleWebServiceRefCombo(SelectionEvent event) {
-
- if (webServiceRefCombo_.isEnabled()) {
- String webServiceRefName = webServiceRefCombo_.getText();
- Vector hndlers = (Vector) wsRefsToHandlers_.get(webServiceRefName);
- //HandlerTableItem item = (HandlerTableItem)hndlers.get(0);
- //serviceRef_ = (ServiceRef)item.getWsDescRef();
- if (hndlers != null) {
- tableViewer_.setInput(hndlers);
- tableViewer_.refresh();
- }
- }
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean isGenSkeletonEnabled_() {
- return isGenSkeletonEnabled_;
- }
-
- protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- public String getColumnText(Object object, int columnIndex) {
-
- if (object instanceof HandlerTableItem) {
- HandlerTableItem hti = (HandlerTableItem) object;
- if (columnIndex == 0) {
-
- return hti.getHandlerName() != null ? hti.getHandlerName() : "";
- }
- else if (columnIndex == 1) { return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : ""; }
- }
- return null;
- }
-
- }
-
- private void enableRemove(boolean enabled) {
- removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- protected class ListContentProvider implements IStructuredContentProvider {
-
- public Object[] getElements(Object element) {
- if (element instanceof Vector) { return ((Vector) element).toArray(); }
- return null;
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object old, Object newobj) {
- }
-
- public boolean isDeleted(Object object) {
- return false;
- }
- }
-
- private void handleDeleteKeyPressed() {
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
- int selectionIndex = handlersTable_.getSelectionIndex();
-
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());
- orderedHandlers_.remove(selectionIndex);
- refresh();
- }
- }
-
- public void refresh() {
- try {
- tableViewer_.setInput(null);
- if (orderedHandlers_ != null) tableViewer_.setInput(orderedHandlers_);
- tableViewer_.refresh();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
- this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
- genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
- }
-
- public boolean getGenSkeletonEnabled() {
- return this.isGenSkeletonEnabled_;
- }
-
- public void setSourceOutputLocation(IPath[] locations) {
- if (locations[0]!=null)
- this.outputLocation_ = locations[0].toString();
- else
- return;
-
- String[] paths = new String[locations.length];
- for (int i = 0; i < locations.length; i++) {
- paths[i] = locations[i].toString();
- pathsTable_.put(paths[i], locations[i]);
- }
- sourceLocationCombo_.setItems(paths);
- sourceLocationCombo_.select(0);
-
- }
-
- public IPath getSourceOutputLocation() {
- IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
- return outputPath;
- }
-
- /**
- * @return Returns the handlerClassNames.
- */
- public String[] getHandlerClassNames() {
- Vector handlerClasses = new Vector();
-
- Enumeration e = wsRefsToHandlers_.keys();
- while (e.hasMoreElements()) {
-
- String wsRefName = (String) e.nextElement();
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRefName);
-
- if (orderedHandlers_ != null) {
- for (int i = 0; i < orderedHandlers_.size(); i++) {
- HandlerTableItem hti = (HandlerTableItem) orderedHandlers_.get(i);
- handlerClasses.add(hti.getHandlerClassName());
- }
- }
- }
- return (String[])handlerClasses.toArray(new String[0]);
- }
-
- /**
- * @return Returns the wsRefsToHandlers_.
- */
- public Hashtable getWsRefsToHandlers() {
- return wsRefsToHandlers_;
- }
-
- /**
- * @param wsRefsToHandlers_
- * The wsRefsToHandlers_ to set.
- */
- public void setWsRefsToHandlers(Hashtable wsRefsToHandlersArray) {
-
- wsRefsToHandlers_ = new Hashtable();
- try {
-
- if (wsRefsToHandlersArray != null) {
- // store the wsRefs
- Enumeration wsRef = wsRefsToHandlersArray.keys();
- while (wsRef.hasMoreElements()) {
- String wsRefName = (String) wsRef.nextElement();
-
- HandlerTableItem[] handlers = (HandlerTableItem[]) wsRefsToHandlersArray.get(wsRefName);
- // process the handlersTable
- orderedHandlers_ = new Vector();
- for (int i = 0; i < handlers.length; i++) {
- orderedHandlers_.add(handlers[i]);
- }
- wsRefsToHandlers_.put(wsRefName, orderedHandlers_);
-
- }
- }
- populateHandlersTable();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- public void setServiceRefName(String wsRefName) {
- serviceRefName_ = wsRefName;
- }
-
- public void setRefNameToServiceRef(Hashtable refName2SF) {
- this.refNameToServiceRef_ = refName2SF;
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
deleted file mode 100644
index 39641aad5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
+++ /dev/null
@@ -1,620 +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.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-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.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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * ConfigServiceHandlersTreeWidget
- *
- */
-public class ConfigServiceHandlersTableWidget extends SimpleWidgetDataContributor {
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private MessageUtils msgUtils_ = null;
- private Composite parent_;
- private boolean isGenSkeletonEnabled_;
- private String outputLocation_;
-
- private Table handlersTable_;
- private TableViewer tableViewer_;
- private Combo webServiceDescCombo_;
- private Button addButton_;
- private Button removeButton_;
- private Button genSkeletonRadioButton_;
- private Combo sourceLocationCombo_;
- private Hashtable pathsTable_ = new Hashtable();
- private Hashtable wsDescToHandlers_;
- private Hashtable wsDescToPorts_;
- private Hashtable serviceDescNameToDescObj_;
- private String descriptionName_ = null;
-
- private Vector orderedHandlers_;
-
- private int DEFAULT_COLUMN_WIDTH = 90;
-
- // ----TOOLTIPS Section----
- /* CONTEXT_ID SHLD0001 for the Handler Config Page */
- private final String INFOPOP_HDLR_WS_HANDLERS = "SHDL0001"; //$NON-NLS-1$
- private final String TOOLTIP_EDIT_WS_HANDLERS = "TOOLTIP_EDIT_WS_HANDLERS";
-
- /* CONTEXT_ID SHDL0002 for the Handler Config Page */
- private final String INFOPOP_HDLR_GEN_SKELETON = "SHDL0002"; //$NON-NLS-1$
- private final String TOOLTIP_BUTTON_GEN_SKELETON = "TOOLTIP_BUTTON_GEN_SKELETON";
-
- /* CONTEXT_ID SHDL0003 for the Handler Config Page */
- private final String INFOPOP_COMBO_SOURCE_LOC = "SHDL0003"; //$NON-NLS-1$
- private final String TOOLTIP_COMBO_SOURCE_LOC = "TOOLTIP_COMBO_SOURCE_LOC";
-
- /* CONTEXT_ID SHDL0004 for the Handler Config Page */
- private final String INFOPOP_WS_SERVICE_DESC = "SHDL0004"; //$NON-NLS-1$
- private final String TOOLTIP_WS_SERVICE_DESC = "TOOLTIP_WS_SERVICE_DESC";
-
- // ------------------------
-
- public ConfigServiceHandlersTableWidget() {
- super();
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
- msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
- parent_ = parent;
-
- // Web service reference combo
- Composite webServiceRefComp = uiUtils.createComposite(parent_, 2);
- webServiceDescCombo_ = uiUtils.createCombo(webServiceRefComp, "LABEL_COMBO_WS_SERVICE_DESC", TOOLTIP_WS_SERVICE_DESC, INFOPOP_WS_SERVICE_DESC,
- SWT.READ_ONLY);
- webServiceDescCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleWebServiceDescCombo(evt);
- }
- });
-
- Composite displayComp = new Composite(parent, SWT.NONE);
-
- GridLayout gridlayout = new GridLayout(2, false);
- displayComp.setLayout(gridlayout);
- displayComp.setLayoutData(uiUtils.createFillAll());
-
- Composite handlersComp = uiUtils.createComposite(displayComp, 1);
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING
- | GridData.VERTICAL_ALIGN_FILL);
- handlersComp.setLayoutData(griddata);
- handlersComp.setSize(130, 600);
-
- Composite buttonsComp = uiUtils.createComposite(displayComp, 1);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonsComp.setLayoutData(griddata);
-
- Text handlersText = new Text(handlersComp, SWT.READ_ONLY);
- handlersText.setText(msgUtils_.getMessage("LABEL_HANDLERS_CONFIG"));
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- handlersText.setLayoutData(gd);
-
- handlersTable_ = uiUtils.createTable(handlersComp, TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION);
- handlersTable_.setHeaderVisible(true);
- handlersTable_.setLinesVisible(true);
-
- // empty space
- Label wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- Button moveUpButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_UP", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- moveUpButton.setLayoutData(griddata);
- moveUpButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveUpButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- Button moveDownButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_DOWN", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- moveDownButton.setLayoutData(griddata);
- moveDownButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveDownButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- // empty space
- wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- addButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_ADD", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- addButton_.setLayoutData(griddata);
- addButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleAddButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- removeButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_REMOVE", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- removeButton_.setLayoutData(griddata);
- removeButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleRemoveButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
- enableRemove(false);
-
- // table stuff here
- String[] columns_ = new String[] { msgUtils_.getMessage("LABEL_HANDLER_NAME"), msgUtils_.getMessage("LABLE_HANDLER_CLASS"),
- msgUtils_.getMessage("LABEL_HANDLER_PORT")};
-
- for (int i = 0; i < columns_.length; i++) {
- TableColumn tableColumn = new TableColumn(handlersTable_, i);
- tableColumn.setText(columns_[i]);
- tableColumn.setAlignment(SWT.LEFT);
- tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
- tableColumn.setResizable(true);
- }
-
- tableViewer_ = new TableViewer(handlersTable_);
- Control control = tableViewer_.getControl();
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- control.setLayoutData(data);
-
- tableViewer_.setColumnProperties(columns_);
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() {
-
- public void selectionChanged(SelectionChangedEvent event) {
- enableRemove(true);
- }
- });
-
- genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, "LABEL_BUTTON_GEN_SKELETON", TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
- genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleGenSkeletonRadioButton();
- }
- });
-
- Composite sourceLocationComp = uiUtils.createComposite(parent_, 2);
- sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, "LABEL_COMBO_SOURCE_LOC", TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC,
- SWT.READ_ONLY);
- sourceLocationCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleSourceLocationCombo(evt);
- }
- });
-
- return this;
- }
-
- // Called at start
- private void populateHandlersTable() {
- try {
-
- int sizeOfHandlers = wsDescToHandlers_.size();
-
- String[] wsRefNames = (String[]) wsDescToHandlers_.keySet().toArray(new String[0]);
- webServiceDescCombo_.setItems(wsRefNames);
-
- if (sizeOfHandlers < 1) {
- webServiceDescCombo_.select(0);
- webServiceDescCombo_.setEnabled(false);
- }
- else {
- if (descriptionName_ != null) {
- int index = webServiceDescCombo_.indexOf(descriptionName_);
- if (index != -1) webServiceDescCombo_.select(index);
- }
- else
- webServiceDescCombo_.select(0);
- }
- // get webServiceRef hint
- String wsRef = webServiceDescCombo_.getText();
-
- if (wsDescToHandlers_.get(wsRef) != null) {
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(wsRef);
- tableViewer_.setInput(orderedHandlers_);
- tableViewer_.refresh();
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- /**
- * @return Returns the handlers.
- */
- public List getHandlersList() {
- // convert to a ArrayList and return as List
- List list = new ArrayList();
- if (orderedHandlers_ != null && !orderedHandlers_.isEmpty()) list.addAll(orderedHandlers_);
-
- return list;
- }
-
- public Hashtable getWsDescToHandlers() {
- return this.wsDescToHandlers_;
- }
-
- /**
- * @param handlers
- * The handlers to set.
- */
- public void setHandlers(HandlerTableItem[] handlers) {
- populateHandlersTable();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public IStatus getStatus() {
- IStatus finalStatus = Status.OK_STATUS;
-
- return finalStatus;
- }
-
- private void handleAddButtonSelected(SelectionEvent event) {
-
- String descName = webServiceDescCombo_.getText();
- WebServiceDescription serviceDesc = (WebServiceDescription) serviceDescNameToDescObj_.get(descName);
-
- AddHandlerDialog dialog = dialog = new AddHandlerDialog(parent_.getShell(), false);
- dialog.create();
-
- String[] portNames = getPortComponentNames(serviceDesc);
- dialog.setPortNames(portNames);
- dialog.getShell().setSize( 500, 200 );
-
- int result = dialog.open();
-
- if (result == Window.OK) {
- String name = dialog.getName();
- String className = dialog.getClassName();
- String port = dialog.getPortName();
-
- HandlerTableItem hi = new HandlerTableItem();
- hi.setHandlerName(name);
- hi.setHandlerClassName(className);
- hi.setPortName(port);
-
-
- hi.setWsDescRef(serviceDesc);
-
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(descName);
- orderedHandlers_.add(hi);
-
- }
-
- refresh();
- }
-
- private String[] getPortComponentNames(WebServiceDescription webServiceDesc) {
-
- List ports = webServiceDesc.getPortComponents();
- if (ports!=null){
- String[] portNames = new String[ports.size()];
- for(int i=0;i<ports.size();i++){
- PortComponent pc = (PortComponent)ports.get(i);
- String pcName = pc.getPortComponentName();
- portNames[i] = pcName;
- }
- return portNames;
- }
- return new String[0];
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event) {
- handleDeleteKeyPressed();
- }
-
- private void handleMoveUpButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- if (index != -1) {
- if (index > 0) {
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
- Object object = orderedHandlers_.remove(index);
- orderedHandlers_.insertElementAt(object, index - 1);
- tableViewer_.refresh();
- }
- }
-
- }
-
- private void handleMoveDownButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- if (index != -1) {
- if (index < orderedHandlers_.size() - 1) {
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
- Object object = orderedHandlers_.remove(index);
- orderedHandlers_.insertElementAt(object, index + 1);
- tableViewer_.refresh();
- }
- }
-
- }
-
- public void handleSourceLocationCombo(SelectionEvent event) {
- outputLocation_ = sourceLocationCombo_.getText();
- }
-
- public void handleGenSkeletonRadioButton() {
- if (genSkeletonRadioButton_.isEnabled()) {
- if (genSkeletonRadioButton_.getSelection())
- this.isGenSkeletonEnabled_ = true;
- else
- this.isGenSkeletonEnabled_ = false;
- }
- }
-
- public void handleWebServiceDescCombo(SelectionEvent event) {
-
- if (webServiceDescCombo_.isEnabled()) {
- String webServiceRefName = webServiceDescCombo_.getText();
- Vector hndlers = (Vector) wsDescToHandlers_.get(webServiceRefName);
- if (hndlers != null) {
- tableViewer_.setInput(hndlers);
- tableViewer_.refresh();
- }
- }
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean isGenSkeletonEnabled_() {
- return isGenSkeletonEnabled_;
- }
-
- protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- public String getColumnText(Object object, int columnIndex) {
-
- if (object instanceof HandlerTableItem) {
- HandlerTableItem hti = (HandlerTableItem) object;
- if (columnIndex == 0) {
- return hti.getHandlerName() != null ? hti.getHandlerName() : "";
- }
- else if (columnIndex == 1) {
- return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : "";
- }
- else {
- return hti.getPortName() != null ? hti.getPortName() : "";
- }
- }
- return null;
- }
-
- }
-
- private void enableRemove(boolean enabled) {
- removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- protected class ListContentProvider implements IStructuredContentProvider {
-
- public Object[] getElements(Object element) {
- if (element instanceof Vector) { return ((Vector) element).toArray(); }
- return null;
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object old, Object newobj) {
- }
-
- public boolean isDeleted(Object object) {
- return false;
- }
- }
-
- private void handleDeleteKeyPressed() {
- //internalDispose();
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
- int selectionIndex = handlersTable_.getSelectionIndex();
-
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
- orderedHandlers_.remove(selectionIndex);
- refresh();
- }
- }
-
- public void refresh() {
- try {
- tableViewer_.setInput(null);
- if (orderedHandlers_ != null) tableViewer_.setInput(orderedHandlers_);
- tableViewer_.refresh();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
- this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
- genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
- }
-
- public boolean getGenSkeletonEnabled() {
- return this.isGenSkeletonEnabled_;
- }
-
- public void setSourceOutputLocation(IPath[] locations) {
- this.outputLocation_ = locations[0].toString();
-
- String[] paths = new String[locations.length];
- for (int i = 0; i < locations.length; i++) {
- paths[i] = locations[i].toString();
- pathsTable_.put(paths[i], locations[i]);
- }
- sourceLocationCombo_.setItems(paths);
- sourceLocationCombo_.select(0);
-
- }
-
- public IPath getSourceOutputLocation() {
- IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
- return outputPath;
- }
-
- /**
- * @return Returns the handlerClassNames.
- */
- public String[] getHandlerClassNames() {
-
- Vector handlerClasses = new Vector();
- Enumeration e = wsDescToHandlers_.keys();
- while (e.hasMoreElements()) {
-
- String wsDescName = (String)e.nextElement();
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(wsDescName);
-
- if (orderedHandlers_ != null) {
-
- for (int i = 0; i < orderedHandlers_.size(); i++) {
- HandlerTableItem hti = (HandlerTableItem) orderedHandlers_.get(i);
- handlerClasses.add(hti.getHandlerClassName());
- }
- }
- }
- return (String[])handlerClasses.toArray(new String[0]);
- }
-
- /**
- * @param wsDescToHandlersArray_
- * The wsDescToHandlersArray_ to set.
- */
- public void setWsRefsToHandlers(Hashtable wsDescToHandlersArray) {
-
- wsDescToHandlers_ = new Hashtable();
- wsDescToPorts_ = new Hashtable();
- try {
-
- if (wsDescToHandlersArray != null) {
- // store the wsRefs
- Enumeration wsDesc = wsDescToHandlersArray.keys();
- while (wsDesc.hasMoreElements()) {
- String wsDescName = (String) wsDesc.nextElement();
-
- HandlerTableItem[] handlers = (HandlerTableItem[]) wsDescToHandlersArray.get(wsDescName);
- // process the handlersTable
- orderedHandlers_ = new Vector();
- HashSet portNameVector = new HashSet();
-
- for (int i = 0; i < handlers.length; i++) {
- orderedHandlers_.add(handlers[i]);
- String portName = handlers[i].getPortName();
- portNameVector.add(new String(portName));
- }
- wsDescToHandlers_.put(wsDescName, orderedHandlers_);
- wsDescToPorts_.put(wsDescName, (String[]) portNameVector.toArray(new String[0]));
- }
- }
- populateHandlersTable();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- public void setDescriptionName(String wsDescName) {
- descriptionName_ = wsDescName;
- }
-
- public void setServiceDescNameToDescObj(Hashtable serviceDescNameToDescObj) {
- this.serviceDescNameToDescObj_ = serviceDescNameToDescObj;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java
deleted file mode 100644
index 0cfdf31c4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java
+++ /dev/null
@@ -1,80 +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.ui.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.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-
-
-/**
- * HandlersDefaultingCommand
- *
- * Determine if Handlers belongs to service or client side
- */
-public class HandlersDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd
-{
- private boolean isClientHandler_ = false;
- private boolean isServiceHandler_ = false;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- IStatus status = Status.OK_STATUS;
-
- IStructuredSelection selection = getInitialSelection();
- if (selection != null && selection.size() == 1) {
- Object obj = selection.getFirstElement();
-
- if (obj instanceof WebServiceNavigatorGroupType) {
- WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
- if (wsngt.getWsdlService()!=null){
- isServiceHandler_ = true;
- }
-
- if (wsngt.getServiceRef()!=null){
- isClientHandler_ = true;
- }
-
- }
- }
- else {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED") );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
-
- }
-
-
-/**
- * @return Returns the isClientHandler_.
- */
-public boolean getIsClientHandler() {
- return isClientHandler_;
-}
-/**
- * @return Returns the isServiceHandler_.
- */
-public boolean getIsServiceHandler() {
- return isServiceHandler_;
-}
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
deleted file mode 100644
index 73c8c39a1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
+++ /dev/null
@@ -1,226 +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.ui.widgets;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Arguments;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.TableViewerEditor;
-import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser;
-import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter;
-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.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-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.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
-* Page for importing WSDL references into a WSIL in the workbench.
-*/
-public class ImportWSILWidget extends SimpleWidgetDataContributor
-{
- /*CONTEXT_ID WSIL0001 for the WSIL Import Page*/
- private final String INFOPOP_WSIL_IMPORT_PAGE = WebServiceConsumptionUIPlugin.ID + ".WSIL0001";
-
- /*CONTEXT_ID WSIL0002 for the WSIL text field*/
- private final String INFOPOP_WSIL_TEXT_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0002";
-
- /*CONTEXT_ID WSIL0003 for the WSIL browse button*/
- private final String INFOPOP_WSIL_BUTTON_BROWSE_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0003";
-
- /*CONTEXT_ID WSIL0004 for the WSDL table*/
- private final String INFOPOP_WSIL_TABLE_WSDL = WebServiceConsumptionUIPlugin.ID + ".WSIL0004";
-
- private final String INSPECTION_WSIL = "inspection.wsil";
-
- private Text wsil_;
- private Button browse_;
- private TableViewerEditor wsdls_;
-
- private MessageUtils msgUtils;
-
- /**
- * Constructs a new page.
- */
- public ImportWSILWidget()
- {
- msgUtils = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
- //super(msgUtils.getMessage("PAGE_WSIL_IMPORT"), msgUtils.getMessage("TITLE_WSIL_IMPORT"), msgUtils.getMessage("DESC_WSIL_IMPORT"));
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- parent.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_IMPORT_PAGE"));
- helpSystem.setHelp(parent, INFOPOP_WSIL_IMPORT_PAGE);
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 3;
- composite.setLayout(gl);
- GridData gd = new GridData(GridData.GRAB_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING | GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL);
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
-
- Label label = new Label(composite, SWT.WRAP);
- label.setText(msgUtils.getMessage("LABEL_WSIL_URI"));
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- wsil_ = new Text(composite, SWT.WRAP | SWT.SINGLE | SWT.BORDER);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- gd.widthHint = 256;
- wsil_.setLayoutData(gd);
- wsil_.addListener(SWT.Modify, statusListener);
- wsil_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_TEXT_WSIL"));
- helpSystem.setHelp(wsil_, INFOPOP_WSIL_TEXT_WSIL);
-
- browse_ = new Button(composite, SWT.PUSH);
- browse_.setText(msgUtils.getMessage("LABEL_BROWSE"));
- browse_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- browse_.addListener(SWT.Selection,
- new Listener()
- {
- public void handleEvent(Event event)
- {
- handleBrowseEvent(event);
- }
- }
- );
- browse_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_BUTTON_BROWSE_WSIL"));
- helpSystem.setHelp(browse_, INFOPOP_WSIL_BUTTON_BROWSE_WSIL);
-
- Composite wsdlComposite = new Composite(composite, SWT.NONE);
- wsdlComposite.setLayout(new GridLayout());
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 3;
- wsdlComposite.setLayoutData(gd);
- label = new Label(wsdlComposite, SWT.WRAP);
- label.setText(msgUtils.getMessage("LABEL_WSDL"));
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- String[] columns = {msgUtils.getMessage("LABEL_WSDL_URI")};
- wsdls_ = new TableViewerEditor(wsdlComposite, columns, new ArrayList(), "http://");
- wsdls_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_TABLE_WSDL"));
- wsdls_.setInfopop(INFOPOP_WSIL_TABLE_WSDL);
- return this;
- }
-
- public void handleBrowseEvent(Event event)
- {
- DialogResourceBrowser dialog = new DialogResourceBrowser(browse_.getShell(), null, new FileExtensionFilter(new String[] {"wsil"}));
- dialog.open();
- IResource res = dialog.getFirstSelection();
- if (res != null)
- {
- if (res instanceof IFile)
- wsil_.setText(res.getFullPath().toString());
- else
- wsil_.setText(res.getFullPath().addTrailingSeparator().append(INSPECTION_WSIL).toString());
- }
- }
-
- public IStatus getStatus()
- {
- if (!wsil_.getText().endsWith(".wsil"))
- return StatusUtils.errorStatus( msgUtils.getMessage("PAGE_MSG_INVALID_WSIL_FILE_NAME") );
- else
- return Status.OK_STATUS;
- }
-
- public void setInitialSelection(IStructuredSelection selection)
- {
- ArrayList list = new ArrayList();
- if (selection != null && !selection.isEmpty())
- {
- for (Iterator it = selection.iterator(); it.hasNext();)
- {
- Object object = it.next();
- if ((object instanceof IFile) && ((IFile)object).getFileExtension() != null && ((IFile)object).getFileExtension().equals("wsdl"))
- list.add(((IFile)object).getFullPath().toString());
- if (object instanceof ServiceImpl)
- list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceImpl)(object))));
- if (object instanceof ServiceRef)
- list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceRef)(object))));
- if (object instanceof WSDLResourceImpl)
- list.add(J2EEActionAdapterFactory.getWSILPath(((WSDLResourceImpl)(object))));
- }
- }
- wsdls_.setInput(list);
- wsdls_.refresh();
- if (list.size() > 0)
- {
- StringBuffer path = new StringBuffer(list.get(0).toString());
- // change extension from .wsdl to .wsil
- int length = path.length();
- path = path.replace(length-4, length, "wsil");
- wsil_.setText(path.toString());
- }
- }
-
- public Arguments getGenWSILArguments()
- {
- Arguments args = new Arguments();
- String wsilPath = wsil_.getText();
- if (wsilPath.indexOf(':') < 0)
- args.add(AddWSDLToWSILCommand.ARG_WSIL, URI.createPlatformResourceURI(wsil_.getText()).toString());
- else
- args.add(AddWSDLToWSILCommand.ARG_WSIL, wsilPath);
- TableItem[] items = wsdls_.getItems();
- for (int i = 0; i < items.length; i++)
- {
- String uri = items[i].getText(0);
- if (uri.indexOf(':') < 0)
- {
- IResource res = ResourceUtils.findResource(uri);
- if (res != null)
- {
- try
- {
- uri = res.getLocation().toFile().toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- murle.getMessage();
- }
- }
- }
- args.add(AddWSDLToWSILCommand.ARG_WSDL, uri);
- }
- args.add(AddWSDLToWSILCommand.ARG_RESOLVE_WSDL, null);
- return args;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java
deleted file mode 100644
index 139993e1d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java
+++ /dev/null
@@ -1,83 +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.ui.widgets;
-
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class PreferencesSelectionWidget extends SimpleWidgetDataContributor
-{
- private ResourceContext context_;
-
- /*CONTEXT_ID PWPR0003 for the Overwrite Files check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES = "PWPR0003";
- private Button overwriteFilesCheckbox_;
-
- /*CONTEXT_ID PWPR0004 for the Create Folders check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS = "PWPR0004";
- private Button createFoldersCheckbox_;
-
- /*CONTEXT_ID PWPR0015 for the Check Out Files check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES = "PWPR0015";
- private Button checkoutFilesCheckbox_;
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
- */
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.ui";
- String conPluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- UIUtils utils = new UIUtils( msgUtils, conPluginId );
-
- Composite resourcesGroup = utils.createComposite( parent, 1 );
-
- overwriteFilesCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_OVERWRITE_FILES",
- "TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES",
- INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES );
-
- createFoldersCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_CREATE_FOLDERS",
- "TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS" ,
- INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS );
-
- checkoutFilesCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_CHECKOUT_FILES",
- "TOOLTIP_PPRM_CHECKBOX_CHECK_OUT",
- INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES );
-
- return this;
- }
-
- public void setResourceContext( ResourceContext context )
- {
- overwriteFilesCheckbox_.setSelection( context.isOverwriteFilesEnabled() );
- createFoldersCheckbox_.setSelection( context.isCreateFoldersEnabled() );
- checkoutFilesCheckbox_.setSelection( context.isCheckoutFilesEnabled() );
-
- context_ = context;
- }
-
- public ResourceContext getResourceContext()
- {
- context_.setOverwriteFilesEnabled( overwriteFilesCheckbox_.getSelection() );
- context_.setCreateFoldersEnabled( createFoldersCheckbox_.getSelection() );
- context_.setCheckoutFilesEnabled( checkoutFilesCheckbox_.getSelection() );
-
- return context_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java
deleted file mode 100644
index 656491948..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java
+++ /dev/null
@@ -1,101 +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.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-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.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-
-public class PublishToPrivateUDDICommandFragment extends AbstractCommandFragment
-{
- private DataMappingRegistry dataMappingRegistry;
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private boolean publishToPrivateUDDI;
- private CommandWidgetBinding privateUDDIBinding;
-
- public PublishToPrivateUDDICommandFragment()
- {
- super(null, "");
- privateUDDIBinding = PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().getBinding();
- }
-
- /**
- * 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 (privateUDDIBinding != null && publishToPrivateUDDI && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
- {
- privateUDDIBinding.registerCanFinish(canFinishRegistry);
- privateUDDIBinding.registerDataMappings(dataMappingRegistry);
- privateUDDIBinding.registerWidgetMappings(widgetRegistry);
- return privateUDDIBinding.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()
- {
- PublishToPrivateUDDICommandFragment fragment = new PublishToPrivateUDDICommandFragment();
- fragment.registerDataMappings(dataMappingRegistry);
- fragment.registerCanFinish(canFinishRegistry);
- fragment.registerWidgetMappings(widgetRegistry);
- fragment.setPublishToPrivateUDDI(publishToPrivateUDDI);
- return fragment;
- }
-
- public void setPublishToPrivateUDDI(boolean publish)
- {
- publishToPrivateUDDI = publish;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
deleted file mode 100644
index bdae50a9d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
+++ /dev/null
@@ -1,202 +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.ui.widgets;
-
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PublicUDDIRegistryTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryType;
-import org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType;
-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.MessageUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-
-
-public class PublishWSWidget extends SimpleWidgetDataContributor
-{
- /* CONTEXT_ID PWPB0001 for the UDDI Publish Page */
- private String INFOPOP_PWPB_PAGE = WebServiceConsumptionUIPlugin.ID + ".PWPB0001";
- /* CONTEXT_ID PWPB0002 for the UDDI Launch check box of the UDDI Publish Page */
- private String INFOPOP_PWPB_CHECKBOX_WS_LAUNCH = WebServiceConsumptionUIPlugin.ID + ".PWPB0002";
- private Button launchUDDICheckbox_;
- private Button launchPrivateUDDICheckbox_;
- private Label pubilcUDDIRegComboLabel_;
- private Combo publicUDDIRegCombo_;
- private MessageUtils msgUtils;
- private Listener statusListener;
- private Boolean publish;
-
- public PublishWSWidget(boolean publish)
- {
- msgUtils = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
- this.publish = new Boolean(publish);
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- this.statusListener = statusListener;
- Listener selListener = new Listener()
- {
- public void handleEvent(Event event)
- {
- handleSelectionEvent(event);
- }
- };
- parent.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_PAGE"));
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
- helpSystem.setHelp(parent, INFOPOP_PWPB_PAGE);
- launchPrivateUDDICheckbox_ = new Button(parent, SWT.CHECK);
- if (publish.booleanValue())
- launchPrivateUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_PUBLISH_PRIVATE_UDDI"));
- else
- launchPrivateUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_FIND_PRIVATE_UDDI"));
- launchPrivateUDDICheckbox_.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH"));
- launchPrivateUDDICheckbox_.addListener(SWT.Selection, selListener);
- helpSystem.setHelp(launchPrivateUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH);
- launchUDDICheckbox_ = new Button(parent, SWT.CHECK);
- if (publish.booleanValue())
- launchUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_PUBLISH"));
- else
- launchUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_FIND"));
- launchUDDICheckbox_.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH"));
- launchUDDICheckbox_.addListener(SWT.Selection, selListener);
- helpSystem.setHelp(launchUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH);
- Composite c = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 3;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- c.setLayout(gl);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- c.setLayoutData(gd);
- new Label(c, SWT.WRAP);
- pubilcUDDIRegComboLabel_ = new Label(c, SWT.WRAP);
- pubilcUDDIRegComboLabel_.setText(msgUtils.getMessage("LABEL_PUBLIC_UDDI_REGISTRIES"));
- publicUDDIRegCombo_ = new Combo(c, SWT.DROP_DOWN | SWT.READ_ONLY);
- publicUDDIRegCombo_.setEnabled(false);
- initPublicUDDI();
- initPrivateUDDI();
- return this;
- }
-
- private void initPublicUDDI()
- {
- PublicUDDIRegistryTypeRegistry reg = PublicUDDIRegistryTypeRegistry.getInstance();
- PublicUDDIRegistryType[] types = reg.getAllPublicUDDIRegistryTypes();
- for (int i = 0; i < types.length; i++)
- {
- if (publish.booleanValue())
- {
- // Ignore read-only registries.
- String publishURL = types[i].getPublishURL();
- if (publishURL == null || publishURL.indexOf("://") == -1)
- continue;
- }
- publicUDDIRegCombo_.add(types[i].getName());
- }
- if (types.length > 0)
- publicUDDIRegCombo_.setText(publicUDDIRegCombo_.getItem(0));
- }
-
- private void initPrivateUDDI()
- {
- if (!publish.booleanValue() && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
- launchPrivateUDDICheckbox_.setEnabled(false);
- }
-
- private void handleSelectionEvent(Event event)
- {
- if (launchUDDICheckbox_ == event.widget)
- publicUDDIRegCombo_.setEnabled(launchUDDICheckbox_.getSelection());
- statusListener.handleEvent(event);
- }
-
- public void setPublishToPublicUDDI(boolean publish)
- {
- launchUDDICheckbox_.setSelection(publish);
- publicUDDIRegCombo_.setEnabled(publish);
- }
-
- public void setPublishToPublicUDDI(Boolean publish)
- {
- setPublishToPublicUDDI(publish.booleanValue());
- }
-
- public void setPublishToPrivateUDDI(boolean publish)
- {
- launchPrivateUDDICheckbox_.setSelection(publish);
- }
-
- public void setPublishToPrivateUDDI(Boolean publish)
- {
- setPublishToPrivateUDDI(publish.booleanValue());
- }
-
- public boolean getPublishToPublicUDDI()
- {
- return launchUDDICheckbox_.getSelection();
- }
-
- public boolean getPublishToPrivateUDDI()
- {
- return launchPrivateUDDICheckbox_.getSelection();
- }
-
- public boolean getForceLaunchOutsideIDE()
- {
- return false;
- }
-
- public LaunchOption[] getLaunchOptions()
- {
- Vector launchOptionVector = new Vector();
- if (launchUDDICheckbox_.getSelection())
- {
- PublicUDDIRegistryTypeRegistry reg = PublicUDDIRegistryTypeRegistry.getInstance();
- int UDDIRegSelectionIndex = publicUDDIRegCombo_.getSelectionIndex();
- if (UDDIRegSelectionIndex != -1)
- {
- String name = publicUDDIRegCombo_.getItem(UDDIRegSelectionIndex);
- String id = reg.getPublicUDDIRegistryTypeIDByName(name);
- PublicUDDIRegistryType type = reg.getPublicUDDIRegistryTypeByID(id);
- launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, type.getInquiryURL()));
- launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, type.getPublishURL()));
- }
- }
- if (launchPrivateUDDICheckbox_.getSelection())
- {
- PrivateUDDIRegistryTypeRegistry privateReg = PrivateUDDIRegistryTypeRegistry.getInstance();
- PrivateUDDIRegistryType privateType = privateReg.getPrivateUDDIRegistryType();
- String[] privateInquiryURL = privateType.getPrivateUDDIRegistryInquiryAPI();
- String[] privatePublishURL = privateType.getPrivateUDDIRegistryPublishAPI();
- for (int i = 0; i < privateInquiryURL.length; i++)
- {
- launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, privateInquiryURL[i]));
- launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, privatePublishURL[i]));
- }
- }
- return (LaunchOption[]) launchOptionVector.toArray(new LaunchOption[0]);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java
deleted file mode 100644
index d6c2f735e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,227 +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.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-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.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * ServiceHandlersWidgetDefaultingCommand
- *
- * Initialize and load the handlers data
- */
-public class ServiceHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
- private HandlerTableItem[] handlers_;
- private MessageUtils msgUtils_;
- private WebServiceDescription wsDescription_;
- private WsddResource wsddResource_;
- private WebServicesManager webServicesManager_;
- private IProject project_;
- private Hashtable wsDescToHandlers_;
- private Hashtable serviceDescNameToDescObj_;
- private String descriptionName_ = null;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- IStatus status = Status.OK_STATUS;
-
- webServicesManager_ = new WebServicesManager();
- IStructuredSelection selection = getInitialSelection();
- if (selection == null) {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED") );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- status = processHandlers(env);
- return status;
-
- }
-
- public IStatus processHandlers(IEnvironment env) {
- try {
- Vector handlers = new Vector();
- wsDescToHandlers_ = new Hashtable();
- serviceDescNameToDescObj_ = new Hashtable();
-
-// WebServiceEditModel wsed = getWebServiceEditModel();
- // if (wsed == null)
- wsddResource_ = getWsddResourceFromSelection();
- // else
- // wsddResource_ = wsed.getWebServicesXmlResource();
-
- if (wsddResource_ == null) {
- IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED") );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- WebServices webServices = wsddResource_.getWebServices();
- if (webServices != null) {
- List wsDescriptions = wsddResource_.getWebServices().getWebServiceDescriptions();
- for (int i = 0; i < wsDescriptions.size(); i++) {
-
- wsDescription_ = (WebServiceDescription) wsDescriptions.get(i);
-
- List wsPortComponents = wsDescription_.getPortComponents();
- for (int j = 0; j < wsPortComponents.size(); j++) {
- PortComponent wsPort = (PortComponent) wsPortComponents.get(j);
- String portName = wsPort.getPortComponentName();
- List wsHandlers = wsPort.getHandlers();
- HandlerTableItem[] handlerItems = new HandlerTableItem[wsHandlers.size()];
- for (int k = 0; k < wsHandlers.size(); k++) {
-
- Handler wsHandler = (Handler) wsHandlers.get(k);
-
- HandlerTableItem handlerItem = new HandlerTableItem();
- handlerItem.setHandler(wsHandler);
- handlerItem.setHandlerName(wsHandler.getHandlerName());
- handlerItem.setHandlerClassName(wsHandler.getHandlerClass());
- handlerItem.setPort(wsPort);
- handlerItem.setPortName(portName);
- handlerItem.setWsDescRef(wsDescription_);
- handlerItems[k] = handlerItem;
-
- handlers.add(handlerItem);
- }
- String wsDescName = wsDescription_.getWebServiceDescriptionName();
- wsDescToHandlers_.put(wsDescName, handlerItems);
- serviceDescNameToDescObj_.put(wsDescName, wsDescription_);
-
- }
-
- }
-
- handlers_ = (HandlerTableItem[]) handlers.toArray(new HandlerTableItem[0]);
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), e);
- }
- return Status.OK_STATUS;
- }
-
- public HandlerTableItem[] getHandlers() {
- return this.handlers_;
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean getGenSkeletonEnabled() {
- return true;
- }
-
- /**
- * @return Returns the sourceOutputLocation_.
- */
- public IPath[] getSourceOutputLocation() {
- IPath[] locations = null;
- IProject project = getProject();
-
- if (project != null) {
- locations = ResourceUtils.getAllJavaSourceLocations(project);
- }
- else {
- project = project_;
- if (project != null) {
- locations = ResourceUtils.getAllJavaSourceLocations(project);
- }
- }
- return locations;
- }
-
- public WsddResource getWsddResource() {
- return wsddResource_;
- }
-
- private WsddResource getWsddResourceFromSelection() {
- IStructuredSelection initSel = getInitialSelection();
- if (initSel != null && initSel.size() == 1) {
- Object obj = initSel.getFirstElement();
- if (obj instanceof ServiceImpl) {
- // Service object
- Service service = (Service) obj;
- descriptionName_ = service.getQName().getLocalPart();
- project_ = ProjectUtilities.getProject(service);
- return webServicesManager_.getWsddResource(service);
- }
- else if (obj instanceof WSDLResourceImpl) {
- // WSDL resource
- WSDLResourceImpl res = (WSDLResourceImpl) obj;
- project_ = ProjectUtilities.getProject(res);
- List wsdlResources = webServicesManager_.getWSDLServices(res);
- return webServicesManager_.getWsddResource((Service) wsdlResources.get(0));
- }
- else if (obj instanceof WebServiceNavigatorGroupType) {
- WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
- Service service = (Service)wsngt.getWsdlService();
- descriptionName_ = service.getQName().getLocalPart();
- project_ = ProjectUtilities.getProject(service);
- return webServicesManager_.getWsddResource(service);
- }
- }
-
- return null;
-
- }
-
- /**
- * @deprecated
- */
- public WebServiceDescription getWsDescription() {
- return wsDescription_;
- }
-
- public String getDescriptionName(){
- return descriptionName_;
- }
-
- public Hashtable getWsRefsToHandlers(){
- return wsDescToHandlers_;
- }
-
- public Hashtable getServiceDescNameToDescObj(){
- return this.serviceDescNameToDescObj_;
- }
-
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
deleted file mode 100644
index 504f1e5c6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,221 +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.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-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.core.runtime.Status;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddFactoryImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-/*
- * Provide a way to externalize the edited fields and create new handlers
- *
- */
-public class ServiceHandlersWidgetOutputCommand extends AbstractDataModelOperation
-{
-
- private WsddResource wsddResource_;
- private Hashtable wsDescToHandlers_;
- private Hashtable serviceDescNameToDescObj_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- try {
- Enumeration e = wsDescToHandlers_.keys();
- while (e.hasMoreElements()) {
-
- Hashtable wsPortsTable = new Hashtable();
- Hashtable wsPortToHandlerTable = new Hashtable();
-
- String serviceDescName = (String) e.nextElement();
- // load PortName -> PortComponent table
- WebServiceDescription wsDescription_ = (WebServiceDescription) serviceDescNameToDescObj_.get(serviceDescName);
- if (wsDescription_ != null) {
-
- List wsPorts = wsDescription_.getPortComponents();
- for (int k = 0; k < wsPorts.size(); k++) {
- PortComponent port = (PortComponent) wsPorts.get(k);
- wsPortsTable.put(port.getPortComponentName(), port);
- wsPortToHandlerTable.put(port.getPortComponentName(), new ArrayList());
- }
- }
-
- List handlerTableItems = (List) wsDescToHandlers_.get(serviceDescName);
- if (handlerTableItems != null) {
-
- WsddFactory wsddFactory = new WsddFactoryImpl();
-
- //form port components tables first
- for (int i = 0; i < handlerTableItems.size(); i++) {
-
- HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i);
- PortComponent wsPort = (PortComponent) hti.getPort();
- if (wsPort == null) {
- //find it
- if (wsPortsTable.get(hti.getPortName()) != null)
- wsPort = (PortComponent) wsPortsTable.get(hti.getPortName());
- else {
- // create it; should not get into here
- wsPort = wsddFactory.createPortComponent();
- wsPort.setPortComponentName(hti.getPortName());
- wsPortsTable.put(wsPort.getPortComponentName(), wsPort);
- }
- }
- wsPortToHandlerTable.put(wsPort.getPortComponentName(), new ArrayList());
- }
-
- // form Handler and ports table
- for (int i = 0; i < handlerTableItems.size(); i++) {
-
- HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i);
- String portName = hti.getPortName();
-
- PortComponent port = (PortComponent) wsPortsTable.get(portName);
- if (port == null) return status;
-
- List existingHandlers = port.getHandlers();
-
- Object handler = hti.getHandler();
- if (!existingHandlers.contains(handler)) {
- // create it
- Handler newHandler = wsddFactory.createHandler();
- newHandler.setHandlerName(hti.getHandlerName());
- newHandler.setHandlerClass(hti.getHandlerClassName());
- ((List) wsPortToHandlerTable.get(portName)).add(newHandler);
-
- }
- else if (handler instanceof Handler) {
- // clone it
- EtoolsCopyUtility copyUtil = new EtoolsCopyUtility();
- copyUtil.setCopyAdapters(true);
- Handler clonedHandler = (Handler) copyUtil.copy((Handler) handler);
- ((List) wsPortToHandlerTable.get(portName)).add(clonedHandler);
- }
- }
-
- }
-
- // remove existing handlers from ports
- removeExistingHandlers(wsPortsTable, wsPortToHandlerTable);
-
- // add ports to wsDescription
- addPortsToDescriptions(wsPortsTable, wsDescription_);
-
- // add handlers to ports
- addHandlersToPorts(wsPortsTable, wsPortToHandlerTable);
- }
- if (wsddResource_ != null) {
- wsddResource_.save(new HashMap());
- }
-
- }
- catch (Exception e) {
- //status = new
- e.printStackTrace();
- }
- return status;
- }
-
- private void removeExistingHandlers(Hashtable portsTable, Hashtable portsToHandlersTable) {
- try {
- Enumeration ports = portsToHandlersTable.keys();
- while (ports.hasMoreElements()) {
- String portName = (String) ports.nextElement();
- Object port = portsTable.get(portName);
- if (port != null && port instanceof PortComponent) {
- List handlers = ((PortComponent) port).getHandlers();
- handlers.clear();
- }
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void addPortsToDescriptions(Hashtable portsTable, WebServiceDescription wsDescription_) {
- try {
- Enumeration ports = portsTable.keys();
- while (ports.hasMoreElements()) {
- String portName = (String) ports.nextElement();
- // newly edited port
- Object port = portsTable.get(portName);
-
- // existing port
- List emfPorts = wsDescription_.getPortComponents();
- if (!emfPorts.contains(port) && port != null && port instanceof PortComponent) {
- emfPorts.add((PortComponent) port);
- }
- }
- }
-
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void addHandlersToPorts(Hashtable portsTable, Hashtable portsToHandlersTable) {
- try {
- Enumeration ports = portsToHandlersTable.keys();
- while (ports.hasMoreElements()) {
- String portName = (String) ports.nextElement();
- Object port = portsTable.get(portName);
- if (port != null && port instanceof PortComponent) {
- List handlers = (List) portsToHandlersTable.get(portName);
-
- List modelHandlers = ((PortComponent) port).getHandlers();
- modelHandlers.addAll(handlers);
- }
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * @param handlerTableItems
- * The handlerTableItems to set.
- */
- public void setHandlersList(List handlerTableItems) {
- }
-
- public void setWsDescToHandlers(Hashtable wsDescToHandlers) {
- this.wsDescToHandlers_ = wsDescToHandlers;
- }
-
-// public void setWsDescription(WebServiceDescription wsDesc) {
-// this.wsDescription_ = wsDesc;
-// }
-
- public void setWsddResource(WsddResource wsddRes) {
- this.wsddResource_ = wsddRes;
- }
-
- public void setServiceDescNameToDescObj(Hashtable serviceDescNameToDescObj) {
- this.serviceDescNameToDescObj_ = serviceDescNameToDescObj;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
deleted file mode 100644
index 2e96978ce..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
+++ /dev/null
@@ -1,619 +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.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.PropertiesResourceFilter;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Image;
-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.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 TableViewerWidget extends SimpleWidgetDataContributor
-{
- private int DEFAULT_TABLE_HEIGHT_HINT = 100;
- private int DEFAULT_COLUMN_WIDTH = 80;
-
- public static byte MAP_ONE_TO_ONE = 3;
- public static byte MAP_MANY_TO_ONE = 1;
- public static byte MAP_MANY_TO_MANY = 0;
-
- private String[] columns_;
- private TableViewer tableViewer_;
- private Table table_;
- private TableEditor editor_;
- private TableEditorListener tableEditorListener_;
- private Text text_;
- private Button import_;
- private Button add_;
- private Button remove_;
-
- private Composite parent_;
- private Listener statusListener_;
-
- private String message = null;
- private byte rescriction = MAP_MANY_TO_MANY;
-
- private List values_;
- private Object defaultValue_;
-
- private PropertiesResourceFilter filter_ = new PropertiesResourceFilter();
-
- public TableViewerWidget(String[] columns, List initValues, Object defaultValue, byte rescriction)
- {
- columns_ = columns;
- values_ = new ArrayList();
- if (initValues != null && initValues.size() > 0)
- values_.addAll(initValues);
- defaultValue_ = (defaultValue != null) ? defaultValue : new String("");
- this.rescriction = rescriction;
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- parent_ = parent;
- statusListener_ = statusListener;
-
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
-
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- composite.setLayout(gl);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
- table_.setLayoutData(gd);
- table_.setHeaderVisible(true);
- table_.setLinesVisible(true);
- TableLayout tableLayout = new TableLayout();
- int maxWidth = DEFAULT_COLUMN_WIDTH;
- for (int i = 0; i < columns_.length; i++)
- {
- TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
- tableColumn.setText(columns_[i]);
- tableColumn.pack();
- int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth());
- maxWidth = Math.max(maxWidth, tableColumnWidth);
- ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true);
- tableLayout.addColumnData(columnData);
- }
- table_.setLayout(tableLayout);
- // initialize the table editor
- editor_ = new TableEditor(table_);
- // The editor must have the same size as the cell and must
- // not be any smaller than 50 pixels.
- editor_.horizontalAlignment = SWT.LEFT;
- editor_.grabHorizontal = true;
- editor_.minimumWidth = maxWidth;
- tableEditorListener_ = new TableEditorListener();
- table_.addMouseListener(tableEditorListener_);
- tableViewer_ = new TableViewer(table_);
- tableViewer_.getControl().addKeyListener(
- new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- int asciiDel = (int)e.character;
- // Del
- if (asciiDel == 127)
- handleDeleteKeyPressed();
- // Enter or space
- if (((int)e.character) == 13 || ((int)e.character) == 32)
- tableEditorListener_.editSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.setInput(values_);
- tableViewer_.addSelectionChangedListener(
- new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- enableRemove(true);
- }
- }
- );
-
- Composite buttonComposite = new Composite(composite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 3;
- gl.makeColumnsEqualWidth = true;
- buttonComposite.setLayout(gl);
- buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- import_ = new Button(buttonComposite, SWT.PUSH);
- import_.setText(msgUtils.getMessage("LABEL_IMPORT"));
- import_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- import_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleImportButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
-
- add_ = new Button(buttonComposite, SWT.PUSH);
- add_.setText(msgUtils.getMessage("LABEL_ADD"));
- add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- add_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleAddButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
-
-
- remove_ = new Button(buttonComposite, SWT.PUSH);
- remove_.setText(msgUtils.getMessage("LABEL_REMOVE"));
- remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- remove_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleRemoveButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
- enableRemove(false);
-
- return this;
- }
-
- private void enableRemove(boolean enabled)
- {
- remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- private void handleImportButtonSelected(SelectionEvent event)
- {
- IResource resource = DialogUtils.browseResources(
- parent_.getShell(),
- ResourceUtils.getWorkspaceRoot(),
- null,
- filter_
- );
- if (resource != null && resource instanceof IFile)
- {
- try
- {
- Properties props = new Properties();
- props.load(((IFile)resource).getContents());
- Set set = props.entrySet();
- java.util.List list = new LinkedList();
- Iterator i = set.iterator();
- while (i.hasNext())
- {
- Map.Entry me = (Map.Entry)i.next();
- String key = (String)me.getKey();
- String val = (String)me.getValue();
- list.add(new String[] {key,val});
- }
- values_.addAll(list);
- }
- catch (Exception e)
- {
- // TODO Report some error here.
- }
- }
- refresh();
- }
-
- private void handleAddButtonSelected(SelectionEvent event)
- {
- values_.add(defaultValue_);
- refresh();
- setSelectionAsObject(values_.get(table_.getItemCount()-1));
- tableEditorListener_.editSelection();
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event)
- {
- handleDeleteKeyPressed();
- }
-
- private void handleDeleteKeyPressed()
- {
- internalDispose();
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection))
- {
- int selectionIndex = table_.getSelectionIndex();
- int selectionCount = table_.getItemCount();
- values_.remove(selectionIndex);
- if (selectionIndex < selectionCount-1)
- setSelectionAsObject(values_.get(selectionIndex));
- else if (selectionCount -2 >= 0)
- setSelectionAsObject(values_.get(selectionCount-2));
- refresh();
- }
- }
-
- private void internalRefresh()
- {
- // synchronize text field, previously selected table cell and model (inputObject)
- if (text_ != null)
- {
- TableItem oldTableItem = editor_.getItem();
- int oldColumnIndex = editor_.getColumn();
- if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length)
- {
- String oldText = text_.getText();
- oldTableItem.setText(oldColumnIndex, oldText);
- int oldRowIndex = table_.indexOf(oldTableItem);
- values_.set(oldRowIndex, new String[] {oldTableItem.getText(0), oldTableItem.getText(1)});
- }
- }
- checkMappingConstraints();
- statusListener_.handleEvent( null );
- }
-
- private void checkMappingConstraints() {
-
- HashMap map = new HashMap();
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-
- for(int cnt=0; cnt<values_.size(); cnt++){
- String[] value = (String[])values_.get(cnt);
- if(map.containsKey(value[0]) && ((rescriction & 1)!=0)){
- message = msgUtils.getMessage("MSG_MAPPING_DUPLICATE_ENTRIES", new String[]{columns_[0],columns_[1]});
- return;
- }
- if(map.containsValue(value[1]) && ((rescriction & 2)!=0)){
- message = msgUtils.getMessage("MSG_MAPPING_DUPLICATE_ENTRIES", new String[]{columns_[1],columns_[0]});
- return;
- }
- map.put(value[0],value[1]);
-
- }
- message = null;
-
- }
-
- public IStatus getStatus()
- {
- return message == null ? Status.OK_STATUS :
- StatusUtils.errorStatus( message );
- }
-
- private void setSelectionAsObject(Object object)
- {
- tableViewer_.setSelection(new StructuredSelection(object), true);
- }
-
- public void refresh()
- {
- internalRefresh();
- tableViewer_.refresh();
- }
-
- public TableItem[] getItems()
- {
- //internalRefresh();
- return table_.getItems();
- }
-
- public void setEnabled(boolean enabled)
- {
- add_.setEnabled(enabled);
- enableRemove(enabled);
- }
-
- public void dispose()
- {
- internalDispose();
- if (editor_ != null)
- editor_.dispose();
- if (table_ != null)
- table_.dispose();
- if (add_ != null)
- add_.dispose();
- if (remove_ != null)
- remove_.dispose();
- }
-
- private void internalDispose()
- {
- if (text_ != null)
- text_.dispose();
- text_ = null;
- }
-
- protected class TableEditorListener implements MouseListener
- {
- private int currSelectionIndex_;
- private int editRow_;
- private int editColumn_;
-
- public TableEditorListener()
- {
- super();
- currSelectionIndex_ = -1;
- editRow_ = -1;
- editColumn_ = -1;
- }
-
- public void mouseDoubleClick(MouseEvent e)
- {
- mouseDown(e);
- }
-
- public void mouseDown(MouseEvent e)
- {
- // refresh table
- internalRefresh();
- // Clean up previous text editor control
- internalDispose();
- // update table
- if (table_.isFocusControl())
- {
- int selectedRowIndex = getSelectedRow(table_, e.y);
- if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex)
- {
- TableItem tableItem = table_.getItem(selectedRowIndex);
- int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y);
- if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn()))
- editSelection(selectedRowIndex, selectedColumnIndex);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- public void mouseUp(MouseEvent e)
- {
- }
-
- private int getSelectedRow(Table table, int y)
- {
- TableItem[] tableItems = table.getItems();
- for (int i = 0; i < tableItems.length; i++)
- {
- Rectangle rectangle = tableItems[i].getBounds(0);
- if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height))
- return i;
- }
- return -1;
- }
-
- private int getSelectedColumn(TableItem tableItem, int x, int y)
- {
- for (int i = 0; i < columns_.length; i++)
- {
- if (tableItem.getBounds(i).contains(x, y))
- return i;
- }
- return -1;
- }
-
- private void editSelection(int row, int column)
- {
- editRow_ = row;
- editColumn_ = column;
- TableItem tableItem = table_.getItem(row);
- // Setup adapter for the new selection
- text_ = new Text(table_, SWT.NONE);
- String text = tableItem.getText(column);
- text_.setText((text != null) ? text : "");
- text_.addKeyListener(new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- // Esc
- if (((int)e.character) == 27)
- cancelSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- text_.addTraverseListener(new TraverseListener()
- {
- public void keyTraversed(TraverseEvent e)
- {
- if (e.detail == SWT.TRAVERSE_TAB_NEXT)
- traverseTabNext();
- else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
- traverseTabPrevious();
- }
- }
- );
- editor_.setEditor(text_, tableItem, column);
- text_.setFocus();
- text_.selectAll();
- }
-
- protected void traverseTabNext()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1))
- {
- if (editColumn_ < columns_.length-1)
- editColumn_++;
- else
- {
- editColumn_ = 0;
- editRow_++;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- protected void traverseTabPrevious()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == 0 && editColumn_ == 0))
- {
- if (editColumn_ > 0)
- editColumn_--;
- else
- {
- editColumn_ = columns_.length-1;
- editRow_--;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- public void cancelSelection()
- {
- internalDispose();
- internalRefresh();
- }
-
- public void editSelection()
- {
- int selectedRowIndex = table_.getSelectionIndex();
- if (selectedRowIndex != -1 && columns_.length > 0)
- {
- // refresh table
- internalRefresh();
- // Clean up any previous editor control
- internalDispose();
- editSelection(selectedRowIndex, 0);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- protected class ListContentProvider implements IStructuredContentProvider
- {
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- tableViewer_.add(getElements(newInput));
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof List)
- {
- List list = (List)inputElement;
- Object[] objects = new Object[list.size()];
- for (int i = 0; i < objects.length; i++)
- objects[i] = list.get(i);
- return objects;
- }
- else
- return new Object[0];
- }
- }
-
- protected class ListLabelProvider implements ITableLabelProvider
- {
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- return ((String[])element)[columnIndex];
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java
deleted file mode 100644
index 14056035c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java
+++ /dev/null
@@ -1,138 +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.ui.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.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-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 WSDLSelectionConditionCommand extends AbstractDataModelOperation implements Condition
-{
- private String pluginId_;
- private MessageUtils msgUtils_;
- private WebServicesParser webServicesParser;
- private String webServiceURI;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
- private boolean needWSDLSelectionTreeWidget;
-
- public WSDLSelectionConditionCommand()
- {
- pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser == null)
- webServicesParser = new WebServicesParserExt();
- return webServicesParser;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- needWSDLSelectionTreeWidget = false;
- WebServicesParser parser = getWebServicesParser();
- parser.setURI(webServiceURI);
- try
- {
- parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS);
- }
- catch (WWWAuthenticationException wwwae)
- {
- DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
- dialog.handleWWWAuthentication(wwwae);
- String username = dialog.getUsername();
- String password = dialog.getPassword();
- httpBasicAuthUsername = username;
- httpBasicAuthPassword = password;
- if (username != null && password != null)
- {
- parser.setHTTPBasicAuthUsername(username);
- parser.setHTTPBasicAuthPassword(password);
- try
- {
- parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS);
- }
- catch (Throwable t)
- {
- return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_URI_NOT_RESOLVABLE", new Object[] {webServiceURI}), t);
- }
- finally
- {
- parser.setHTTPBasicAuthUsername(null);
- parser.setHTTPBasicAuthPassword(null);
- }
- }
- }
- catch (Throwable t)
- {
- return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_URI_NOT_RESOLVABLE", new Object[] {webServiceURI}), t);
- }
- WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
- if (wsEntity != null)
- {
- int type = wsEntity.getType();
- if (type != WebServiceEntity.TYPE_WSDL)
- needWSDLSelectionTreeWidget = true;
- }
- return Status.OK_STATUS;
- }
-
- public boolean evaluate()
- {
- return needWSDLSelectionTreeWidget;
- }
-
- public String getWebServiceURI()
- {
- return webServiceURI;
- }
-
- public void setWebServiceURI(String webServiceURI)
- {
- this.webServiceURI = webServiceURI;
- }
-
- public String getWsdlURI()
- {
- return getWebServiceURI();
- }
-/**
- * @return Returns the httpBasicAuthPassword.
- */
-public String getHttpBasicAuthPassword() {
- return httpBasicAuthPassword;
-}
-/**
- * @return Returns the httpBasicAuthUsername.
- */
-public String getHttpBasicAuthUsername() {
- return httpBasicAuthUsername;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
deleted file mode 100644
index 310deae63..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
+++ /dev/null
@@ -1,132 +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.ui.widgets;
-
-import java.util.Map;
-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.wst.command.internal.env.core.common.MessageUtils;
-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.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class WSDLSelectionOutputCommand extends AbstractDataModelOperation
-{
- private WebServicesParser webServicesParser;
- private String wsdlURI;
- private IProject project;
- private String componentName;
-
- private boolean testService;
-
-
- public boolean getTestService() {
- return testService;
- }
-
-
- public void setTestService(boolean testService) {
- this.testService = testService;
- }
-
- /**
- * @return Returns the project.
- */
- public IProject getProject()
- {
- return project;
- }
-
- /**
- * @param project
- * The project to set.
- */
- public void setProject(IProject project)
- {
- this.project = project;
- }
-
-
-
- public String getComponentName()
- {
- return componentName;
- }
-
- public void setComponentName(String componentName)
- {
- this.componentName = componentName;
- }
-
- public String getWsdlURI()
- {
- return wsdlURI;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser != null)
- return webServicesParser;
- else
- return new WebServicesParserExt();
- }
-
- /**
- * @param webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- MessageUtils msgUtils = new MessageUtils("org.eclipse.jst.ws.consumption.ui.plugin", this);
- if (wsdlURI != null && getWebServicesParser().getWSDLDefinition(wsdlURI) != null) {
- IStatus status = Status.OK_STATUS;
- Map services = getWebServicesParser().getWSDLDefinition(wsdlURI).getServices();
- if (services.isEmpty()){
- if (testService==true){
- testService = false;
- status = StatusUtils.warningStatus( msgUtils.getMessage("MSG_WARNING_NO_SERVICE_ELEMENT") );
- try{
- env.getStatusHandler().report(status);
- }catch(Exception e){
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_WARNING_NO_SERVICE_ELEMENT") );
- }
- }
- }
- return status;
- }
- else
- {
- IStatus status = StatusUtils.errorStatus( msgUtils.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL") );
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
deleted file mode 100644
index 6c8f2287d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
+++ /dev/null
@@ -1,287 +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.ui.widgets;
-
-import java.util.List;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-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.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
-* This wizard page allows the user to select the WSDL URI for consumption
-*/
-public class WSDLSelectionTreeWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_;
- private MessageUtils msgUtils_;
-
- /*CONTEXT_ID PWWS0001 for the WSDL Selection Page*/
- private final String INFOPOP_PWWS_PAGE = ".PWWS0001";
-
- private WebServicesParser webServicesParser;
- private String webServiceURI;
-
- private Listener statusListener;
- private TreeViewer treeViewer_;
- private TreeContentProvider treeContentProvider;
- private Tree tree_;
- private int pageWidth_;
-
- /**
- * Default constructor.
- */
- public WSDLSelectionTreeWidget()
- {
- pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- this.statusListener = statusListener;
- parent.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWWS_PAGE"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, pluginId_ + INFOPOP_PWWS_PAGE);
-
- Label wsdlLabel = new Label(parent, SWT.WRAP);
- wsdlLabel.setText(msgUtils_.getMessage("LABEL_SELECT_WSDL"));
- wsdlLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- tree_ = new Tree(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 200;
- tree_.setLayoutData(gd);
- pageWidth_ = tree_.getShell().getSize().x;
- treeViewer_ = new TreeViewer(tree_);
- treeContentProvider = new TreeContentProvider();
- treeViewer_.setContentProvider(treeContentProvider);
- treeViewer_.setLabelProvider(new TreeLabelProvider());
- treeViewer_.addSelectionChangedListener(
- new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- handleTreeSelectionChangedEvent(event);
- }
- }
- );
- return this;
- }
-
- private void handleTreeSelectionChangedEvent(SelectionChangedEvent event)
- {
- statusListener.handleEvent(new Event());
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser()
- {
- return webServicesParser;
- }
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- treeViewer_.setInput(this.webServicesParser);
- refreshTreeViewer();
- }
-
- public void setWebServiceURI(String wsURI)
- {
- webServiceURI = wsURI;
- treeContentProvider.setWebServiceURI(webServiceURI);
- refreshTreeViewer();
- }
-
- public void refreshTreeViewer()
- {
- if (webServicesParser != null && webServiceURI != null)
- {
- treeViewer_.refresh();
- Control shell = tree_.getShell();
- if (tree_.getSize().x > pageWidth_ || shell.getSize().x > pageWidth_)
- {
- tree_.setSize(pageWidth_, tree_.getSize().y);
- shell.setSize(pageWidth_, shell.getSize().y);
- shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- shell.redraw();
- }
- }
- }
-
- public void setEnabled(boolean enabled)
- {
- tree_.setEnabled(enabled);
- }
-
- public boolean isEnabled()
- {
- return tree_.isEnabled();
- }
-
- public String getWsdlURI()
- {
- WebServiceEntity entity = getSelectionAsWebServiceEntity();
- if (entity != null)
- return entity.getURI();
- else
- return webServiceURI;
- }
-
- private WebServiceEntity getSelectionAsWebServiceEntity()
- {
- if (treeViewer_ != null)
- {
- ISelection sel = treeViewer_.getSelection();
- if (!sel.isEmpty() && (sel instanceof IStructuredSelection))
- {
- IStructuredSelection ssel = (IStructuredSelection)sel;
- Object object = ssel.getFirstElement();
- if (object instanceof WebServiceEntity)
- return (WebServiceEntity)object;
- }
- }
- return null;
- }
-
- public IStatus getStatus()
- {
- WebServiceEntity wsEntity = getSelectionAsWebServiceEntity();
- if (wsEntity == null || wsEntity.getType() != WebServiceEntity.TYPE_WSDL)
- return StatusUtils.errorStatus( msgUtils_.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL") );
- else
- return Status.OK_STATUS;
- }
-
- private class TreeContentProvider implements ITreeContentProvider
- {
- private String webServiceURI;
-
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof WebServicesParser)
- {
- WebServicesParser parser = (WebServicesParser)inputElement;
- Object wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
- if (wsEntity != null)
- return new Object[] {wsEntity};
- }
- return new Object[0];
- }
-
- public Object[] getChildren(Object parentElement)
- {
- if (parentElement instanceof WebServiceEntity)
- {
- List list = ((WebServiceEntity)parentElement).getChildren();
- Object[] objects = new Object[list.size()];
- for (int i = 0; i < objects.length; i++)
- objects[i] = list.get(i);
- return objects;
- }
- return new Object[0];
- }
-
- public Object getParent(Object element)
- {
- if (element instanceof WebServiceEntity)
- return ((WebServiceEntity)element).getParent();
- return new Object[0];
- }
-
- public boolean hasChildren(Object element)
- {
- return (getChildren(element).length > 0);
- }
-
- public void setWebServiceURI(String wsURI)
- {
- webServiceURI = wsURI;
- }
- }
-
- private class TreeLabelProvider implements ILabelProvider
- {
- public Image getImage(Object element)
- {
- switch (((WebServiceEntity)element).getType())
- {
- case WebServiceEntity.TYPE_HTML:
- return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/html.gif").createImage();
- case WebServiceEntity.TYPE_WSIL:
- return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsil.gif").createImage();
- case WebServiceEntity.TYPE_WSDL:
- return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsdl.gif").createImage();
- default:
- return null;
- }
- }
-
- public String getText(Object element)
- {
- return ((WebServiceEntity)element).getURI();
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index fc40135fe..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,158 +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.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-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.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionWidgetDefaultingCommand extends AbstractDataModelOperation
-{
- private IStructuredSelection selection_;
-
- public String getWebServiceURI()
- {
- if (selection_ != null && !selection_.isEmpty())
- {
- Object firstSel = selection_.getFirstElement();
- if (firstSel instanceof IFile)
- {
- IFile ifile = (IFile)firstSel;
- String ext = ifile.getFileExtension();
- if (ext != null && (ext.equals("wsdl") || ext.equals("wsil") || ext.equals("html")))
- {
- return ifile.getFullPath().toString();
- }
- }
- if (firstSel instanceof ServiceImpl)
- {
- ServiceImpl serviceImpl = (ServiceImpl)firstSel;
- return J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
- }
- if (firstSel instanceof ServiceRef)
- {
- ServiceRef serviceRef = (ServiceRef)firstSel;
- return J2EEActionAdapterFactory.getWSDLURI(serviceRef);
- }
- if (firstSel instanceof WSDLResourceImpl)
- {
- WSDLResourceImpl wsdlRI = (WSDLResourceImpl)firstSel;
- return J2EEActionAdapterFactory.getWSDLURI(wsdlRI);
- }
- if (firstSel instanceof String)
- return (String)firstSel;
- }
- return "";
- }
-
- public void setInitialSelection( IStructuredSelection selection )
- {
- selection_ = selection;
- }
-
- public boolean getGenWSIL()
- {
- return false;
- }
-
- public String getWsilURI()
- {
- String wsURI = getWebServiceURI();
- if (wsURI != null && wsURI.length() > 0 && wsURI.endsWith("wsdl"))
- {
- StringBuffer sb = new StringBuffer(wsURI.substring(0, wsURI.length()-4));
- sb.append("wsil");
- return sb.toString();
- }
- return "";
- }
-
- public IProject getProject()
- {
- IProject p = getProjectFromInitialSelection(selection_);
- return p;
- }
-
- public String getComponentName()
- {
- String cname = getComponentNameFromInitialSelection(selection_);
- return cname;
- }
-
- private IProject getProjectFromInitialSelection(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;
- }
-
- private String getComponentNameFromInitialSelection(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;
-
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
- if (comp!=null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
deleted file mode 100644
index e05e8fd19..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
+++ /dev/null
@@ -1,126 +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.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWrapper;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class WSDLSelectionWidgetWrapper extends SimpleWidgetDataContributor
-{
- private WSDLSelectionWidget wsdlSelectionWidget;
- private IProject project;
- private String componentName;
-
- public WSDLSelectionWidgetWrapper()
- {
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- wsdlSelectionWidget = new WSDLSelectionWidget();
- wsdlSelectionWidget.addControls(parent, statusListener);
- return this;
- }
-
- public IStatus getStatus()
- {
- return wsdlSelectionWidget.getStatus();
- }
-
- public void setWebServiceURI(String wsUri)
- {
- IStructuredSelection sel;
- if (wsUri != null)
- sel = new StructuredSelection(wsUri);
- else
- sel = new StructuredSelection();
- wsdlSelectionWidget.setInitialSelection(sel);
- }
-
- public String getWebServiceURI()
- {
- IStructuredSelection sel = wsdlSelectionWidget.getObjectSelection();
- Object object = sel.getFirstElement();
- String result = null;
-
- if (object != null )
- {
- if( object instanceof WSDLSelectionWrapper )
- {
- // Get at the inner structured selection object.
- WSDLSelectionWrapper wrapper = (WSDLSelectionWrapper)object;
- IStructuredSelection innerSelection = wrapper.wsdlSelection;
- Object innerObject = innerSelection.getFirstElement();
-
- result = innerObject == null ? null : innerObject.toString();
- }
- else
- {
- result = object.toString();
- }
- }
-
- return result;
- }
-
- public String getWsdlURI()
- {
- return getWebServiceURI();
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return wsdlSelectionWidget.getWebServicesParser();
- }
-
- public void setProject(IProject project)
- {
- this.project = project;
- }
-
- public IProject getProject()
- {
- IProject p = wsdlSelectionWidget.getProject();
- if (p==null)
- {
- return project;
- }
- else
- return p;
- }
-
- public String getComponentName()
- {
- String cname = wsdlSelectionWidget.getComponentName();
- if (cname==null)
- {
- return componentName;
- }
- else
- return cname;
- }
-
- public void setComponentName(String componentName)
- {
- this.componentName = componentName;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
deleted file mode 100644
index d50e049ca..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
+++ /dev/null
@@ -1,110 +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.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-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.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor
-{
- /*CONTEXT_ID PWPR0013 for the Wizard Scenario Client group of the Project Page*/
- private String INFOPOP_PWPR_GROUP_SCENARIO_CLIENT = "PWPR0013";
-
- /*CONTEXT_ID PWPR0014 for the Web Service Client Type combo box of the Project Page*/
- private String INFOPOP_PWPR_COMBO_CLIENTTYPE = "PWPR0014";
- private Combo clientTypeCombo_;
-
- private TypeRuntimeServer ids_;
- private LabelsAndIds labelIds_;
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
- */
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- UIUtils utils = new UIUtils( msgUtils, pluginId );
-
- Group clientGroup = utils.createGroup( parent,
- "GROUP_SCENARIO_CLIENT",
- "TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT",
- INFOPOP_PWPR_GROUP_SCENARIO_CLIENT,
- 2, 10, 10 );
-
-
- int comboStyle = SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY;
- clientTypeCombo_ = utils.createCombo( clientGroup,
- "LABEL_WEBSERVICECLIENTTYPE",
- "TOOLTIP_PWPR_COMBO_CLIENTTYPE",
- INFOPOP_PWPR_COMBO_CLIENTTYPE,
- comboStyle );
-
-
-
- return this;
- }
-
- public void enableWidget( boolean enable )
- {
- clientTypeCombo_.setEnabled( enable );
- }
-
- public void setTypeRuntimeServer( TypeRuntimeServer ids )
- {
- // rskreg
- //WebServiceClientTypeRegistry registry = WebServiceClientTypeRegistry.getInstance();
- //LabelsAndIds labelIds = registry.getClientTypeLabels();
- LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils2.getClientTypeLabels();
- int selection = 0;
- String[] clientIds = labelIds.getIds_();
- String selectedId = ids.getTypeId();
-
- // rskreg
- clientTypeCombo_.setItems( labelIds.getLabels_() );
-
- // Now find the selected one.
- for( int index = 0; index < clientIds.length; index++ )
- {
- if( selectedId.equals( clientIds[index ]) )
- {
- selection = index;
- break;
- }
- }
-
- clientTypeCombo_.select( selection );
- ids_ = ids;
- labelIds_ = labelIds;
- }
-
- public TypeRuntimeServer getTypeRuntimeServer()
- {
- int selectionIndex = clientTypeCombo_.getSelectionIndex();
-
- ids_.setTypeId( labelIds_.getIds_()[selectionIndex] );
-
- return ids_;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
deleted file mode 100644
index 49e288bb8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
+++ /dev/null
@@ -1,411 +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.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.CheckForServiceProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-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.widgets.CheckWSDLValidationCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetWrapper;
-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.runtime.ClientRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-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.WebServiceClientTestArrivalCommand;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.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.extensions.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallClientFragment;
-import org.eclipse.wst.ws.internal.extensions.RunClientFragment;
-
-
-public class ClientWidgetBinding implements CommandWidgetBinding
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new ClientRootCommandFragment();
- }
- };
- }
-
- /* (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)
- {
- // Before ClientWizardWidget
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidget.class );
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidget.class );
-
- // After ClientWizardWidget
- dataRegistry.addMapping(ClientWizardWidget.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "TestService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-
- // Before ClientRuntimeSelectionWidget
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientRuntimeSelectionWidget.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientRuntimeSelectionWidget.class, "J2EEVersion", null);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientRuntimeSelectionWidget.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientRuntimeSelectionWidget.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientRuntimeSelectionWidget.class,"NeedEAR",null);
-
- // After ClientRuntimeSelectionWidget
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "J2EEVersion", ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", null);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-
- // The ClientRuntimeSelectionWidget can control what client extension comes up.
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-
- // Before WSDLSelectionWidgetWrapper
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionWidgetWrapper.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionWidgetWrapper.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", WSDLSelectionWidgetWrapper.class );
-
- // After WSDLSelectionWidgetWrapper
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WsdlURI", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WebServicesParser", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "Project", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "ComponentName", WSDLSelectionOutputCommand.class);
-
- // Before Client Test widget.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
- 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);
-
- // After the client test widget
- 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, "RunClientTest",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleMethods",ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.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)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- widgetRegistry.add( "ClientWizardWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_PROJECT"),
- msgUtils.getMessage("PAGE_DESC_WS_PROJECT"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientWizardWidget();
- }
- } );
-
- widgetRegistry.add( "ClientRuntimeSelectionWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientRuntimeSelectionWidget();
- }
- } );
-
- widgetRegistry.add( "WSDLSelectionWidgetWrapper",
- msgUtils.getMessage("PAGE_TITLE_WS_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WS_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionWidgetWrapper();
- }
- } );
-
- widgetRegistry.add( "ClientTestWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
- msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientTestWidget();
- }
- });
- }
-
- private class ClientRootCommandFragment extends SequenceFragment
- {
- public ClientRootCommandFragment()
- {
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-
- //add( new SimpleFragment( new CheckForMissingFiles(), "" ) );
- add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
- add( new SimpleFragment( "ClientWizardWidget" ) );
- //add( new TestCommandFactoryFragment() );
- add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( "WSDLSelectionWidgetWrapper" ) );
- add( new SimpleFragment( new WSDLSelectionOutputCommand(), ""));
- add( new SimpleFragment( new CheckWSDLValidationCommand(), ""));
- add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
- //add( new TestCommandFactoryFragment2() );
- add( new SimpleFragment( "ClientRuntimeSelectionWidget" ) );
- //add( new SimpleFragment( new CheckForServiceProjectCommand(), ""));
- add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
- //add(new SimpleFragment(new ClientServerDeployableConfigCommand(false), "")); //Note: added here for client
- //add( new ClientExtensionFragment() );
- add( new ClientRootFragment() );
- add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
- add( new SimpleFragment(new GetMonitorCommand(), ""));
- add( new SimpleFragment(new TestDefaultingFragment(),""));
- add( new ClientTestFragment( "ClientTestWidget") );
- 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)
- {
- //Map SelectionCommand
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "InitialInitialSelection", null);
-
- // Map ClientWizardWidgetDefaultingCommand command.
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-
- // Map ClientWizardWidgetOutputCommand command.
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "MonitorService", GetMonitorCommand.class);
-
- // Map ClientRuntimeSelectionWidgetDefaultingCommand command
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", CheckForServiceProjectCommand.class);
-
- // Map WSDLSelectionWidgetDefaultingCommand command.
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionOutputCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", WSDLSelectionOutputCommand.class);
-
- // WSDLSelectionOutputCommand
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", GetMonitorCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", GetMonitorCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- //dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "ComponentName", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class);
-
- // Setup the PreClientDevelopCommand.
- //
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "TestService", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- //
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", 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( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", PreClientDevelopCommand.class );
-
- dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );
-
- // Map ClientExtensionDefaultingCommand command.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class,"ClientEarComponentName", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-
- // Map ClientExtensionOutputCommand command.
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
-
- // GetMonitorCommand
- dataRegistry.addMapping(GetMonitorCommand.class, "Endpoints", ClientTestDelegateCommand.class);
-
- // MAP post server config call
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-
- // Map WebServiceClientTestArrivalCommand command.
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.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);
-
-
- //Mappings to enable peek-ahead for Page 3 of the client wizard
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", InstallClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", InstallClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", InstallClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", InstallClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", RunClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", RunClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", RunClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", RunClientFragment.class, "Ear", null );
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
deleted file mode 100644
index 7cc9c3c49..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
+++ /dev/null
@@ -1,139 +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.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.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;
-
-
-/**
- *
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigClientHandlersWidgetBinding implements CommandWidgetBinding
-{
-
- /*
- * (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) {
-
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-
- widgetRegistry.add("ConfigClientHandlersTableWidget",
- msgUtils.getMessage("PAGE_TITLE_CLIENT_HDLR_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_CLIENT_HDLR_CONFIG"),
- new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigClientHandlersTableWidget();
- }
- });
-
- }
-
- /*
- * (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(ClientHandlersWidgetDefaultingCommand.class,"AllHandlers", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"Handlers", ConfigClientHandlersTableWidget.class,"WsRefsToHandlers", null);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"SourceOutputLocation", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ServiceRefName", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"RefNameToServiceRef", ConfigClientHandlersTableWidget.class);
-
- //dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"AllHandlersList", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"WsRefsToHandlers", ClientHandlersWidgetOutputCommand.class,"HandlersTable",null);
-
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"SourceOutputLocation", GenerateHandlerSkeletonCommand.class,"OutputLocation",null);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerClassNames", GenerateHandlerSkeletonCommand.class,"HandlerNames",null);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-
- }
-
- /*
- * (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.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create() {
- return new CommandFragmentFactory() {
-
- public CommandFragment create() {
-
- return new ClientHandlersConfigCommandFragment();
- }
- };
- }
-
- private class ClientHandlersConfigCommandFragment extends SequenceFragment{
-
- public ClientHandlersConfigCommandFragment()
- {
- add( new SimpleFragment( new ClientHandlersWidgetDefaultingCommand(), "" ));
- add( new SimpleFragment( "ConfigClientHandlersTableWidget" ) );
- add( new SimpleFragment( new ClientHandlersWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), ""));
- add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
- }
-
- /* (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)
- {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsClientResource", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
deleted file mode 100644
index b615c3922..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
+++ /dev/null
@@ -1,139 +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.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.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;
-
-
-/**
- *
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigServiceHandlersWidgetBinding implements CommandWidgetBinding {
-
- /*
- * (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) {
-
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-
- widgetRegistry.add("ConfigServiceHandlersTableWidget",
- msgUtils.getMessage("PAGE_TITLE_SERVICE_HDLR_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_SERVICE_HDLR_CONFIG"),
- new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigServiceHandlersTableWidget();
- }
- });
-
- }
-
- /*
- * (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(ServiceHandlersWidgetDefaultingCommand.class,"WsRefsToHandlers", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"SourceOutputLocation", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"ServiceDescNameToDescObj", ConfigServiceHandlersTableWidget.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"DescriptionName", ConfigServiceHandlersTableWidget.class);
-
-
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlersList", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"WsDescToHandlers", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"ServiceDescNameToDescObj", ServiceHandlersWidgetOutputCommand.class);
-
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"SourceOutputLocation", GenerateHandlerSkeletonCommand.class,"OutputLocation",null);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerClassNames", GenerateHandlerSkeletonCommand.class,"HandlerNames",null);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-
- }
-
- /*
- * (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.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create() {
- return new CommandFragmentFactory() {
-
- public CommandFragment create() {
-
- return new ServiceHandlersConfigCommandFragment();
- }
- };
- }
-
- private class ServiceHandlersConfigCommandFragment extends SequenceFragment{
-
- public ServiceHandlersConfigCommandFragment()
- {
- add( new SimpleFragment( new ServiceHandlersWidgetDefaultingCommand(), "" ));
- add( new SimpleFragment( "ConfigServiceHandlersTableWidget" ) );
- add( new SimpleFragment( new ServiceHandlersWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), ""));
- add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
-
- }
-
- /* (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)
- {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
-
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
deleted file mode 100644
index d94d94be7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
+++ /dev/null
@@ -1,245 +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.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.HandlersDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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;
-
-
-public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding {
-
-
- public ConfigureHandlersWidgetBinding() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create() {
- return new CommandFragmentFactory() {
-
- public CommandFragment create() {
- return new HandlersCommandFragment();
- }
- };
- }
-
- /*
- * (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) {
-
- // Map client-side widgets to commands
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "Handlers", ConfigClientHandlersTableWidget.class, "WsRefsToHandlers", null);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "SourceOutputLocation", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ServiceRefName", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "RefNameToServiceRef", ConfigClientHandlersTableWidget.class);
-
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "WsRefsToHandlers", ClientHandlersWidgetOutputCommand.class, "HandlersTable", null);
-
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "SourceOutputLocation", GenerateHandlerSkeletonCommand.class, "OutputLocation", null);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "HandlerClassNames", GenerateHandlerSkeletonCommand.class, "HandlerNames", null);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- // Map service-side widgets to commands
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsRefsToHandlers", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "SourceOutputLocation", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "ServiceDescNameToDescObj", ConfigServiceHandlersTableWidget.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "DescriptionName", ConfigServiceHandlersTableWidget.class);
-
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "HandlersList", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "WsDescToHandlers", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "ServiceDescNameToDescObj", ServiceHandlersWidgetOutputCommand.class);
-
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "SourceOutputLocation", GenerateHandlerSkeletonCommand.class, "OutputLocation", null);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "HandlerClassNames", GenerateHandlerSkeletonCommand.class, "HandlerNames", null);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "GenSkeletonEnabled", GenerateHandlerSkeletonCommand.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) {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-
- widgetRegistry.add("ConfigServiceHandlersTableWidget", msgUtils.getMessage("PAGE_TITLE_SERVICE_HDLR_CONFIG"), msgUtils
- .getMessage("PAGE_DESC_SERVICE_HDLR_CONFIG"), new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigServiceHandlersTableWidget();
- }
- });
-
- widgetRegistry.add("ConfigClientHandlersTableWidget", msgUtils.getMessage("PAGE_TITLE_CLIENT_HDLR_CONFIG"), msgUtils
- .getMessage("PAGE_DESC_CLIENT_HDLR_CONFIG"), new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigClientHandlersTableWidget();
- }
- });
-
- }
-
- private class HandlersCommandFragment extends SequenceFragment {
-
- public HandlersCommandFragment() {
-
- add(new SimpleFragment(new HandlersDefaultingCommand(), ""));
-
- add(new ServiceHandlersFragment());
- add(new ClientHandlersFragment());
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
-
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", HandlersDefaultingCommand.class);
-
- dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsClientHandler", ClientHandlersFragment.class, "ClientHandlersEnabled", null);
- dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsServiceHandler", ServiceHandlersFragment.class, "ServiceHandlersEnabled", null);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsClientResource", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
- }
-
- public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
- }
- }
-
- private class ClientHandlersFragment extends BooleanFragment {
-
- boolean isClient_ = false;
-
- public ClientHandlersFragment() {
- setCondition(new Condition() {
-
- public boolean evaluate() {
- return isClient_;
- }
- });
-
- SequenceFragment clientHandlersRootFragment = new SequenceFragment();
-
- clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetDefaultingCommand(), ""));
-
- clientHandlersRootFragment.add(new SimpleFragment("ConfigClientHandlersTableWidget"));
- clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetOutputCommand(), ""));
- clientHandlersRootFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), ""));
-
- setTrueFragment(clientHandlersRootFragment);
- }
-
- public void setClientHandlersEnabled(boolean isClient) {
- isClient_ = isClient;
- }
-
- /*
- * (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) {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "WsClientResource", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ClientProject", ClientHandlersWidgetOutputCommand.class);
-
- }
-
- }
-
- private class ServiceHandlersFragment extends BooleanFragment {
-
- boolean isService_ = false;
-
- public ServiceHandlersFragment() {
- setCondition(new Condition() {
-
- public boolean evaluate() {
- return isService_;
- }
- });
-
- SequenceFragment serviceHandlersRootFragment = new SequenceFragment();
- serviceHandlersRootFragment.add(new SimpleFragment(new ServiceHandlersWidgetDefaultingCommand(), ""));
-
- SequenceFragment serviceHandlersFragment = new SequenceFragment();
- serviceHandlersFragment.add(new SimpleFragment("ConfigServiceHandlersTableWidget"));
- serviceHandlersFragment.add(new SimpleFragment(new ServiceHandlersWidgetOutputCommand(), ""));
- serviceHandlersFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), ""));
-
- serviceHandlersRootFragment.add(serviceHandlersFragment);
-
- setTrueFragment(serviceHandlersRootFragment);
- }
-
- public void setServiceHandlersEnabled(boolean isService) {
- isService_ = isService;
- }
-
- /*
- * (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) {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
- }
-
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
deleted file mode 100644
index 0c5865f73..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
+++ /dev/null
@@ -1,403 +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.ui.widgets.binding;
-
-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.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-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.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-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.TestWebServiceClient;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-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.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.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-
-public class GenSampleWidgetBinding implements CommandWidgetBinding
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new GenSampleRootCommandFragment();
- }
- };
- }
-
- /* (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)
- {
- // Before Client Test widget.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
- 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);
-
- // After the client test widget
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",ClientTestDelegateCommand.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, "RunClientTest",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleMethods",ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.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)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- widgetRegistry.add( "ClientTestWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
- msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientTestWidget();
- }
- });
- }
-
- private class InitializeProxyCommand extends AbstractDataModelOperation
- {
- private IStructuredSelection selection_;
- private TypeRuntimeServer typeRuntimeServer_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private IWebServiceClient webServiceClient_;
- private String j2eeLevel_;
- private String wsdlURI_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- // 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);
- }
- }
-
- WebServiceClientInfo clientInfo = new WebServiceClientInfo();
- clientInfo.setImplURL(getProxyBean());
- //clientInfo.setJ2eeLevel(j2eeLevel_);
- clientInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
- clientInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- clientInfo.setState(WebServiceState.UNKNOWN_LITERAL);
- clientInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
- clientInfo.setWsdlURL(wsdlURI_);
- if (clientInfo.getServerInstanceId()==null)
- {
- CreateServerCommand createServerCommand = new CreateServerCommand();
- createServerCommand.setServerFactoryid(clientInfo.getServerFactoryId());
- createServerCommand.setEnvironment( env );
- IStatus createServerStatus = createServerCommand.execute( null, null );
- if (createServerStatus.getSeverity()==Status.OK){
- clientInfo.setServerInstanceId(createServerCommand.getServerInstanceId());
- }
- else if (createServerStatus.getSeverity()==Status.ERROR){
- env.getStatusHandler().reportError( createServerStatus );
- }
-
- }
-
- AddModuleToServerCommand command = new AddModuleToServerCommand();
- command.setServerInstanceId(clientInfo.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( env );
- status = command.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- }
-
- webServiceClient_ = new TestWebServiceClient(clientInfo);
- return status;
- }
-
- public String getProxyBean()
- {
- String proxyBean = "";
-
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection( selection_.getFirstElement() );
- String beanPackage = ResourceUtils.getJavaResourcePackageName( resource.getFullPath() );
-
- if( beanPackage==null )
- beanPackage = "";
- else
- beanPackage = beanPackage + ".";
-
- proxyBean = beanPackage + resource.getName();
-
- if( proxyBean.toLowerCase().endsWith(".java") || proxyBean.toLowerCase().endsWith(".class"))
- {
- proxyBean = proxyBean.substring(0,proxyBean.lastIndexOf('.'));
- }
- }
- catch( CoreException exc )
- {
- }
-
- return proxyBean;
- }
-
- public IWebServiceClient getWebServiceClient()
- {
- return webServiceClient_;
- }
-
- public boolean getGenerateProxy()
- {
- return true;
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
- {
- typeRuntimeServer_ = typeRuntimeServer;
- }
-
- public void setClientJ2EEVersion( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setModuleType( String moduleType)
- {
- }
-
- public void setResourceContext( ResourceContext resourceContext )
- {
- }
-
- public void setInitialSelection( IStructuredSelection selection )
- {
- selection_ = selection;
- }
- }
-
- private class GenSampleRootCommandFragment extends SequenceFragment
- {
- public GenSampleRootCommandFragment()
- {
- add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
- add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
- add( new SimpleFragment( new InitializeProxyCommand(), "" ));
- add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
- add( new SimpleFragment( new TestDefaultingFragment(),""));
- add( new ClientTestFragment( "ClientTestWidget") );
- add( new FinishFragment() );
- }
-
- /* (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 SelectionCommand
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", InitializeProxyCommand.class );
-
- // Map ClientWizardWidgetDefaultingCommand command.
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class, "TestService", new ForceTrue() );
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-
- // Map ClientWizardWidgetOutputCommand command.
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-
- // Map ClientRuntimeSelectionWidgetDefaultingCommand command
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-
- // Map WSDLSelectionWidgetDefaultingCommand command.
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientExtensionDefaultingCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
-
- // Map ClientExtensionDefaultingCommand command.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class,"ClientEarComponentName",null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ServiceServerInstanceId", FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", InitializeProxyCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", InitializeProxyCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", InitializeProxyCommand.class, "Module", null );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", InitializeProxyCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", InitializeProxyCommand.class, "Ear", null );
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", InitializeProxyCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", InitializeProxyCommand.class );
-
-
-
-
- // Map InitializeProxyCommand command.
- dataRegistry.addMapping(InitializeProxyCommand.class, "WebServiceClient", ClientExtensionOutputCommand.class);
- dataRegistry.addMapping(InitializeProxyCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-
- // Map ClientExtensionOutputCommand command.
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
- // MAP post server config call
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EARProjectName", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-
-
- // Map WebServiceClientTestArrivalCommand command.
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.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);
-
-
- }
- }
-
- private class ForceTrue implements Transformer
- {
- public Object transform(Object value)
- {
- return new Boolean(true);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java
deleted file mode 100644
index f94a2995a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java
+++ /dev/null
@@ -1,90 +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.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ImportWSILWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.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;
-
-
-public class ImportWSILWidgetBinding implements CommandWidgetBinding
-{
- public ImportWSILWidgetBinding()
- {
- }
- /* (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("ImportWSILWidget"));
- root.add(new SimpleFragment(new AddWSDLToWSILWrapperCommand(), ""));
- 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)
- {
- }
-
- /* (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)
- {
- // ImportWSILWidget
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ImportWSILWidget.class);
-
- // AddWSDLToWSILWrapperCommand
- dataRegistry.addMapping(ImportWSILWidget.class, "GenWSILArguments", AddWSDLToWSILWrapperCommand.class, "Args", 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)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- widgetRegistry.add("ImportWSILWidget",
- msgUtils.getMessage("TITLE_WSIL_IMPORT"),
- msgUtils.getMessage("DESC_WSIL_IMPORT"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ImportWSILWidget();
- }
- }
- );
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java
deleted file mode 100644
index e6f7cec1c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java
+++ /dev/null
@@ -1,105 +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.ui.widgets.binding;
-
-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.common.MessageUtils;
-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 ImportWSWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private DataMappingRegistry dataMappingRegistry;
- private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
- public ImportWSWidgetBinding()
- {
- 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("WSImport"));
- 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)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- this.widgetRegistry = widgetRegistry;
- publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry);
-
- widgetRegistry.add("WSImport",
- msgUtils.getMessage("PAGE_TITLE_WS_FIND"),
- msgUtils.getMessage("PAGE_DESC_WS_FIND"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PublishWSWidget(false);
- }
- }
- );
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
deleted file mode 100644
index f605b87b2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,443 +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.ui.widgets.extensions;
-
-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.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-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.WebServicesParser;
-
-
-public class ClientExtensionDefaultingCommand extends AbstractDataModelOperation
-{
- // ClientWizardWidget
- private TypeRuntimeServer clientIds_;
- private String clientRuntimeId_;
- private Boolean testService;
- private ResourceContext resourceContext;
-
- // ClientRuntimeSelectionWidget
- //private SelectionListChoices clientChoices_;
- private String clientProjectName_;
- private String clientEarProjectName_;
- //private String clientComponentName_;
- //private String clientEarComponentName_;
- private String clientComponentType_;
- //private String j2eeVersion;
- private boolean clientNeedEAR_;
-
- private String serviceServerFactoryId_;
- private String serviceServerInstanceId_;
-
- // WSDLSelectionWidget
- private boolean genWSIL;
- private String wsilURI;
-
- // WSDLSelectionConditionCommand
- private WebServicesParser webServicesParser;
-
- // WSDLSelectionTreeWidget
- private String wsdlURI;
-
- private boolean isClientScenario_;
- private boolean genProxy_ = true;
- private String launchedServiceTestName;
-
- //ServerDeployableConfigurationCommand
- private String serverInstId_;
-
- public ClientExtensionDefaultingCommand( boolean isClientScenario )
- {
- isClientScenario_ = isClientScenario;
- }
-
- /**
- *
- * @return returns true if this command is running in the client wizard and
- * false if this command is running in the create web service wizard.
- */
- public boolean getIsClientScenario()
- {
- return isClientScenario_;
- }
-
- /*
- public void setRuntime2ClientTypes( SelectionListChoices choices )
- {
- clientChoices_ = choices;
- }
-
-
- public SelectionListChoices getRuntime2ClientTypes()
- {
- return clientChoices_;
- }
- */
-
- public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
- {
- clientIds_ = ids;
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- if (clientIds_.getServerInstanceId()==null || clientIds_.getServerInstanceId().length()==0)
- {
- //Set the instance id from the service side if the factory ids match
- if (serviceServerInstanceId_!=null && serviceServerInstanceId_.length()>0)
- {
- if (serviceServerFactoryId_!=null && serviceServerFactoryId_.length()>0)
- {
- if (serviceServerFactoryId_.equals(clientIds_.getServerId()))
- {
- clientIds_.setServerInstanceId(serviceServerInstanceId_);
- }
- }
- }
- }
- return clientIds_;
- }
-
- public void setClientRuntimeId(String id)
- {
- clientRuntimeId_ = id;
- }
-
- public String getClientRuntimeId()
- {
- return clientRuntimeId_;
- }
-
- public void setServiceExistingServerInstId(String serverInstId) {
- this.serverInstId_ = serverInstId;
- }
-
- public String getServiceExistingServerInstId(){
- return this.serverInstId_;
- }
-
- /**
- * @return Returns the clientIsExistingServer.
- */
- public boolean isClientIsExistingServer()
- {
- return clientIds_.getServerInstanceId() != null;
- }
-
- /**
- * @return Returns the clientProject.
- */
- public String getClientProject()
- {
- //return clientProjectName_ + "/" + clientComponentName_;
- return clientProjectName_ + "/" + clientProjectName_;
- }
-
- /**
- * @return Returns the clientProjectEAR.
- */
- public String getClientProjectEAR()
- {
- if (clientEarProjectName_!=null && clientEarProjectName_.length()>0)
- {
- //return clientEarProjectName_ + "/" + clientEarComponentName_;
- return clientEarProjectName_ + "/" + clientEarProjectName_;
- }
- else
- {
- return "";
- }
- }
-
- /*
- private String getModuleProjectName( String projectName )
- {
- String result = "";
-
- if( projectName != null && !projectName.equals("") )
- {
- IPath projectPath = new Path( projectName );
- IProject project = (IProject)ResourceUtils.findResource( projectPath );
- String moduleName = J2EEUtils.getFirstWebModuleName( project );
-
- result = projectName + "/" + moduleName;
- }
-
- return result;
- }
- */
- /**
- * @return Returns the clientProjectType.
- */
-
- public String getClientProjectType()
- {
- //return clientChoices_.getChoice().getList().getSelection();
- return clientComponentType_;
- }
-
- /**
- * @return Returns the clientRuntime.
- */
- public String getClientRuntime()
- {
- return clientIds_.getRuntimeId();
- }
-
- /**
- * @return Returns the clientServer.
- */
- public String getClientServer()
- {
- return clientIds_.getServerId();
- }
-
- public String getClientServerInstance()
- {
- return clientIds_.getServerInstanceId();
- }
-
- public void setClientExistingServerInstanceId(String serverInstId){
-
- if (clientIds_.getServerInstanceId()==null)
- clientIds_.setServerInstanceId(serverInstId);
- }
-
- /**
- * @return Returns the genWSIL.
- */
- public boolean isGenWSIL()
- {
- return genWSIL;
- }
-
- /**
- * @param genWSIL
- * The genWSIL to set.
- */
- public void setGenWSIL(boolean genWSIL)
- {
- this.genWSIL = genWSIL;
- }
-
- /**
- * @return Returns the resourceContext.
- */
- public ResourceContext getResourceContext()
- {
- return resourceContext;
- }
-
- /**
- * @param resourceContext
- * The resourceContext to set.
- */
- public void setResourceContext(ResourceContext resourceContext)
- {
- this.resourceContext = resourceContext;
- }
-
- /**
- * @return Returns the testProxySelected.
- */
- public Boolean getTestService()
- {
- return testService;
- }
-
- /**
- * @param testProxySelected
- * The testProxySelected to set.
- */
- public void setTestService(Boolean testService)
- {
- this.testService = testService;
- }
-
- /**
- * @return Returns the wsdlURI.
- */
- public String getWsdlURI()
- {
- return wsdlURI;
- }
-
- /**
- * @param wsdlURI
- * The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- /**
- * @return Returns the wsilURI.
- */
- public String getWsilURI()
- {
- return wsilURI;
- }
-
- /**
- * @param wsilURI
- * The wsilURI to set.
- */
- public void setWsilURI(String wsilURI)
- {
- this.wsilURI = wsilURI;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser != null)
- return webServicesParser;
- else
- return new WebServicesParserExt();
- }
-
- /**
- * @param webServicesParser
- * The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- /**
- * @return Returns the j2eeVersion.
- */
- public String getClientJ2EEVersion()
- {
- return "14"; //rm j2ee
- }
-
- /**
- * @param version The j2eeVersion to set.
- */
- /*
- public void setClientJ2EEVersion(String version)
- {
- j2eeVersion = version;
- }
- */
- /**
- *
- * @return returns true if a proxy should be generated and false otherwise.
- */
- public boolean getGenerateProxy()
- {
- return genProxy_;
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- genProxy_ = genProxy;
- }
-
- public void setLaunchedServiceTestName(String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
-
- /**
- *
- * @return returns the name of the test facility to launch.
- */
- public String getLaunchedServiceTestName()
- {
- return launchedServiceTestName;
- }
-
- /**
- *
- * @return returns true if the client project needs an EAR project.
- */
- public boolean getClientNeedEAR()
- {
- return clientNeedEAR_;
- }
-
- public void setClientNeedEAR(boolean clientNeedEAR)
- {
- clientNeedEAR_ = clientNeedEAR;
- }
-
-
- public void setClientComponentType(String clientComponentType)
- {
- this.clientComponentType_ = clientComponentType;
- }
-
- public void setClientProjectName(String clientProjectName)
- {
- this.clientProjectName_ = clientProjectName;
- }
-
- /*
- public void setClientComponentName(String clientComponentName)
- {
- this.clientComponentName_ = clientComponentName;
- }
- */
-
- public void setClientEarProjectName(String clientEarProjectName)
- {
- this.clientEarProjectName_ = clientEarProjectName;
- }
-
- /*
- public void setClientEarComponentName(String clientEarComponentName)
- {
- this.clientEarComponentName_ = clientEarComponentName;
- }
- */
-
- public String getClientEarProjectName()
- {
- return clientEarProjectName_;
- }
-
- /*
- public String getClientEarComponentName()
- {
- return clientEarComponentName_;
- }
- */
-
- public void setServiceServerFactoryId(String id)
- {
- serviceServerFactoryId_ = id;
- }
-
- public void setServiceServerInstanceId(String id)
- {
- serviceServerInstanceId_ = id;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java
deleted file mode 100644
index 7fcd8b265..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java
+++ /dev/null
@@ -1,40 +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.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment;
-
-
-public class ClientExtensionFragment extends ExtensionFragment
-{
- public ClientExtensionFragment()
- {
- }
-
- protected ClientExtensionFragment( ClientExtensionFragment fragment )
- {
- super( fragment );
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } );
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#clone()
- */
- public Object clone()
- {
- return new ClientExtensionFragment( this );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
deleted file mode 100644
index 5923a9f98..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
+++ /dev/null
@@ -1,68 +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.ui.widgets.extensions;
-
-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.wsrt.IWebServiceClient;
-
-public class ClientExtensionOutputCommand extends AbstractDataModelOperation
-{
- private IWebServiceClient webServiceClient_;
-
- /**
- * @return Returns the proxyBean.
- */
-
- public String getProxyBean()
- {
- return webServiceClient_.getWebServiceClientInfo().getImplURL();
- }
-
- public boolean getGenerateProxy()
- {
- return true;
- }
-
- /**
- * @return Returns the setEndpointMethod.
- */
- public String getSetEndpointMethod()
- {
- return "setEndpoint";
- }
-
- public void setWebServiceClient(IWebServiceClient wsc)
- {
- webServiceClient_ = wsc;
- }
-
- public String getServerInstanceId()
- {
- return webServiceClient_.getWebServiceClientInfo().getServerInstanceId();
- }
-
- public String getServerFactoryId()
- {
- return webServiceClient_.getWebServiceClientInfo().getServerFactoryId();
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
deleted file mode 100644
index e4c064189..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,268 +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.ui.widgets.extensions;
-
-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.data.TypeRuntimeServer;
-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.WebServicesParser;
-
-
-public class ServerExtensionDefaultingCommand extends AbstractDataModelOperation
-{
- private Boolean startService;
- private Boolean testService;
- private Boolean publishService;
- private TypeRuntimeServer serviceIds_;
- private String serviceRuntimeId_;
- //private SelectionListChoices serviceChoices_;
- private String serviceProjectName_;
- private String serviceEarProjectName_;
- private String serviceComponentType_;
- //private String serviceComponentName_;
- //private String serviceEarComponentName_;
- //private String j2eeVersion;
- private boolean serviceNeedEAR_;
- private WebServicesParser wsdlParser_;
-
-
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
- {
- serviceIds_ = ids;
- }
-
- public void setServiceExistingServerInstanceId(String serverInstId){
-
- if (serviceIds_.getServerInstanceId()==null)
- serviceIds_.setServerInstanceId(serverInstId);
- }
-
- /**
- *
- * @return returns the TypeRuntimeService object that the user has selected on
- * page 3 of the wizard.
- */
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return serviceIds_;
- }
-
- public void setServiceRuntimeId(String id)
- {
- serviceRuntimeId_ = id;
- }
-
- public String getServiceRuntimeId()
- {
- return serviceRuntimeId_;
- }
-
- /*
- public void setServiceProject2EARProject(SelectionListChoices choices)
- {
- serviceChoices_ = choices;
- }
- */
-
- /**
- * @return Returns the publishService.
- */
- public Boolean getPublishService()
- {
- return publishService;
- }
-
- /**
- * @param publishService
- * The publishService to set.
- */
- public void setPublishService(Boolean publishService)
- {
- this.publishService = publishService;
- }
-
- /**
- * @return Returns the serverIsExistingServer.
- */
- public boolean getServerIsExistingServer()
- {
- return serviceIds_.getServerInstanceId() != null;
- }
-
- /**
-
- * @return Returns the serverInstanceId
- */
- public String getServiceServerInstanceId()
- {
- return serviceIds_.getServerInstanceId();
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serviceProjectName_ + "/" + serviceProjectName_;
- }
-
- /**
- * @return Returns the serverProjectEAR.
- */
- public String getServerProjectEAR()
- {
- if (serviceEarProjectName_!=null && serviceEarProjectName_.length()>0)
- {
- return serviceEarProjectName_ + "/" + serviceEarProjectName_;
- }
- else
- {
- return "";
- }
- }
-
- /**
- * @return Returns the serverRuntime.
- */
- public String getServerRuntime()
- {
- return serviceIds_.getRuntimeId();
- }
-
- /**
- * @return Returns the serverServer.
- */
- public String getServerServer()
- {
- return serviceIds_.getServerId();
- }
-
- /**
- * @return Returns the serviceScenarioId.
- */
- public String getServiceScenarioId()
- {
- return serviceIds_.getTypeId();
- }
-
- /**
- * @return Returns the startService.
- */
- public Boolean getStartService()
- {
- return startService;
- }
-
- /**
- * @param startService
- * The startService to set.
- */
- public void setStartService(Boolean startService)
- {
- this.startService = startService;
- }
-
- /**
- * @return Returns the testService.
- */
- public Boolean getTestService()
- {
- return testService;
- }
-
- /**
- * @param testService
- * The testService to set.
- */
- public void setTestService(Boolean testService)
- {
- this.testService = testService;
- }
-
- public Boolean getPublish()
- {
- return new Boolean(true);
- }
-
- /**
- * @return Returns the j2eeVersion.
- */
- public String getServiceJ2EEVersion()
- {
- return "14"; //rm j2ee
- }
-
- /**
- *
- * @return returns true if the web service project needs to be in an EAR project.
- */
- public boolean getServiceNeedEAR()
- {
- return serviceNeedEAR_;
- }
-
- public void setServiceNeedEAR(boolean serviceNeedEAR)
- {
- serviceNeedEAR_ = serviceNeedEAR;
- }
-
- /**
- * @return Returns the wsdlParser_.
- */
- public WebServicesParser getWebServicesParser()
- {
- if( wsdlParser_ == null )
- {
- wsdlParser_ = new WebServicesParserExt();
- }
-
- return wsdlParser_;
- }
- /**
- * @param wsdlParser_ The wsdlParser_ to set.
- */
- public void setWebServicesParser(WebServicesParser wsdlParser )
- {
- wsdlParser_ = wsdlParser;
- }
-
-
- public void setServiceProjectName(String serviceProjectName)
- {
- this.serviceProjectName_ = serviceProjectName;
- }
-
- public void setServiceEarProjectName(String serviceEarProjectName)
- {
- this.serviceEarProjectName_ = serviceEarProjectName;
- }
-
- public void setServiceComponentType(String type)
- {
- this.serviceComponentType_ = type;
- }
-
- public String getServiceComponentType()
- {
- return serviceComponentType_;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java
deleted file mode 100644
index 101cddece..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java
+++ /dev/null
@@ -1,41 +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.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment;
-
-
-public class ServerExtensionFragment extends ExtensionFragment
-{
- public ServerExtensionFragment()
- {
-
- }
-
- protected ServerExtensionFragment( ServerExtensionFragment fragment )
- {
- super( fragment );
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
- {
- setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } );
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#clone()
- */
- public Object clone()
- {
- return new ServerExtensionFragment( this );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java
deleted file mode 100644
index 1d84f039a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java
+++ /dev/null
@@ -1,115 +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.ui.widgets.extensions;
-
-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.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class ServerExtensionOutputCommand extends AbstractDataModelOperation
-{
- //private String wsdlURI_;
- private WebServicesParser wsdlParser_;
- private IWebService webService_;
-
- private boolean isWebProjectStartupRequested_ = false;
-
-
- /**
- * @return Returns the wsdlURI.
- */
- public String getWsdlURI()
- {
- return webService_.getWebServiceInfo().getWsdlURL();
- }
-
- /**
- * @param wsdlURI
- * The wsdlURI to set.
- */
- /*
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
- }
- */
-
- public void setWebService(IWebService ws)
- {
- webService_ = ws;
- }
-
- /**
- * @return Returns the wsdlParser_.
- */
- public WebServicesParser getWebServicesParser()
- {
- if( wsdlParser_ == null )
- {
- wsdlParser_ = new WebServicesParserExt();
- }
-
- return wsdlParser_;
- }
- /**
- * @param wsdlParser_ The wsdlParser_ to set.
- */
- public void setWebServicesParser(WebServicesParser wsdlParser_)
- {
- this.wsdlParser_ = wsdlParser_;
- }
-/**
- * @param earProjectName The earProjectName to set.
- */
-public void setEarProjectName(String earProjectName) {
-}
-/**
- * @param existingServerId The existingServerId to set.
- */
-public void setExistingServerId(String existingServerId) {
-}
-
-/**
- * @return Returns the isRestartProjectNeeded.
- */
-public boolean getIsWebProjectStartupRequested() {
- return isWebProjectStartupRequested_;
-}
-/**
- * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
- */
-public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
- this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
-}
-
-public String getServiceServerFactoryId()
-{
- return webService_.getWebServiceInfo().getServerFactoryId();
-}
-
-public String getServiceServerInstanceId()
-{
- return webService_.getWebServiceInfo().getServerInstanceId();
-}
-
-public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-{
- return Status.OK_STATUS;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
deleted file mode 100644
index cdb6e3b1f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
+++ /dev/null
@@ -1,45 +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.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-
-
-public abstract class AbstractObjectSelectionWidget extends SimpleWidgetDataContributor implements IObjectSelectionWidget
-{
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- // subclass should override this method
- }
-
- public IStructuredSelection getObjectSelection()
- {
- // subclass should override this method
- return new StructuredSelection();
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- // subclass should override this method
- return Status.OK_STATUS;
- }
-
- public IProject getProject()
- {
- // subclass should override this method
- return null;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java
deleted file mode 100644
index f6c35a6b0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.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.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class EJBSelectionTransformer implements Transformer
-{
-
- public Object transform(Object value)
- {
- if (value instanceof IStructuredSelection)
- {
- Object sel = ((IStructuredSelection)value).getFirstElement();
- if (sel instanceof EnterpriseBean)
- {
- return new StructuredSelection(((EnterpriseBean)sel).getName());
- }
- }
- return value;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
deleted file mode 100644
index 8f0afb67b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
+++ /dev/null
@@ -1,393 +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.ui.widgets.object;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.Session;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private Combo earList;
- private EJBTableViewer beanList;
- private IVirtualComponent[] earComponents;
- //rskejb private EARNatureRuntime[] earProjects;
- private Integer selectedBeanIndex = null;
- private Vector ejbBeanNames;
- private Vector ejbComponentNames;
- private Vector ejbComponentProjectNames;
- //rskejb private Vector ejbProjectNames;
- private Listener statusListener_;
- /* CONTEXT_ID PEBD0001 for the EAR Projects drop-down box */
- private String INFOPOP_PEBD_EAR_PROJECTS = "org.eclipse.jst.ws.consumption.ui.PEBD0001";
- /* CONTEXT_ID PEBD0002 for the table containing all of the bean names */
- private String INFOPOP_PEBD_TABLE_BEAN_NAMES = "org.eclipse.jst.ws.consumption.ui.PEBD0002";
-
- public EJBSelectionWidget()
- {
- earComponents = J2EEUtils.getAllEARComponents();
- /* rskejb
- IProject[] projects = J2EEUtils.getEARProjects();
-
-
- Vector earVector = new Vector();
- for (int i = 0; i < projects.length; i++)
- {
- try
- {
- earVector.add(projects[i].getNature(IEARNatureConstants.NATURE_ID));
- }
- catch (CoreException ce)
- {
- }
- }
- earProjects = (EARNatureRuntime[]) earVector.toArray(new EARNatureRuntime[0]);
- rskejb */
- }
-
- public String getSelectedBean()
- {
- if (selectedBeanIndex != null)
- {
- return (String) (ejbBeanNames.elementAt(selectedBeanIndex.intValue()));
- }
- return null;
- }
-
- public String getSelectedProject()
- {
- if (selectedBeanIndex != null)
- {
- return (String) (ejbComponentProjectNames.elementAt(selectedBeanIndex.intValue()));
- }
- return null;
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
- statusListener_ = statusListener;
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayout(layout);
- composite.setLayoutData(gd);
- Composite projectComposite = new Composite(composite, SWT.NONE);
- layout = new GridLayout();
- layout.numColumns = 2;
- projectComposite.setLayout(layout);
- projectComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
- new Label(projectComposite, SWT.NULL).setText(msgUtils.getMessage("LABEL_EAR_PROJECTS"));
- earList = new Combo(projectComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
- earList.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- earList.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent evt)
- {
- Combo widget = (Combo) (evt.widget);
- setBeanList(earComponents[widget.getSelectionIndex()]);
- selectedBeanIndex = null;
- statusListener_.handleEvent(null);
- }
- });
- addEARNamesToList();
- earList.setToolTipText(msgUtils.getMessage("TOOLTIP_EAR_PROJECTS"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(earList, INFOPOP_PEBD_EAR_PROJECTS);
- Group beanComposite = new Group(composite, SWT.NONE);
- layout = new GridLayout();
- beanComposite.setLayout(layout);
- beanComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
- beanComposite.setText(msgUtils.getMessage("LABEL_EJB_BEAN_NAME"));
- beanList = new EJBTableViewer(beanComposite);
- Table beanTable = beanList.getTable();
- gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- gd.heightHint = 100;
- beanTable.setLayoutData(gd);
- beanTable.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent evt)
- {
- Table table = (Table) (evt.widget);
- selectedBeanIndex = new Integer(table.getSelectionIndex());
- statusListener_.handleEvent(null);
- }
- });
- beanTable.setToolTipText(msgUtils.getMessage("TOOLTIP_TABLE_BEAN_NAMES"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(beanTable, INFOPOP_PEBD_TABLE_BEAN_NAMES);
- if (earComponents != null && earComponents.length > 0)
- {
- setBeanList(earComponents[0]);
- }
- beanTable.getColumn(0).pack();
- beanTable.getColumn(1).pack();
- // This is a dummy label that forces the status label into the second
- // column.
- new Label(composite, SWT.NULL).setText("");
- return this;
- }
-
- private void addEARNamesToList()
- {
- if (earComponents != null && earComponents.length > 0)
- {
- for (int index = 0; index < earComponents.length; index++)
- {
- earList.add(earComponents[index].getName());
- }
- earList.setText(earList.getItem(0));
- }
- }
-
- private void setBeanList(IVirtualComponent earComponent)
- {
- IVirtualComponent[] ejbComponentsArray = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponent.getProject());
- Table beanTable = beanList.getTable();
- beanTable.removeAll();
- ejbBeanNames = new Vector();
- ejbComponentNames = new Vector();
- ejbComponentProjectNames = new Vector();
- for (int index = 0; index < ejbComponentsArray.length; index++)
- {
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponentsArray[index]);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- EJBJar jar = ejbRes.getEJBJar();
- Vector beans = J2EEUtils.getBeanNames(jar);
- String componentName = ejbComponentsArray[index].getName();
- String projectName = ejbComponentsArray[index].getProject().getName();
- ejbBeanNames.addAll(beans);
- ejbComponentNames.addAll(Collections.nCopies(beans.size(), componentName));
- ejbComponentProjectNames.addAll(Collections.nCopies(beans.size(), projectName));
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- beanList.setData(ejbBeanNames, ejbComponentNames);
- beanList.setInput(ejbBeanNames);
-
- }
-
- /*
- * @deprecated
- */
- /*
- private void setBeanList(EARNatureRuntime earProject)
- {
- Vector ejbProjects = J2EEUtils.getEJBProjects(earProject);
- Table beanTable = beanList.getTable();
- beanTable.removeAll();
- ejbBeanNames = new Vector();
- //rskejb ejbProjectNames = new Vector();
- ejbComponentNames = new Vector();
- ejbComponents = new Vector();
- for (int index = 0; index < ejbProjects.size(); index++)
- {
- EJBNatureRuntime ejbNature = (EJBNatureRuntime) (ejbProjects.elementAt(index));
- EJBProjectResources ejbResource = new EJBProjectResources(ejbNature.getProject());
- EJBJar jar = ejbResource.getEJBJar();
- Vector beans = J2EEUtils.getBeanNames(jar);
- String projectName = ejbNature.getProject().getName();
- ejbBeanNames.addAll(beans);
- ejbProjectNames.addAll(Collections.nCopies(beans.size(), projectName));
- ejbResource.cleanup();
- }
- beanList.setData(ejbBeanNames, ejbProjectNames);
- beanList.setInput(ejbBeanNames);
- }
- */
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object object = initialSelection.getFirstElement();
- if (object instanceof Session)
- {
- Session session = (Session) object;
- EJBJar jar = session.getEjbJar();
- if (jar != null)
- {
- for (int i = 0; i < earComponents.length; i++)
- {
- IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponents[i].getProject());
- for (int j=0; j <ejbComponents.length; j++)
- {
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[j]);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- if (ejbRes.getEJBJar() == jar)
- {
- earList.setText(earComponents[i].getName());
- setBeanList(earComponents[i]);
- beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
- selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
- return;
- }
-
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
-
- }
- /* rskejb
- Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[i]);
- for (Iterator it = ejbProjects.iterator(); it.hasNext();)
- {
- EJBProjectResources ejbResource = new EJBProjectResources(((EJBNatureRuntime) it.next()).getProject());
- if (ejbResource.getEJBJar() == jar)
- {
- earList.setText(earProjects[i].getProject().getName());
- setBeanList(earProjects[i]);
- beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
- selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
- ejbResource.cleanup();
- return;
- }
- ejbResource.cleanup();
- }
- rskejb */
- }
- }
- }
- }
- }
-
- public IStructuredSelection getObjectSelection()
- {
- IStructuredSelection sel = (IStructuredSelection) beanList.getSelection();
- if (sel != null && !sel.isEmpty())
- {
- Object object = sel.getFirstElement();
- if (object instanceof Integer)
- {
- String selEJBName = (String) ejbBeanNames.get(((Integer) object).intValue());
- if (selEJBName != null)
- {
- IProject project = earComponents[earList.getSelectionIndex()].getProject();
- IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(project);
- for (int i=0; i<ejbComponents.length; i++)
- {
- EJBArtifactEdit ejbEdit = null;
- try
- {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[i]);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- EJBJar jar = ejbRes.getEJBJar();
- java.util.List sessions = jar.getSessionBeans();
- for (Iterator it2 = sessions.iterator(); it2.hasNext();)
- {
- Session session = (Session) it2.next();
- if (selEJBName.equals(session.getName()))
- {
- return new StructuredSelection(new Session[]{session});
- }
- }
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- /* rskejb
- Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[earList.getSelectionIndex()]);
- for (Iterator it = ejbProjects.iterator(); it.hasNext();)
- {
- EJBProjectResources ejbResource = new EJBProjectResources(((EJBNatureRuntime) it.next()).getProject());
- EJBJar jar = ejbResource.getEJBJar();
- java.util.List sessions = jar.getSessionBeans();
- for (Iterator it2 = sessions.iterator(); it2.hasNext();)
- {
- Session session = (Session) it2.next();
- if (selEJBName.equals(session.getName()))
- {
- ejbResource.cleanup();
- return new StructuredSelection(new Session[]{session});
- }
- }
- ejbResource.cleanup();
- }
- rskejb */
- }
- }
- }
- return new StructuredSelection(new Object[0]);
- }
-
- public IProject getProject()
- {
- String projectName = getSelectedProject();
- if (projectName != null && projectName.length() > 0)
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- else
- return null;
- }
-
- public String getComponentName()
- {
- if (selectedBeanIndex != null)
- {
- return (String) (ejbComponentNames.elementAt(selectedBeanIndex.intValue()));
- }
- return null;
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- return Status.OK_STATUS;
- }
-
- public IStatus getStatus()
- {
- if (selectedBeanIndex == null)
- {
- return StatusUtils.errorStatus( "" );
- }
-
- return Status.OK_STATUS;
- }
-
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java
deleted file mode 100644
index a84268ab9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java
+++ /dev/null
@@ -1,116 +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.ui.widgets.object;
-
-import java.util.Vector;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-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.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-public class EJBTableViewer extends TableViewer
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private Vector beanNames;
- private Vector projectNames;
-
- public EJBTableViewer(Composite parent)
- {
- super(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- String columnProperties[] = {msgUtils.getMessage("TABLE_TITLE_EJB_BEAN_NAMES"), msgUtils.getMessage("TABLE_TITLE_EJB_PROJECT_NAME")};
- Table table = getTable();
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- for (int i = 0; i < columnProperties.length; i++)
- {
- TableColumn column = new TableColumn(table, i);
- column.setText(columnProperties[i]);
- column.setAlignment(SWT.LEFT);
- layout.addColumnData(new ColumnWeightData(50, 80, true));
- }
- table.setLayout(layout);
- setColumnProperties(columnProperties);
- setContentProvider(new EJBContentProvider());
- setLabelProvider(new EJBLabelProvider());
- }
-
- public void setData(Vector beanNames, Vector projectNames)
- {
- this.beanNames = beanNames;
- this.projectNames = projectNames;
- }
- private class EJBLabelProvider extends LabelProvider implements ITableLabelProvider
- {
- public String getColumnText(Object object, int columnIndex)
- {
- String result = null;
- if (object instanceof Integer)
- {
- int index = ((Integer) object).intValue();
- if (columnIndex == 0)
- {
- return (String) (beanNames.elementAt(index));
- }
- else if (columnIndex == 1)
- {
- return (String) (projectNames.elementAt(index));
- }
- }
- return result;
- }
-
- public Image getColumnImage(Object object, int columnIndex)
- {
- return null;
- }
- }
- public class EJBContentProvider implements IStructuredContentProvider
- {
- public Object[] getElements(Object element)
- {
- if (beanNames != null)
- {
- int size = beanNames.size();
- Object[] result = new Object[size];
- for (int index = 0; index < size; index++)
- {
- result[index] = new Integer(index);
- }
- return result;
- }
- return null;
- }
-
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object old, Object newobj)
- {
- }
-
- public boolean isDeleted(Object object)
- {
- return false;
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
deleted file mode 100644
index a7be6f437..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
+++ /dev/null
@@ -1,114 +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.ui.widgets.object;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-
-
-
-public class HandlerTableItem {
-
- private String handlerClassName;
- private String handlerName;
- private String portName;
- private int index;
-
- private PortComponent port;
- private Object handler;
- private Object wsDescRef;
-
- /**
- * @return Returns the handlerClassName.
- */
- public String getHandlerClassName() {
- return handlerClassName;
- }
- /**
- * @param handlerClassName The handlerClassName to set.
- */
- public void setHandlerClassName(String handlerClassName) {
- this.handlerClassName = handlerClassName;
- }
- /**
- * @return Returns the handlerName.
- */
- public String getHandlerName() {
- return handlerName;
- }
- /**
- * @param handlerName The handlerName to set.
- */
- public void setHandlerName(String handlerName) {
- this.handlerName = handlerName;
- }
- /**
- * @return Returns the port.
- */
- public PortComponent getPort() {
- return port;
- }
- /**
- * @param port The port to set.
- */
- public void setPort(PortComponent port) {
- this.port = port;
- }
- /**
- * @return Returns the handler.
- */
- public Object getHandler() {
- return handler;
- }
- /**
- * @param handler The handler to set.
- */
- public void setHandler(Object handler) {
- this.handler = handler;
- }
- /**
- * @return Returns the portName.
- */
- public String getPortName() {
- return portName;
- }
- /**
- * @param portName The portName to set.
- */
- public void setPortName(String portName) {
- this.portName = portName;
- }
-
- /**
- * @return Returns the index.
- */
- public int getIndex() {
- return index;
- }
- /**
- * @param index The index to set.
- */
- public void setIndex(int index) {
- this.index = index;
- }
- /**
- * @return Returns the wsDescRef.
- */
- public Object getWsDescRef() {
- return wsDescRef;
- }
- /**
- * @param wsDescRef The wsDescRef to set.
- */
- public void setWsDescRef(Object wsDescRef) {
- this.wsDescRef = wsDescRef;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
deleted file mode 100644
index 1383a1781..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
+++ /dev/null
@@ -1,70 +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.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor;
-
-/**
- * This interface defines extra methods that Object Selection Widgets
- * need to implement. Object Selection Widgets are displayed on page 2
- * of the Web services wizard.
- */
-public interface IObjectSelectionWidget extends WidgetDataContributor
-{
- /**
- * The framework will call this method to set the initial selection
- * value that the user has specified.
- *
- * @param initialSelection the initial selection the user specified.
- */
- public void setInitialSelection(IStructuredSelection initialSelection);
-
- /**
- * The intent of the Object Selection Widget is that the user has
- * the opportunity change/find the object that they want to turn into
- * a Web service.
- *
- * @return returns the an IStructuredSelection object that the user
- * want to turn into a Web service. This object may be different than
- * the initialSelection passed in by the setInitialSelection method.
- */
- public IStructuredSelection getObjectSelection();
-
- /**
- * Validates whether the objectSelection parameter is valid for
- * this Object selection widget. An error status should be returned
- * if this object is not value. Otherwise, and ok status should be
- * returned
- *
- * @param objectSelection the object to be validated.
- * @return the status of the validation.
- */
- public IStatus validateSelection(IStructuredSelection objectSelection);
-
- /**
- *
- * @return returns the IProject that contains the selection
- * object that the user has chosen with this widget. The value can be
- * null if there is no IProject for this object.
- */
- public IProject getProject();
-
- /**
- *
- * @return returns the name of the IVirtualComponent that contains the selection
- * object that the user has chosen with this widget. The value can be
- * null if there is no IVirtualComponent for this object
- */
- public String getComponentName();
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
deleted file mode 100644
index 7a9335831..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
+++ /dev/null
@@ -1,56 +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.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class JavaBeanSelectionTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- if (value instanceof IStructuredSelection)
- {
- Object sel = ((IStructuredSelection)value).getFirstElement();
- if (sel instanceof IFile)
- {
- return new StructuredSelection(computeFullyQualifiedJavaName((IFile)sel));
- }
- else if (sel instanceof ICompilationUnit)
- {
- IResource res = ((ICompilationUnit)sel).getResource();
- if (res instanceof IFile)
- return new StructuredSelection(computeFullyQualifiedJavaName((IFile)res));
- }
- }
- return value;
- }
-
- private String computeFullyQualifiedJavaName(IFile resource)
- {
- IPath path = resource.getFullPath();
- String basename = path.lastSegment();
- String beanClass = "";
- if (basename != null && basename.length() > 0)
- {
- String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
- beanClass = (beanPackage == null || beanPackage.length() == 0 ? basename : (beanPackage + "." + basename));
- if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class"))
- beanClass = beanClass.substring(0, beanClass.lastIndexOf('.'));
- }
- return beanClass;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
deleted file mode 100644
index 476b7d876..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
+++ /dev/null
@@ -1,278 +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.ui.widgets.object;
-
-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.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-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.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaBeanSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private IProject serverProject_ = null;
- private String serverComponentName_ = null;
- private Composite parent_ = null;
- private JavaResourceFilter filter_ = new JavaResourceFilter();
- private IResource initialResource_ = null;
- private Listener statusListener;
-
- /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/
- private String INFOPOP_PBCL_PAGE = "PBCL0001";
-
- private Text beanClassText_;
- /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/
- private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002";
-
- private Button beanClassBrowseButton_;
- /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
- private Button beanResourceBrowseButton_;
- /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004";
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- this.statusListener = statusListener;
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
-
- parent_ = parent;
-
- Composite group = uiUtils.createComposite( parent, 4 );
-
- group.setToolTipText( msgUtils.getMessage("TOOLTIP_PBCL_PAGE") );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-
- beanClassText_ = uiUtils.createText( group, "LABEL_BEAN_CLASS_NAME",
- "TOOLTIP_PBCL_TEXT_BEAN_CLASS",
- INFOPOP_PBCL_TEXT_BEAN_CLASS,
- SWT.SINGLE | SWT.BORDER);
- beanClassText_.addModifyListener(
- new ModifyListener()
- {
- public void modifyText(ModifyEvent e)
- {
- handleModifyBeanClassText();
- }
- }
- );
-
- beanClassBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_CLASSES",
- "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
- INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
- beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseClasses();
- }
- } );
-
- beanResourceBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_FILES",
- "TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE",
- INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE );
- beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseFiles();
- }
- } );
- return this;
- }
-
- private void handleModifyBeanClassText()
- {
- statusListener.handleEvent(null);
- serverProject_ = null;
- serverComponentName_ = null;
- }
-
- private void handleBrowseClasses()
- {
- Shell shell = parent_.getShell();
- IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
- if (itype != null)
- {
- beanClassText_.setText(itype.getFullyQualifiedName());
- try
- {
- IResource res = itype.getCorrespondingResource();
- if (res != null)
- {
- serverProject_ = res.getProject();
- IVirtualComponent comp = ResourceUtils.getComponentOf(res);
- if (comp!=null)
- {
- serverComponentName_ = comp.getName();
- }
- }
- else
- {
- serverProject_ = null;
- serverComponentName_ = null;
- }
- }
- catch (JavaModelException jme)
- {
- serverProject_ = null;
- serverComponentName_ = null;
- }
- }
- }
-
- private void handleBrowseFiles()
- {
- IResource topResource = ResourceUtils.getWorkspaceRoot();
- IResource resource = DialogUtils.browseResources( parent_.getShell(), topResource, initialResource_, filter_ );
- setBeanClass(resource);
- }
-
- private void setBeanClass(IResource resource)
- {
- if( resource != null && resource instanceof IFile )
- {
- IPath path = resource.getFullPath();
- String basename = path.lastSegment();
-
- if( basename != null && basename.length() > 0 )
- {
- String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
- String beanClass = (beanPackage == null || beanPackage.length() == 0 ? basename : (beanPackage + "." + basename));
-
- if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
- {
- beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
- }
-
- beanClassText_.setText(beanClass);
- serverProject_ = ResourceUtils.getProjectOf(path);
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-
- if (comp!=null)
- {
- serverComponentName_ = comp.getName();
- }
-
- }
- }
- }
-
- private void setBeanClass(ServiceImplBeanImpl serviceImpl)
- {
- if( serviceImpl != null )
- {
- EObject eObject = serviceImpl.eContainer();
- if(eObject instanceof PortComponentImpl){
- PortComponentImpl pci = (PortComponentImpl)eObject;
- String beanClass = pci.getServiceEndpointInterface();
- beanClassText_.setText(beanClass);
- }
- }
- }
-
- private void setBeanClass(BeanLink serviceImpl)
- {
- if( serviceImpl != null )
- {
- EObject eObject = serviceImpl.eContainer();
- if(eObject instanceof ServiceImplBeanImpl){
- setBeanClass((ServiceImplBeanImpl)eObject);
- }
- }
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object object = initialSelection.getFirstElement();
- if (object instanceof IFile)
- {
- IFile iFile = (IFile)object;
- String fileExt = iFile.getFileExtension().toLowerCase();
- if (fileExt.equals("java") || fileExt.equals("class"))
- setBeanClass(iFile);
- }
- else if (object instanceof ICompilationUnit)
- setBeanClass(((ICompilationUnit)object).getResource());
- else if (object instanceof ServiceImplBeanImpl)
- setBeanClass((ServiceImplBeanImpl)object);
- else if(object instanceof BeanLink)
- setBeanClass((BeanLink)object);
- }
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return new StructuredSelection(beanClassText_.getText());
- }
-
- public IProject getProject()
- {
- return serverProject_;
- }
-
- public String getComponentName()
- {
- return serverComponentName_;
- }
-
- public IStatus getStatus()
- {
- String beanClassName = beanClassText_.getText().trim();
- if (beanClassName == null || beanClassName.length() <= 0)
- {
- MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
- return StatusUtils.errorStatus( msgUtils.getMessage("PAGE_MSG_BEAN_CANNOT_BE_EMPTY") );
- }
- return Status.OK_STATUS;
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- return Status.OK_STATUS;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java
deleted file mode 100644
index a889d944a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java
+++ /dev/null
@@ -1,92 +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.ui.widgets.object;
-
-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.data.TypeRuntimeServer;
-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;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionFragment extends SequenceFragment implements Condition
-{
- private TypeRuntimeServer typeRuntimeServer;
- private boolean hasObjectSelectionWidget;
-
- public ObjectSelectionFragment()
- {
- super();
- BooleanFragment boolFragment = new BooleanFragment(new SimpleFragment("ObjectSelectionWidget"), new SimpleFragment(""), this);
- add(boolFragment);
- add(new SimpleFragment(new ObjectSelectionOutputCommand(), ""));
- hasObjectSelectionWidget = false;
- }
-
- /**
- * This method is called retrieve the data mappings for this command fragment.
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionWidget.class );
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionOutputCommand.class, "ObjectSelection", null);
- dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionWidget.class);
- dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionOutputCommand.class);
-
- dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", ObjectSelectionOutputCommand.class);
- dataRegistry.addMapping(ObjectSelectionWidget.class, "Project", ObjectSelectionOutputCommand.class);
- dataRegistry.addMapping(ObjectSelectionWidget.class, "ComponentName", ObjectSelectionOutputCommand.class);
- }
-
- public boolean evaluate()
- {
- return hasObjectSelectionWidget;
- }
-
- public TypeRuntimeServer getTypeRuntimeServer()
- {
- return typeRuntimeServer;
- }
-
- /**
- * @param typeRuntimeServer The typeRuntimeServer to set.
- */
- public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
- {
- this.typeRuntimeServer = typeRuntimeServer;
- if (typeRuntimeServer != null)
- {
- String wst = typeRuntimeServer.getTypeId();
-
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
- if (scenario == WebServiceScenario.TOPDOWN)
- {
- //Must have WSDL object selection. No choice.
- hasObjectSelectionWidget=true;
- }
- else
- {
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
- if (wsimpl!=null)
- {
- String objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
- hasObjectSelectionWidget = objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0;
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
deleted file mode 100644
index 3899686a6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
+++ /dev/null
@@ -1,270 +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.ui.widgets.object;
-
-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.IConfigurationElement;
-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.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-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.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionOutputCommand extends AbstractDataModelOperation
-{
- private String objectSelectionWidgetId_;
- private IStructuredSelection objectSelection_;
- private IObjectSelectionWidget objectSelectionWidget_;
- private IProject project_;
- private String componentName_;
- private WebServicesParser parser_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- // Transformation
- if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0)
- {
- IConfigurationElement[] elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- if (objectSelectionWidgetId_.equals(elements[i].getAttribute("id")))
- {
- String transformerId = elements[i].getAttribute("transformer");
- if (transformerId != null && transformerId.length() > 0)
- {
- try
- {
- Object transformer = elements[i].createExecutableExtension("transformer");
- if (transformer instanceof Transformer)
- {
- Object transformedSelection = ((Transformer)transformer).transform(objectSelection_);
- if (transformedSelection instanceof IStructuredSelection)
- objectSelection_ = (IStructuredSelection)transformedSelection;
- }
- }
- catch (CoreException ce)
- {
- }
- }
- }
- }
- }
-
- // Validation
- IStatus status = (objectSelectionWidget_ != null) ? objectSelectionWidget_.validateSelection(getObjectSelection()) : Status.OK_STATUS;
- if (status.getSeverity() != Status.OK)
- {
- try
- {
- env.getStatusHandler().report(status);
- }
- catch (StatusException se)
- {
- }
- }
-
- return status;
- }
-
- /**
- * @param typeRuntimeServer The typeRuntimeServer to set.
- */
- public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
- {
- if (typeRuntimeServer != null)
- {
- String wst = typeRuntimeServer.getTypeId();
-
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
-
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
- //IWebServiceType wst = WebServiceRuntimeExtensionUtils2.getWebServiceTypeById(typeRuntimeServer.getTypeId());
-
- 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();
- }
-
- objectSelectionWidgetId_ = objectSelectionWidgetId;
-
- if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0)
- {
- IConfigurationElement[] elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- if (objectSelectionWidgetId_.equals(elements[i].getAttribute("id")))
- {
- try
- {
- Object object = elements[i].createExecutableExtension("class");
- if (object instanceof IObjectSelectionWidget)
- {
- objectSelectionWidget_ = (IObjectSelectionWidget)object;
- return;
- }
- }
- catch (CoreException ce)
- {
- }
- }
- }
- }
- }
- }
- }
-
- /**
- * @return Returns the selection.
- */
- public IStructuredSelection getObjectSelection()
- {
- return objectSelection_;
- }
- /**
- * @param selection The selection to set.
- */
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- objectSelection_ = objectSelection;
-
- //Set the project if you can
- if (project_==null)
- {
- project_ = getProjectFromObjectSelection(objectSelection);
- }
-
- //Set the componentName if you can
- if (componentName_ == null)
- {
- componentName_ = getComponentNameFromObjectSelection(objectSelection);
- }
-
- // Check if this is a WSDL selection object. If it is we need
- // to unwrap it.
- if( objectSelection != null && !objectSelection.isEmpty() )
- {
- Object object = objectSelection.getFirstElement();
-
- if( object instanceof WSDLSelectionWrapper )
- {
- WSDLSelectionWrapper wsdlWrapper = (WSDLSelectionWrapper)object;
-
- objectSelection_ = wsdlWrapper.wsdlSelection;
- parser_ = wsdlWrapper.parser;
- }
- }
- }
-
- public IProject getProject()
- {
- return project_;
- }
-
- public void setProject(IProject project)
- {
- this.project_ = project;
- }
-
- public String getComponentName()
- {
- return componentName_;
- }
-
- public void setComponentName(String componentName)
- {
- this.componentName_ = componentName;
- }
-
- /**
- * @return Returns the parser_.
- */
- public WebServicesParser getWebServicesParser()
- {
- return parser_;
- }
-
- 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)
- {
- e.printStackTrace();
- return null;
- }
- }
- }
- return null;
- }
-
- private String getComponentNameFromObjectSelection(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;
-
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-
- if (comp!=null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- e.printStackTrace();
- return null;
- }
- }
- }
- return null;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
deleted file mode 100644
index 8cdbd641b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
+++ /dev/null
@@ -1,37 +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.ui.widgets.object;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-
-public class ObjectSelectionRegistry
-{
- private static ObjectSelectionRegistry instance;
- private static IConfigurationElement[] elements;
-
- private ObjectSelectionRegistry()
- {
- elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "objectSelectionWidget");
- }
-
- public static ObjectSelectionRegistry getInstance()
- {
- if (instance == null)
- instance = new ObjectSelectionRegistry();
- return instance;
- }
-
- public IConfigurationElement[] getConfigurationElements()
- {
- return elements;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
deleted file mode 100644
index 25a07a015..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
+++ /dev/null
@@ -1,233 +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.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-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.wsrt.WebServiceImpl;
-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.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
- private IConfigurationElement[] elements;
- private Composite parent;
- private Listener statusListener;
- private Composite composite;
- private IStructuredSelection initialSelection;
- private IProject project;
- private String componentName;
- private IObjectSelectionWidget child;
-
- public WidgetDataEvents addControls(Composite parentComposite, Listener statListener)
- {
- elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
- this.parent = parentComposite;
- this.statusListener = statListener;
- composite = null;
- return this;
- }
-
- /**
- * @param typeRuntimeServer The typeRuntimeServer to set.
- */
- public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
- {
- if (composite != null)
- {
- composite.dispose();
- child = null;
- }
- if (typeRuntimeServer != null)
- {
- String wst = typeRuntimeServer.getTypeId();
- int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
-
- //IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId());
- 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();
- }
-
- if (objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0)
- {
- for (int i = 0; i < elements.length; i++)
- {
- if (objectSelectionWidgetId.equals(elements[i].getAttribute("id")))
- {
- try
- {
- Object object = elements[i].createExecutableExtension("class");
- if (object instanceof IObjectSelectionWidget)
- {
- Control shell = parent.getShell();
- int x = shell.getSize().x;
- composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayout(gl);
- composite.setLayoutData(gd);
- child = (IObjectSelectionWidget)object;
- child.addControls(composite, statusListener);
- child.setInitialSelection(initialSelection);
- composite.setSize(x-20, composite.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
- parent.setSize(x-10, parent.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
- shell.setSize(x, shell.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
- shell.setRedraw(true);
- shell.redraw();
- shell.update();
- return;
- }
- }
- catch (CoreException ce)
- {
- }
- }
- }
- }
- }
- }
- }
-
- public IStatus getStatus()
- {
- return (child != null) ? child.getStatus() : Status.OK_STATUS;
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- this.initialSelection = initialSelection;
- project = getProjectFromInitialSelection(initialSelection);
- componentName = getComponentNameFromInitialSelection(initialSelection);
- if (child != null)
- child.setInitialSelection(initialSelection);
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return (child != null) ? child.getObjectSelection() : null;
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- return (child != null) ? child.validateSelection(objectSelection) : Status.OK_STATUS;
- }
-
- public IProject getProject()
- {
- if (child != null)
- {
- IProject p = child.getProject();
- if (p != null)
- return p;
- else
- return project;
- }
- else
- {
- return null;
- }
- }
-
- public String getComponentName()
- {
- if (child != null)
- {
- String cname = child.getComponentName();
- if (cname != null && cname.length()>0)
- return cname;
- else
- return componentName;
- }
- else
- {
- return null;
- }
-
- }
-
- private IProject getProjectFromInitialSelection(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;
- }
-
- private String getComponentNameFromInitialSelection(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;
-
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
- if (comp != null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
deleted file mode 100644
index 4db0a341c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
+++ /dev/null
@@ -1,71 +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.ui.widgets.object;
-
-import java.util.Calendar;
-import org.eclipse.swt.widgets.Display;
-
-public class Timer extends Thread
-{
- private static Timer instance = null;
- private final long ONE_SECOND = 1000;
- private long refreshTime;
- private Display display;
- private Runnable runnable;
-
- private Timer(Display display, Runnable runnable)
- {
- this.display = display;
- this.runnable = runnable;
- }
-
- public synchronized static Timer newInstance(Display display, Runnable runnable)
- {
- if (instance == null)
- instance = new Timer(display, runnable);
- return instance;
- }
-
- public synchronized static boolean isRunning()
- {
- return instance != null;
- }
-
- public synchronized void startTimer()
- {
- refreshTime = getCurrentTime() + ONE_SECOND;
- if (!isAlive())
- this.start();
- }
-
- private long getCurrentTime()
- {
- return Calendar.getInstance().getTime().getTime();
- }
-
- public void run()
- {
- long currTime = getCurrentTime();
- while (currTime < refreshTime)
- {
- try
- {
- sleep(refreshTime - currTime);
- }
- catch (InterruptedException ie)
- {
- }
- currTime = getCurrentTime();
- }
- instance = null;
- display.syncExec(runnable);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java
deleted file mode 100644
index e27ee08da..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java
+++ /dev/null
@@ -1,88 +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.ui.widgets.object;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLValidator;
-
-
-
-public class ValidateWSDLJob extends Job {
-
- final public static String VALIDATE_WSDL_JOB_FAMILY = "ValidateWSDLJobJamily";
-
- private String wsdlURI_ = null;
- private IValidationMessage[] validationMessages_ = null;
- private int validationMessageSeverity_ = -1; // default value
-
- public ValidateWSDLJob(String wsdlURI) {
- super("ValidateWSDLJob");
- wsdlURI_ = wsdlURI;
- }
-
- protected IStatus run(IProgressMonitor monitor) {
- WSDLValidator wsdlValidator = WSDLValidator.getInstance();
- IValidationReport valReport = wsdlValidator.validate(wsdlURI_);
- validationMessages_ = valReport.getValidationMessages();
- reportSummary();
- return Status.OK_STATUS;
- }
-
- // calculate the higher severity for all the validation messages
- private void reportSummary() {
- int i;
- int severity;
- int errorCount = 0;
- int warningCount = 0;
- for (i=0; i<validationMessages_.length && errorCount == 0; i++) {
- severity = validationMessages_[i].getSeverity();
- switch (severity) {
- case IValidationMessage.SEV_ERROR:
- errorCount++;
- break;
- case IValidationMessage.SEV_WARNING:
- warningCount++;
- break;
- default:
- break;
- }
- }
- if (errorCount > 0) {
- validationMessageSeverity_ = IValidationMessage.SEV_ERROR;
- } else if (warningCount > 0) {
- validationMessageSeverity_ = IValidationMessage.SEV_WARNING;
- }
-
- }
-
- public boolean belongsTo(Object family)
- {
- return family == VALIDATE_WSDL_JOB_FAMILY;
- }
-
- public IValidationMessage[] getValidationMessages() {
- return validationMessages_;
- }
-
- public int getValidationMessageSeverity() {
- return validationMessageSeverity_;
- }
-
- public String getWsdlURI() {
- return wsdlURI_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java
deleted file mode 100644
index e902b450a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java
+++ /dev/null
@@ -1,238 +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.ui.widgets.object;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-
-
-public class ValidationMessageViewerWidget extends SimpleWidgetDataContributor
-{
- private int DEFAULT_TABLE_HEIGHT_HINT = 100;
- private TableViewer tableViewer_;
- private MessageUtils msgUtils_;
- private Table table_;
- private String message = null;
- static final String columns_[] = {"severity", "line", "column", "message"};
- static final int columnsWidth_[] = {10, 10, 10, 60};
-
-
-
- public ValidationMessageViewerWidget()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
-
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- composite.setLayout(gl);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Label messageLabel = new Label( composite, SWT.WRAP);
- messageLabel.setText( msgUtils_.getMessage("LABEL_VALIDATE_MESSAGES"));
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- messageLabel.setLayoutData(gd);
- messageLabel.setToolTipText( msgUtils_.getMessage("TOOLTIP_VALIDATE_TEXT_MESSAGE") );
-
- table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
- table_.setLayoutData(gd);
- table_.setHeaderVisible(true);
- table_.setLinesVisible(true);
- table_.setToolTipText(msgUtils_.getMessage("TOOLTIP_TABLE_VALIDATE_MESSAGE") );
- TableLayout tableLayout = new TableLayout();
- for (int i = 0; i < columns_.length; i++)
- {
- TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
- tableColumn.setText(columns_[i]);
- tableColumn.pack();
- ColumnWeightData columnData = new ColumnWeightData(columnsWidth_[i], columnsWidth_[i], true);
- tableLayout.addColumnData(columnData);
- }
- table_.setLayout(tableLayout);
-
- tableViewer_ = new TableViewer(table_);
-
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
-
- return this;
- }
-
- public void setInput(IValidationMessage[] messages)
- {
- tableViewer_.setInput(messages);
- tableViewer_.refresh();
- }
-
- public void clearInput()
- {
- IValidationMessage emptyMessages[] = {};
- this.setInput(emptyMessages);
- }
-
- public IContentProvider getContentProvider()
- {
- return tableViewer_.getContentProvider();
- }
-
- public IStatus getStatus()
- {
- return message == null ? Status.OK_STATUS :
- StatusUtils.errorStatus(message );
- }
-
- public void refresh()
- {
- tableViewer_.refresh();
- }
-
- public TableItem[] getItems()
- {
- //internalRefresh();
- return table_.getItems();
- }
-
- public void setEnabled(boolean enabled)
- {
- }
-
- public void dispose()
- {
- if (table_ != null)
- table_.dispose();
- }
-
- protected class ListContentProvider implements IStructuredContentProvider
- {
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- tableViewer_.add(getElements(newInput));
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof IValidationMessage[])
- {
- IValidationMessage[] valMessages = (IValidationMessage[]) inputElement;
- return valMessages;
- }
- else
- return new Object[0];
- }
- }
-
- protected class ListLabelProvider implements ITableLabelProvider
- {
- public Image getColumnImage(Object element, int columnIndex)
- {
- if (element instanceof IValidationMessage)
- {
- IValidationMessage msg = (IValidationMessage) element;
-
- if (columnIndex == 0)
- {
- int severity = msg.getSeverity();
- if (severity == 0) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
- } else if (severity == 1) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
- } else if (severity == 2) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK);
- }
- }
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String text = "";
- if (element instanceof IValidationMessage)
- {
- IValidationMessage msg = (IValidationMessage) element;
-
- switch (columnIndex) {
- case 0:
- // no text to display, only display severity as image
- break;
- case 1:
- text = (new Integer(msg.getLine())).toString();
- break;
- case 2:
- text = (new Integer(msg.getColumn())).toString();
- break;
- case 3:
- text = msg.getMessage();
- break;
-
- default:
- break;
- }
- }
- return text;
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
deleted file mode 100644
index 2e2a8093a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
+++ /dev/null
@@ -1,55 +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.ui.widgets.object;
-
-import java.net.MalformedURLException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- if (value instanceof IStructuredSelection)
- {
- Object sel = ((IStructuredSelection)value).getFirstElement();
- if (sel instanceof IResource)
- {
- try
- {
- return new StructuredSelection(((IResource)sel).getLocation().toFile().toURL().toString());
- }
- catch (MalformedURLException murle)
- {
- }
- }
- else if (sel instanceof ServiceImpl)
- {
- return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)sel));
- }
- else if (sel instanceof ServiceRefImpl)
- {
- return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceRefImpl)sel));
- }
- else if (sel instanceof WSDLResourceImpl)
- {
- return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)sel));
- }
- }
- return value;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
deleted file mode 100644
index 0e8a10508..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
+++ /dev/null
@@ -1,545 +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.ui.widgets.object;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-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.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionConditionCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionTreeWidget;
-import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser;
-import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-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.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-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.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSDLValidationContext;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-
-public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget, Runnable
-{
- private String pluginId_;
- private MessageUtils msgUtils_;
- private FileExtensionFilter wsFilter_;
- private WebServicesParser webServicesParser;
-
- private Composite parent_;
- private Listener statusListener_;
- private WSDLSelectionTreeWidget tree;
- private ValidationMessageViewerWidget msgViewer_;
-
- /*CONTEXT_ID PCON0001 for the WSDL Selection Page*/
- private final String INFOPOP_PCON_PAGE = "PCON0001";
-
- /*CONTEXT_ID PCON0002 for the WSDL Document text field of the WSDL Selection Page*/
- private final String INFOPOP_PCON_TEXT_WSDL = "PCON0002";
- private Text webServiceURI;
-
- /*CONTEXT_ID PCON0003 for the WSDL Resource Browse button of the WSDL Selection Page*/
- private final String INFOPOP_PCON_BUTTON_BROWSE_WSDL = "PCON0003";
- private Button wsBrowseButton_;
-
- private ValidateWSDLJob validateWSDLJob_;
- private JobChangeAdapter jobChangeAdapter_;
- private Text validationSummaryText_;
- private Text validationSummaryText2_;
-
-
- public WSDLSelectionWidget()
- {
- pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
- wsFilter_ = new FileExtensionFilter(new String[] {"wsdl", "wsil", "html"});
- webServicesParser = WSDLParserFactory.getWSDLParser();
-
- final Runnable handleValidationMessages = new Runnable()
- {
- public void run()
- {
- msgViewer_.setInput(validateWSDLJob_.getValidationMessages());
- updateValidationSummary(validateWSDLJob_.getValidationMessageSeverity());
- }
- };
-
- jobChangeAdapter_ = new JobChangeAdapter()
- {
- public void done(IJobChangeEvent event)
- {
- if (msgViewer_!= null && msgViewer_.getContentProvider() != null) {
- Display.getDefault().asyncExec( handleValidationMessages );
- }
- }
- };
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- UIUtils uiUtils = new UIUtils( msgUtils_, pluginId_ );
- parent_ = parent;
- statusListener_ = statusListener;
-
- parent.setToolTipText( msgUtils_.getMessage( "TOOLTIP_PCON_PAGE" ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PCON_PAGE );
-
- Composite wsdlGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-
- Label wsLabel = new Label( wsdlGroup, SWT.WRAP);
- wsLabel.setText( msgUtils_.getMessage("LABEL_WS_SELECTION"));
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
- wsLabel.setToolTipText( msgUtils_.getMessage("TOOLTIP_PCON_TEXT_WS") );
-
- webServiceURI = uiUtils.createText( wsdlGroup, null, "TOOLTIP_PCON_TEXT_WS", INFOPOP_PCON_TEXT_WSDL, SWT.SINGLE | SWT.BORDER );
- webServiceURI.addModifyListener(
- new ModifyListener()
- {
- public void modifyText(ModifyEvent event)
- {
- handleWebServiceURIModifyEvent();
- }
- });
-// webServiceURI.addListener( SWT.Modify, statusListener );
-
- wsBrowseButton_ = uiUtils.createPushButton( wsdlGroup, "BUTTON_BROWSE", "TOOLTIP_PCON_BUTTON_BROWSE_WS", INFOPOP_PCON_BUTTON_BROWSE_WSDL );
- wsBrowseButton_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetDefaultSelected(SelectionEvent event)
- {
- handleWSDLButton();
- }
-
- public void widgetSelected(SelectionEvent event)
- {
- handleWSDLButton();
- }
- });
-
- tree = new WSDLSelectionTreeWidget();
- tree.addControls(parent, statusListener);
- tree.setWebServicesParser(webServicesParser);
-
- msgViewer_ = new ValidationMessageViewerWidget();
- msgViewer_.addControls(parent, statusListener);
-
- validationSummaryText_ = new Text( parent, SWT.WRAP);
- validationSummaryText_.setEditable(false);
- GridData gd1 = new GridData(GridData.FILL_BOTH);
- validationSummaryText_.setLayoutData(gd1);
- validationSummaryText_.setToolTipText( msgUtils_.getMessage("TOOLTIP_VALIDATE_TEXT_MESSAGE_SUMMARY") );
-
- validationSummaryText2_ = new Text( parent, SWT.WRAP);
- validationSummaryText2_.setEditable(false);
- validationSummaryText2_.setLayoutData(gd1);
-
- setMessageSummary();
- return this;
- }
-
- private void setMessageSummary() {
- String validationMessageSummary = msgUtils_.getMessage("MESSAGE_VALIDATE_NO_WSDL");
- PersistentWSDLValidationContext wsdlValidationContext = WSPlugin.getInstance().getWSDLValidationContext();
- String validationSelection = wsdlValidationContext.getPersistentWSDLValidation();
- if (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection)) {
- validationMessageSummary = msgUtils_.getMessage("MESSAGE_VALIDATE_REMOTE_WSDL");
- } else if (PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) {
- validationMessageSummary = msgUtils_.getMessage("MESSAGE_VALIDATE_ALL_WSDL");
- }
- validationSummaryText_.setText( validationMessageSummary );
- validationSummaryText2_.setText(" ");
- }
-
- private void handleWebServiceURIModifyEvent()
- {
- if (webServiceURI.getText().indexOf(':') > 0)
- Timer.newInstance(Display.getCurrent(), this).startTimer();
- else
- handleWebServiceURI();
- statusListener_.handleEvent(null);
- }
-
- private void handleWebServiceURI()
- {
- String wsURI = webServiceURI.getText();
- if (wsURI.indexOf(':') < 0)
- {
- IFile file = uri2IFile(wsURI);
- if (file != null)
- wsURI = iFile2URI(file);
- }
- if (wsURI != null && wsURI.indexOf(':') >= 0 && webServicesParser.getWebServiceEntityByURI(wsURI) == null)
- {
- WSDLSelectionConditionCommand cmd = new WSDLSelectionConditionCommand();
- cmd.setWebServicesParser(webServicesParser);
- cmd.setWebServiceURI(wsURI);
- cmd.execute(null, null);
- }
- WebServiceEntity entity = webServicesParser.getWebServiceEntityByURI(wsURI);
- if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSDL)
- tree.setEnabled(false);
- else
- tree.setEnabled(true);
- tree.setWebServiceURI(wsURI);
- tree.refreshTreeViewer();
- }
-
- public void run()
- {
- handleWebServiceURI();
- statusListener_.handleEvent(null);
- }
-
- private void handleWSDLButton()
- {
- DialogResourceBrowser dialog = new DialogResourceBrowser( parent_.getShell(), null, wsFilter_);
- dialog.open();
- IResource res = dialog.getFirstSelection();
- if( res != null ) webServiceURI.setText( res.getFullPath().toString() );
- statusListener_.handleEvent(null);
- }
-
- public IStatus getStatus()
- {
- // Timer validation
- /*
- * Commenting out because we don't want to block fast typers from hitting Next/Finish
- if (Timer.isRunning())
- return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_LOADING_WEB_SERVICE_URI"), Status.ERROR);
- */
-
- // Validate the String representation of the Web service URI
- // For example, is it pointing to an existing resource in the workspace?
- String wsPath = webServiceURI.getText();
- if( wsPath == null || wsPath.length() <= 0 )
- return StatusUtils.errorStatus( msgUtils_.getMessage("PAGE_MSG_INVALID_WEB_SERVICE_URI") );
- else if( wsPath.indexOf(':') < 0 )
- {
- IResource res = ResourceUtils.findResource(wsPath);
- if( res == null ) {
- msgViewer_.clearInput();
- return StatusUtils.errorStatus( msgUtils_.getMessage("PAGE_MSG_NO_SUCH_FILE", new Object[] {wsPath}) );
- }
- else if( res.getType() != IResource.FILE ) {
- msgViewer_.clearInput();
- return StatusUtils.errorStatus( msgUtils_.getMessage("PAGE_MSG_INVALID_WEB_SERVICE_URI") );
- }
- }
-
-
- // Validate the content of the Web service URI
- // For example, is selection a WSDL URI?
- if (!Timer.isRunning() && tree.isEnabled())
- {
- IStatus status = tree.getStatus();
- if (status != null)
- {
- int severity = status.getSeverity();
- if (severity == Status.ERROR || severity == Status.WARNING) {
- msgViewer_.clearInput();
- return status;
- }
- }
- }
- else
- {
- if( wsPath.indexOf(':') < 0 )
- {
- String wsdlURI = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
- if (webServicesParser.getWSDLDefinition(wsdlURI) == null) {
- msgViewer_.clearInput();
- return StatusUtils.errorStatus(msgUtils_.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL") );
- }
- }
- }
-
-
- if (!Timer.isRunning()) {
- String wsdlURI1 = wsPath;
- boolean isRemote = true;
- if (tree.isEnabled()) { // is wsil
- wsdlURI1 = tree.getWsdlURI();
- if (wsdlURI1.startsWith("file:")) {
- isRemote = false;
- }
- } else { // is wsil
-
- if( wsPath.indexOf(':') < 0 )
- { // not remote
- isRemote = false;
- wsdlURI1 = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
- }
- }
-
- setMessageSummary();
- validateWSDL(wsdlURI1, isRemote);
- }
-
-
- // OK status
- return Status.OK_STATUS;
- }
-
- private void validateWSDL (String wsdlURI, boolean isRemote) {
-
- String validationSelection = WSPlugin.getInstance().getWSDLValidationContext().getPersistentWSDLValidation();;
- if ((PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) ||
- (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection) && isRemote)) {
-
- IJobManager jobManager = Platform.getJobManager();
- Job[] jobs = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
- ValidateWSDLJob existingValidateWSDLJob = null;
-
- boolean startWSDLValidation = true;
- validationSummaryText_.setText( msgUtils_.getMessage("MESSAGE_VALIDATE_IN_PROGRESS") );
- validationSummaryText2_.setText(" ");
- if( jobs.length > 0 )
- {
- for (int i=0; i<jobs.length; i++) {
- existingValidateWSDLJob = (ValidateWSDLJob)jobs[i];
-
- if (existingValidateWSDLJob.getState() != Job.NONE) {
- // Job running or to be run
- // If the job is validating the same wsdlURI, let it finish running and ignore this one.
- // It is not for the same wsdlURI, cancel the job and schedule this one.
-
- if (!wsdlURI.equals(existingValidateWSDLJob.getWsdlURI())) {
- existingValidateWSDLJob.cancel();
- } else {
- startWSDLValidation = false;
- }
- }
- }
- }
-
- if (startWSDLValidation) {
- startWSDLValidationJob(wsdlURI);
- }
- }
- return;
- }
-
- private void startWSDLValidationJob (String wsdlURI) {
- validateWSDLJob_ = new ValidateWSDLJob(wsdlURI);
- validateWSDLJob_.addJobChangeListener( jobChangeAdapter_ );
- validateWSDLJob_.schedule();
- }
-
- public void updateValidationSummary(int messageSeverity)
- {
-
- switch (messageSeverity) {
- case IValidationMessage.SEV_ERROR:
- validationSummaryText_.setText(msgUtils_.getMessage("ERROR_MESSAGES_IN_VALIDATION"));
- validationSummaryText2_.setText(msgUtils_.getMessage("WARNING_IF_CONTINUE"));
- break;
- case IValidationMessage.SEV_WARNING:
- validationSummaryText_.setText(msgUtils_.getMessage("WARNING_MESSAGES_IN_VALIDATION"));
- validationSummaryText2_.setText(msgUtils_.getMessage("WARNING_IF_CONTINUE"));
- break;
- default:
- validationSummaryText_.setText(msgUtils_.getMessage("VALIDATION_COMPLETED"));
- validationSummaryText2_.setText(" ");
- break;
- }
- }
-
- private IFile uri2IFile(String uri)
- {
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(uri);
- if (res instanceof IFile)
- return (IFile)res;
- else
- return null;
- }
-
- private String iFile2URI(IFile file)
- {
- File f = file.getLocation().toFile();
- try
- {
- return f.toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- }
- return f.toString();
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object object = initialSelection.getFirstElement();
- String wsdlURI = toWsdlURI(object);
- if (wsdlURI != null)
- {
- webServiceURI.setText(wsdlURI);
- handleWebServiceURI();
- }
- }
- }
-
- private String toWsdlURI(Object object)
- {
- if (object instanceof ServiceImpl)
- return J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)object);
- else if (object instanceof WSDLResourceImpl)
- return J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)object);
- else if (object instanceof ServiceRef)
- return J2EEActionAdapterFactory.getWSDLURI((ServiceRef)object);
- else if (object instanceof IFile)
- return ((IFile)object).getFullPath().toString();
- else if (object instanceof String)
- return (String)object;
- else
- return null;
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return new StructuredSelection(
- new WSDLSelectionWrapper( webServicesParser,
- new StructuredSelection(tree.getWsdlURI()) ) );
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return webServicesParser;
- }
-
- public IStatus validateSelection(IStructuredSelection objectSelection)
- {
- return Status.OK_STATUS;
- }
-
- public IProject getProject()
- {
- String wsdlURI = tree.getWsdlURI();
- if (wsdlURI != null)
- {
- IProject p = getProjectFromURI(wsdlURI);
- if (p!=null && p.exists())
- return p;
-
- String wsRelPath = webServiceURI.getText();
- IResource wsRes = ResourceUtils.findResource(wsRelPath);
- if (wsRes!=null && wsRes instanceof IFile)
- {
- IProject p2 = ((IFile)wsRes).getProject();
- return p2;
- }
-
- }
- return null;
- }
-
- public String getComponentName()
- {
- String wsdlURI = tree.getWsdlURI();
- if (wsdlURI != null)
- {
- String cname = getComponentNameFromURI(wsdlURI);
- if (cname!=null && cname.length()>0)
- return cname;
-
- String wsRelPath = webServiceURI.getText();
- IResource wsRes = ResourceUtils.findResource(wsRelPath);
- if (wsRes!=null && wsRes instanceof IFile)
- {
- IVirtualComponent comp = ResourceUtils.getComponentOf(wsRes);
- if (comp!=null)
- {
- return comp.getName();
- }
- }
-
- }
- return null;
- }
-
- private IProject getProjectFromURI(String uri)
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String wkspcRootLoc = root.getLocation().toString();
- int idx = uri.indexOf(wkspcRootLoc);
- if (idx != -1)
- {
- String relPath = uri.substring(wkspcRootLoc.length()+idx);
- IResource res = root.findMember(new Path(relPath));
- if (res instanceof IFile)
- {
- IProject p = ((IFile)res).getProject();
- return p;
- }
- }
- return null;
- }
-
- private String getComponentNameFromURI(String uri)
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String wkspcRootLoc = root.getLocation().toString();
- int idx = uri.indexOf(wkspcRootLoc);
- if (idx != -1)
- {
- String relPath = uri.substring(wkspcRootLoc.length()+idx);
- IResource res = root.findMember(new Path(relPath));
- if (res instanceof IFile)
- {
- IVirtualComponent comp = ResourceUtils.getComponentOf(res);
- if (comp!=null)
- {
- return comp.getName();
- }
- }
- }
- return null;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java
deleted file mode 100644
index 80a6c1823..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.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.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * This class is a very simple wrapper that binds a WSDL parser with
- * a wsdlSelection object.
- */
-public class WSDLSelectionWrapper
-{
- public WebServicesParser parser;
- public IStructuredSelection wsdlSelection;
-
- public WSDLSelectionWrapper( WebServicesParser parser,
- IStructuredSelection selection )
- {
- this.parser = parser;
- this.wsdlSelection = selection;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java
deleted file mode 100644
index e405d3bfe..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java
+++ /dev/null
@@ -1,343 +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.ui.widgets.runtime;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-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.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-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.componentcore.internal.util.IModuleConstants;
-
-
-public class ClientRuntimeSelectionWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- /* CONTEXT_ID PWRS0003 for the Wizard Scenario Client configuration of the Runtime Selection Page */
- private String INFOPOP_PWRS_GROUP_CLIENT = pluginId_ + ".PWRS0003";
-
- private Group clientGroup_;
- private RuntimeServerSelectionWidget runtimeWidget_;
- private SelectionListChoices runtime2ClientTypes_;
- //private Combo clientType_;
- private SelectionAdapter clientTypeSelListener;
- private ProjectSelectionWidget projectWidget_;
- private boolean isVisible_;
- private String clientRuntimeId_;
-
-
- public WidgetDataEvents addControls( Composite parent, final Listener statusListener )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
-
- clientGroup_ = uiUtils.createGroup( parent, "LABEL_CLIENT_SELECTION_VIEW_TITLE",
- null, INFOPOP_PWRS_GROUP_CLIENT, 2, 5, 5 );
-
- runtimeWidget_ = new RuntimeServerSelectionWidget( true );
- runtimeWidget_.addControls( clientGroup_, statusListener );
-
-
- runtimeWidget_.addModifyListener( new ModifyListener()
- {
- public void modifyText(ModifyEvent e)
- {
- //handleRuntime2ClientTypesEvent();
- handleUpdateProjectWidget();
- }
- });
-
-
- projectWidget_ = new ProjectSelectionWidget(true);
- projectWidget_.addControls( clientGroup_, statusListener );
-
- //clientType_ = uiUtils.createCombo(clientGroup_, "LABEL_CLIENT_TYPE", "TOOLTIP_PWCR_COMBO_CLIENT_TYPE",
- // INFOPOP_PWRS_GROUP_CLIENT, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
-
- //Temporarily remove the listeners
- /*
- clientTypeSelListener = new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent evt)
- {
- handleSetProjects(clientType_.getSelectionIndex());
- statusListener.handleEvent(null);
- }
- };
-
- clientType_.addSelectionListener(clientTypeSelListener);
- */
-
- return this;
- }
-
- // This method is called by the creator of this widget to control
- // whether it is visible or not.
- public void setVisible( boolean value )
- {
- clientGroup_.setVisible( value );
- isVisible_ = value;
- }
-
- public boolean isVisible(){
- return this.isVisible_;
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- runtimeWidget_.setTypeRuntimeServer( ids );
- projectWidget_.setTypeRuntimeServer(ids);
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return runtimeWidget_.getTypeRuntimeServer();
- }
-
- public void setClientRuntimeId(String id)
- {
- clientRuntimeId_ = id;
- }
-
- public String getClientRuntimeId()
- {
- //calculate the most appropriate clientRuntimeId based on current settings.
- String projectName = projectWidget_.getProjectName();
- String templateId = projectWidget_.getComponentType();
-
- //Find the client runtime that fits this profile best.
- return WebServiceRuntimeExtensionUtils2.getClientRuntimeId(runtimeWidget_.getTypeRuntimeServer(), projectName, templateId);
- }
-
- public boolean getClientNeedEAR()
- {
- return projectWidget_.getNeedEAR();
- }
-
- public void setClientNeedEAR(boolean b)
- {
- projectWidget_.setNeedEAR(b);
- }
-
- public String getClientProjectName()
- {
- return projectWidget_.getProjectName();
- }
-
- public void setClientProjectName( String name )
- {
- projectWidget_.setProjectName( name );
- }
-
- public String getClientEarProjectName()
- {
- return projectWidget_.getEarProjectName();
- }
-
- public void setClientEarProjectName( String name )
- {
- projectWidget_.setEarProjectName( name );
- }
-
- public String getClientComponentType()
- {
- return projectWidget_.getComponentType();
- }
-
- public void setClientComponentType( String type )
- {
- projectWidget_.setComponentType( type );
- }
-
- /*
- private void handleRuntime2ClientTypesEvent()
- {
- if (runtime2ClientTypes_ != null)
- {
- //If the runtimeId from runtimeWidget_ is already selected in
- //in runtime2ClientTypes_, do nothing.
- String currentRuntimeId = runtime2ClientTypes_.getList().getSelection();
- String newRuntimeId = runtimeWidget_.getTypeRuntimeServer().getRuntimeId();
- if (currentRuntimeId != newRuntimeId)
- {
- SelectionList runtimes = runtime2ClientTypes_.getList();
- runtimes.setSelectionValue( runtimeWidget_.getTypeRuntimeServer().getRuntimeId() );
- }
-
- String[] clientTypeIds = runtime2ClientTypes_.getChoice().getList().getList();
- int selectedClientTypeIdx = runtime2ClientTypes_.getChoice().getList().getIndex();
-
- clientType_.removeSelectionListener(clientTypeSelListener);
- clientType_.setItems( getClientTypeLabels( clientTypeIds ));
- clientType_.select(selectedClientTypeIdx);
- clientType_.addSelectionListener(clientTypeSelListener);
- // Temp remove listeners and event handling
- //handleSetProjects(selectedClientTypeIdx);
-
- }
- }
- */
-
-
- private void handleUpdateProjectWidget()
- {
- projectWidget_.setTypeRuntimeServer(runtimeWidget_.getTypeRuntimeServer());
-
- //Update the list of projects shown to the user.
- projectWidget_.refreshProjectItems();
- }
-
-
- /*
- private void handleSetProjects( int clientTypeIndex )
- {
- SelectionListChoices clientType2Projects = runtime2ClientTypes_.getChoice();
- clientType2Projects.getList().setIndex( clientTypeIndex );
-
- // Make sure that the project name and EAR name are kept the same
- // even if the client type is changed. Note: the project and EAR lists
- // will be updated according to what is set by the client type.
- SelectionListChoices currentProjects = projectWidget_.getProjectChoices();
-
- if( currentProjects != null )
- {
- String projectName = currentProjects.getList().getSelection();
- String earName = currentProjects.getChoice().getList().getSelection();
-
- // Set the project to it's original state.
- clientType2Projects.getChoice().getList().setSelectionValue( projectName );
-
- // Set the EAR name to it's original state.
- clientType2Projects.getChoice().getChoice().getList().setSelectionValue( earName );
- }
-
- //projectWidget_.setProjectTypeId(clientType2Projects.getList().getSelection());
- projectWidget_.setComponentType(clientType2Projects.getList().getSelection());
- projectWidget_.setProjectChoices( clientType2Projects.getChoice() );
- }
- */
-
- private String[] getClientTypeLabels( String[] types )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- //ClientProjectTypeRegistry registry = ClientProjectTypeRegistry.getInstance();
- String[] clientTypeLabels = new String[types.length];
-
- for( int index = 0; index < types.length; index++ )
- {
- //clientTypeLabels[index] = registry.getElementById(types[index]).getAttribute("label");
- String type = types[index];
- if (type.equals(IModuleConstants.JST_WEB_MODULE))
- {
- clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_WEB");
- }
- else if (type.equals(IModuleConstants.JST_EJB_MODULE))
- {
- clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_EJB");
- }
- else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
- {
- clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_APP_CLIENT");
- }
- else if (type.equals(IModuleConstants.JST_UTILITY_MODULE))
- {
- clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_CONTAINERLESS");
- }
- else
- {
- clientTypeLabels[index] = type;
- }
- }
-
- return clientTypeLabels;
- }
-
- public ProjectSelectionWidget getProjectSelectionWidget() {
- return this.projectWidget_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public IStatus getStatus()
- {
- //Return OK all the time for now.
- IStatus finalStatus = Status.OK_STATUS;
-
- /*
- IStatus projectStatus = projectWidget_.getStatus();
- IStatus runtimeStatus = runtimeWidget_.getStatus();
-
- if( runtimeStatus.getSeverity() == Status.ERROR )
- {
- finalStatus = runtimeStatus;
- }
- else if( projectStatus.getSeverity() == Status.ERROR )
- {
- finalStatus = projectStatus;
- }
- else
- {
- SelectionListChoices clientProjects = getProjectSelectionWidget().getProjectChoices();
- ValidationUtils valUtils = new ValidationUtils();
- if (clientProjects != null)
- {
- String clientEARName = projectWidget_.getEarProjectName();
- if (clientEARName == null){
- clientEARName = clientProjects.getChoice().getList().getSelection();
- }
- String clientProjName = projectWidget_.getProjectName();
- if (clientProjName == null){
- clientProjName = clientProjects.getList().getSelection();
- }
-
- String clientCompName = projectWidget_.getComponentName();
- String clientEARCompName = projectWidget_.getEarComponentName();
-
- //Validate that the selected client project is of the type indicated by client project type.
- IStatus clientProjectTypeStatus = valUtils.validateProjectType(clientProjName, runtime2ClientTypes_);
- if (clientProjectTypeStatus.getSeverity() == Status.ERROR)
- {
- finalStatus = clientProjectTypeStatus;
- }
-
- //Validate client side server targets and J2EE levels
- String clientServerFactoryId = getClientTypeRuntimeServer().getServerId();
- // rm j2ee
- String clientJ2EElevel = "14";
- IStatus clientProjectStatus = valUtils.validateProjectTargetAndJ2EE(clientProjName, clientCompName, clientEARName, clientEARCompName, clientServerFactoryId,
- clientJ2EElevel);
- if (clientProjectStatus.getSeverity() == Status.ERROR)
- {
- finalStatus = clientProjectStatus;
- }
- }
- }
- */
- return finalStatus;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 48ae02d22..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,1485 +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.ui.widgets.runtime;
-
-import java.util.Set;
-import java.util.Vector;
-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.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.jface.viewers.IStructuredSelection;
-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.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.common.ServerSelectionUtils;
-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.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ClientRuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.IEnvironment;
-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.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
-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.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
-
-public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataModelOperation
-{
- protected MessageUtils msgUtils_;
- // clientRuntimeJ2EEType contains the default client runtime and J2EE level based on the initial selection.
- // If the initialSeleciton does not result in a valid client runtime and J2EE level, clientRuntimeJ2EEType
- // should remain null for the life of this instance.
- private WSRuntimeJ2EEType clientRuntimeJ2EEType_; //usage is internal to this class
-
- private TypeRuntimeServer clientIds_;
- private String clientRuntimeId_;
- private String clientProjectName_;
- private String clientEarProjectName_;
- protected boolean clientNeedEAR_ = true;
- private String clientComponentType_;
- private FacetMatcher clientFacetMatcher_;
-
- private IContext context_;
- private ISelection selection_;
- private IWebServiceClient webServiceClient_;
- private ResourceContext resourceContext_;
- private boolean test_;
-
- //A note on initialSelections ...
- //The difference between clientInitialProject/Component_ and initialInitialSelection is that
- //clientInitialProject/Component_ comes from the ObjectSelectionOutputCommand while initialInitialSelection
- //is the actual thing that was selected before the wizard was launched. In the runtime/j2ee/project
- //defaulting algorithm, clientInitialSelection will be given first priority. If, however, it is
- //deemed that clientInitialProject is not a valid initial selection, initialInitialSelection
- //will be given second priority. Things that could make an initialSelection invalid include
- //1. The containing project contains the Web service for which we are trying to create a client
- //2. The containing project has a J2EE level, server target, and project type combination which
- // is not supported by any of the registered Web service runtimes.
- private IProject clientInitialProject_;
- private IProject initialInitialProject_;
-
-
-
- private String wsdlURI_;
- private WebServicesParser parser_;
-
-
- public ClientRuntimeSelectionWidgetDefaultingCommand()
- {
- super();
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- clientIds_ = ids;
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientIds_;
- }
-
- public String getClientRuntimeId()
- {
- return clientRuntimeId_;
- }
-
- public String getClientProjectName()
- {
- return clientProjectName_;
- }
-
- public String getClientEarProjectName()
- {
- return clientEarProjectName_;
- }
-
- public void setClientEarProjectName(String name)
- {
- clientEarProjectName_ = name;
- }
-
- public String getClientComponentType()
- {
- return clientComponentType_;
- }
-
- public IWebServiceClient getWebService()
- {
- return webServiceClient_;
- }
-
- public IContext getContext()
- {
- return context_;
- }
-
- public ISelection getSelection()
- {
- return selection_;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable)
- {
-
- IEnvironment env = getEnvironment();
-
- try
- {
- // Set the runtime based on the initial selection
- clientRuntimeId_ = getDefaultClientRuntime(clientInitialProject_);
- if (clientRuntimeId_ == null)
- {
- // return and error.
- }
- clientIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRuntime()
- .getId());
-
- // Set the project
- if (clientProjectName_ == null)
- {
- // Project name did not get set when the runtime was set, so set it now
- clientProjectName_ = getDefaultClientProjectName();
- }
-
- IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
- if (!clientProject.exists())
- {
- // Set the project template
- clientComponentType_ = getDefaultClientProjectTemplate();
- }
- else
- {
- //Set it to an empty String
- clientComponentType_ = "";
- }
-
-
- // Set the server
- IStatus serverStatus = setClientDefaultServer();
- if (serverStatus.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(serverStatus);
- return serverStatus;
- }
-
- setDefaultClientEarProject();
- // Calculate default IWebServiceClient
- setDefaultsForExtension(env);
-
- return Status.OK_STATUS;
-
- } catch (Exception e)
- {
- // Catch all Exceptions in order to give some feedback to the user
- IStatus errorStatus = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED",
- new String[] { e.getMessage() }), e);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- }
-
- private void setDefaultClientEarProject()
- {
-
- //Determine if an ear selection is needed based on the server type.
- boolean clientNeedEAR_ = true;
- String serverId = clientIds_.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
- clientNeedEAR_ = false;
- }
- }
- }
-
- if (clientNeedEAR_)
- {
- clientEarProjectName_ = getDefaultClientEarProjectName();
- }
- else
- {
- clientEarProjectName_ = "";
- }
- }
-
- private IStatus setClientDefaultServer()
- {
- //Choose an existing server the module is already associated with if possible
- IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
- IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(clientProject), null);
- IServer firstSupportedServer = getFirstSupportedServer(configuredServers, clientRuntimeId_, clientProject);
- if (firstSupportedServer != null)
- {
- clientIds_.setServerId(firstSupportedServer.getServerType().getId());
- clientIds_.setServerInstanceId(firstSupportedServer.getId());
- return Status.OK_STATUS;
- }
-
-
- //Choose any suitable existing server
- IServer[] servers = ServerCore.getServers();
- IServer supportedServer = getFirstSupportedServer(servers, clientRuntimeId_, clientProject);
- if (supportedServer != null)
- {
- clientIds_.setServerId(supportedServer.getServerType().getId());
- clientIds_.setServerInstanceId(supportedServer.getId());
- return Status.OK_STATUS;
- }
-
- //No suitable existing server was found. Choose a suitable server type
- String[] serverTypes = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByClientRuntime(clientRuntimeId_);
- if (serverTypes!=null && serverTypes.length>0)
- {
- //TODO give priority to a server type that corresponds to the runtime associated with
- //this project, if any.
- clientIds_.setServerId(serverTypes[0]);
- return Status.OK_STATUS;
- }
-
- //No suitable server was found. Popup an error.
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(clientIds_.getRuntimeId());
- String serverLabels = getServerLabels(clientIds_.getRuntimeId());
- IStatus status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_NO_SERVER_RUNTIME", new String[]{runtimeLabel, serverLabels}) );
- return status;
- }
-
- private IServer getFirstSupportedServer(IServer[] servers, String clientRuntimeId, IProject clientProject)
- {
- if (servers != null && servers.length > 0) {
- for (int i = 0; i < servers.length; i++)
- {
- String serverFactoryId = servers[i].getServerType().getId();
- if (WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportServer(clientRuntimeId, serverFactoryId))
- {
- //TODO check if the server type supports the project before returning.
- return servers[i];
- }
- }
- }
- return null;
- }
-
- private String getDefaultClientProjectTemplate()
- {
- String[] templates = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(clientIds_.getTypeId(), clientIds_.getRuntimeId());
- RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRequiredFacetVersions();
-
- //Pick the Web one if it's there, otherwise pick the first one.
- for (int i=0; i<templates.length; i++)
- {
- String templateId = templates[i];
- if (templateId.indexOf("web") != -1)
- {
- //Calculate the facet matcher for the template so that we know
- //what to create and what to add during module creation.
-
- Set facetVersions = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
- FacetMatcher fm = FacetUtils.match(rfv, facetVersions);
- if (fm.isMatch())
- {
- clientFacetMatcher_ = fm;
- return templates[i];
- }
-
- }
- }
-
- //Didn't find a "web" type. Return the first one that is a match. Calculate the facet matcher for the template
- //so that we know what to create and what to add during module creation.
- for (int j = 0; j < templates.length; j++)
- {
- String templateId = templates[j];
- Set facetVersions = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
- FacetMatcher fm = FacetUtils.match(rfv, facetVersions);
- if (fm.isMatch())
- {
- clientFacetMatcher_ = fm;
- return templates[j];
- }
- }
-
- //Still nothing, return the first one if available.
- if (templates.length > 0)
- return templates[0];
-
- return "";
- }
-
- private String getDefaultClientProjectName()
- {
- IProject[] projects = FacetUtils.getAllProjects();
- ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_);
- RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
-
- //Check each project for compatibility with the clientRuntime
- for (int i=0; i<projects.length; i++)
- {
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(projects[i]);
- if (fproject != null)
- {
- Set facetVersions = fproject.getProjectFacets();
- FacetMatcher fm = FacetUtils.match(rfvs, facetVersions);
- if (fm.isMatch())
- {
- clientFacetMatcher_ = fm;
- return projects[i].getName();
- }
- }
- else
- {
- //TODO Handle the plain-old Java projects
- }
- } catch (CoreException ce)
- {
-
- }
- }
-
- //No project was suitable, return a new project name
- return ResourceUtils.getDefaultWebProjectName();
-
- }
-
- private String getDefaultClientRuntime(IProject project)
- {
-
-
- String[] clientRuntimes = WebServiceRuntimeExtensionUtils2.getClientRuntimesByType(clientIds_.getTypeId());
-
- //Check if the preferred Web service runtime works with the initially selected project.
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String runtimeId = context.getRuntimeId();
- String preferredClientRuntimeId = null;
- for (int k=0; k<clientRuntimes.length; k++ )
- {
- ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimes[k]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- preferredClientRuntimeId = desc.getId();
- break;
- }
- }
-
- if (preferredClientRuntimeId != null)
- {
- if (project != null && project.exists())
- {
- RequiredFacetVersion[] prfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(preferredClientRuntimeId)
- .getRequiredFacetVersions();
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(project);
- if (fproject != null)
- {
- Set facetVersions = fproject.getProjectFacets();
- FacetMatcher fm = FacetUtils.match(prfv, facetVersions);
- if (fm.isMatch())
- {
- clientFacetMatcher_ = fm;
- clientProjectName_ = project.getName();
- return preferredClientRuntimeId;
- }
- } else
- {
- // TODO Handle the plain-old Java projects
- }
- } catch (CoreException ce)
- {
-
- }
- }
- }
-
- //Either there was no initially selected project or the preferred
- //runtime did not work with the initially selected project.
- //If possible, pick a Web service runtime that works with the initially selected project.
- //If the initially selected project does not work with any of the Web service runtimes, pick the
- //preferred Web service runtime.
-
-
- if (project != null && project.exists())
- {
- for (int i=0; i<clientRuntimes.length; i++)
- {
- RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimes[i]).getRequiredFacetVersions();
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(project);
- if (fproject != null)
- {
- Set facetVersions = fproject.getProjectFacets();
- FacetMatcher fm = FacetUtils.match(rfv, facetVersions);
- if (fm.isMatch())
- {
- clientFacetMatcher_ = fm;
- clientProjectName_ = project.getName();
- return clientRuntimes[i];
- }
- }
- else
- {
- //TODO Handle the plain-old Java projects
- }
- } catch (CoreException ce)
- {
-
- }
- }
- }
-
- //Haven't returned yet so this means that the intitially selected project cannot be used
- //to influence the selection of the runtime. Pick the preferred Web service runtime if it is
- //not null.
- if (preferredClientRuntimeId != null)
- {
- return preferredClientRuntimeId;
- }
-
-
- if (clientRuntimes.length > 0)
- return WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimes[0]).getId();
- else
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.env.core.common.Environment)
- */
- /*
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- try
- {
-
- String[] runtimeIds = WebServiceRuntimeExtensionUtils.getRuntimesByClientType(clientIds_.getTypeId());
- SelectionList list = new SelectionList(runtimeIds, 0);
- Vector choices = new Vector();
- for (int i = 0; i < runtimeIds.length; i++) {
- choices.add(getClientTypesChoice(runtimeIds[i]));
- }
- runtimeClientTypes_ = new SelectionListChoices(list, choices);
- setClientDefaultRuntimeFromPreference();
- setClientDefaultJ2EEVersionFromPreference();
- setClientComponentType();
- clientRuntimeJ2EEType_ = getClientRuntimeAndJ2EEFromProject(clientInitialProject_, clientInitialComponentName_);
- if (clientRuntimeJ2EEType_ != null)
- {
- clientJ2EEVersion_ = clientRuntimeJ2EEType_.getJ2eeVersionId();
- setClientRuntimeId(clientRuntimeJ2EEType_.getWsrId());
- setClientProjectType(clientRuntimeJ2EEType_.getClientProjectTypeId());
-
- }
-
-
- //If clientInitialProject is the service project, check the initialInitialProject
- //to see if it is valid.
- ValidationUtils vu = new ValidationUtils();
- if (vu.isProjectServiceProject(clientInitialProject_, wsdlURI_, parser_))
- {
- clientRuntimeJ2EEType_ = getClientRuntimeAndJ2EEFromProject(initialInitialProject_, initialInitialComponentName_);
- if (clientRuntimeJ2EEType_ != null)
- {
- clientJ2EEVersion_ = clientRuntimeJ2EEType_.getJ2eeVersionId();
- setClientRuntimeId(clientRuntimeJ2EEType_.getWsrId());
- setClientProjectType(clientRuntimeJ2EEType_.getClientProjectTypeId());
- //Since the original clientIntialProject was invalid but initialInitialProject is valid,
- //reset clientInitalProject_ to be initialInitialProject for the benefit of
- //downstream project defaulting.
- clientInitialProject_ = initialInitialProject_;
- clientInitialComponentName_ = initialInitialComponentName_;
- }
- }
-
- setClientDefaultProject();
- setClientDefaultEAR();
- IStatus serverStatus = setClientDefaultServer();
- if (serverStatus.getSeverity()== Status.ERROR)
- {
- env.getStatusHandler().reportError(serverStatus);
- return serverStatus;
- }
- updateClientEARs();
-
- //Calculate default IWebServiceClient
- setDefaultsForExtension(env);
- return Status.OK_STATUS;
- } catch (Exception e)
- {
- //Catch all Exceptions in order to give some feedback to the user
- IStatus errorStatus = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED",new String[]{e.getMessage()}), e);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- }
- */
-
- /**
- *
- * @param runtimeId
- * @return
- */
- /*
- private SelectionListChoices getClientTypesChoice(String runtimeId)
- {
- String[] clientComponentTypes;
- clientComponentTypes = WebServiceRuntimeExtensionUtils.getClientProjectTypes(clientIds_.getTypeId(), runtimeId);
- SelectionList list = new SelectionList(clientComponentTypes, 0);
- Vector choices = new Vector();
- for (int i = 0; i < clientComponentTypes.length; i++) {
- choices.add(getProjectChoice(clientComponentTypes[i]));
- }
- return new SelectionListChoices(list, choices);
- }
- */
- /**
- *
- * @param clientType
- * @return
- *
- */
- private SelectionListChoices getProjectChoice(String clientType)
- {
- //IProject[] projects = ClientProjectTypeRegistry.getInstance().getProjects(clientType);
- //String[] projectNames = new String[projects.length];
- //for (int i = 0; i < projectNames.length; i++)
- // projectNames[i] = projects[i].getName();
- String[] projectNames = J2EEUtils.getProjectsContainingComponentOfType(clientType);
- SelectionList list = new SelectionList(projectNames, 0);
- Vector choices = new Vector();
- for (int i = 0; i < projectNames.length; i++)
- {
- IProject project = ProjectUtilities.getProject(projectNames[i]);
- choices.add(getProjectEARChoice(project));
- }
- return new SelectionListChoices(list, choices, getEARProjects());
- }
-
-/**
- *
- * @param project
- * @return
- */
- protected SelectionListChoices getProjectEARChoice(IProject project)
- {
- String[] flexProjects = getAllFlexibleProjects();
- SelectionList list = new SelectionList(flexProjects, 0);
- return new SelectionListChoices(list, null);
- }
-
- protected SelectionList getEARProjects()
- {
- /*
- IProject[] earProjects = J2EEUtils.getEARProjects();
- String[] earProjectNames = new String[earProjects.length];
- for (int i=0; i<earProjects.length; i++)
- {
- earProjectNames[i] = earProjects[i].getName();
- }
- */
- String[] flexProjects = getAllFlexibleProjects();
- return new SelectionList(flexProjects, 0);
- }
-
- // rskreg
- /*
- private String[] gatherAttributeValues(IConfigurationElement[] elements, String key)
- {
- Vector v = new Vector();
- for (int i = 0; i < elements.length; i++)
- {
- String value = elements[i].getAttribute(key);
- if (value != null && value.length() > 0)
- {
- if (!v.contains(value))
- v.add(value);
- }
- }
- return (String [])v.toArray(new String[0]);
- }
- */
- // rskreg
-
- /*
- private void setClientDefaultRuntimeFromPreference()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pRuntimeId = context.getRuntimeId();
-
- //set the client runtime to be the preferred runtime if the client type allows.
- setClientRuntimeId(pRuntimeId);
- }
- */
- /*
- private void setClientRuntimeId(String id)
- {
- String[] clientRuntimeIds = getRuntime2ClientTypes().getList().getList();
- for (int i=0; i<clientRuntimeIds.length;i++)
- {
- if(clientRuntimeIds[i].equals(id))
- {
- getClientTypeRuntimeServer().setRuntimeId(id);
- getRuntime2ClientTypes().getList().setIndex(i);
- break;
- }
- }
- }
- */
- /*
- private void setClientProjectType(String id)
- {
- String[] clientProjectTypeIds = getRuntime2ClientTypes().getChoice().getList().getList();
- for (int i=0; i<clientProjectTypeIds.length;i++)
- {
- if(clientProjectTypeIds[i].equals(id))
- {
- getRuntime2ClientTypes().getChoice().getList().setIndex(i);
- break;
- }
- }
- }
- */
- /*
- protected void setClientDefaultJ2EEVersionFromPreference()
- {
- if (clientIds_ != null)
- {
- String runtimeId = clientIds_.getRuntimeId();
- if (runtimeId != null)
- {
- //IWebServiceRuntime wsr = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId);
- WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(runtimeId);
- if (wsrt != null)
- {
- String[] versions = wsrt.getJ2eeLevels();
- if (versions != null && versions.length > 0)
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pJ2EE = context.getJ2EEVersion();
- if (pJ2EE!=null && pJ2EE.length()>0)
- {
- for (int i=0;i<versions.length;i++)
- {
- if (versions[i].equals(pJ2EE))
- {
- clientJ2EEVersion_ = versions[i];
- return;
- }
- }
- }
- clientJ2EEVersion_ = versions[0];
- return;
- }
- }
- }
- }
- }
- */
-
- /*
- private WSRuntimeJ2EEType getClientRuntimeAndJ2EEFromProject(IProject project, String componentName)
- {
- WSRuntimeJ2EEType cRJ2EE = null;
- //If there is a valid initial selection, use it to determine
- //reasonable J2EE version and Web service runtime values
-
- if (project != null && project.exists())
- {
- boolean isValidComponentType = false;
- if (componentName != null && componentName.length()>0)
- {
- isValidComponentType = J2EEUtils.isWebComponent(project) ||
- J2EEUtils.isEJBComponent(project) ||
- J2EEUtils.isAppClientComponent(project) ||
- J2EEUtils.isJavaComponent(project);
- }
-
- if (isValidComponentType)
- {
- //WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
-
- //Get the J2EE level
- String versionString = null;
- if (!J2EEUtils.isJavaComponent(project))
- {
- int versionId = J2EEUtils.getJ2EEVersion(project);
- versionString = String.valueOf(versionId);
- }
-
- //Get the runtime target of the project
- IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
- String runtimeTargetId = null;
- if (runtimeTarget != null)
- runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-
- //Get the client project type
- //String clientProjectTypeId = getClientProjectTypeFromRuntimeId(project, clientIds_.getRuntimeId());
- String clientComponentTypeId = J2EEUtils.getComponentTypeId(project);
-
- //If the preferred runtime supports this J2EE level and server target, keep it
- if ((versionString == null || WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, clientIds_.getRuntimeId())) &&
- ((runtimeTarget == null) ||
- ((runtimeTarget != null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, clientIds_.getRuntimeId()))) &&
- (WebServiceRuntimeExtensionUtils.doesRuntimeSupportComponentType(clientIds_.getTypeId(), clientIds_.getRuntimeId(), clientComponentTypeId))
- )
- {
- //Set the J2EE level and web service runtime to match the project
- cRJ2EE = new WSRuntimeJ2EEType();
- cRJ2EE.setJ2eeVersionId(versionString);
- cRJ2EE.setWsrId(clientIds_.getRuntimeId());
- cRJ2EE.setClientProjectTypeId(clientComponentTypeId);
- return cRJ2EE;
- } else
- {
- //Look for a runtime that matches
- String[] validRuntimes = WebServiceRuntimeExtensionUtils.getRuntimesByClientType(clientIds_.getTypeId());
- for (int i = 0; i < validRuntimes.length; i++)
- {
- //String thisClientProjectTypeId = getClientProjectTypeFromRuntimeId(project, validRuntimes[i]);
- if ((versionString == null || WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, validRuntimes[i])) &&
- ((runtimeTarget == null) ||
- ((runtimeTarget != null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, validRuntimes[i]))) &&
- (WebServiceRuntimeExtensionUtils.doesRuntimeSupportComponentType(clientIds_.getTypeId(), validRuntimes[i], clientComponentTypeId))
- )
- {
- cRJ2EE = new WSRuntimeJ2EEType();
- cRJ2EE.setJ2eeVersionId(versionString);
- cRJ2EE.setWsrId(validRuntimes[i]);
- cRJ2EE.setClientProjectTypeId(clientComponentTypeId);
- return cRJ2EE;
- }
- }
- }
- }
- }
- return cRJ2EE;
- }
- */
-
- /*
- private void setClientComponentType()
- {
- getRuntime2ClientTypes().getChoice().getList().setIndex(0);
- }
- */
- /*
- private void setClientDefaultProjectNew()
- {
- if (clientInitialProject_ != null)
- {
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientInitialProject_.getName());
- String moduleName = null;
- if (clientInitialComponentName_!=null && clientInitialComponentName_.length()>0)
- {
- moduleName = clientInitialComponentName_;
- }
- else
- {
- moduleName = J2EEUtils.getFirstWebModuleName(clientInitialProject_);
- }
- clientComponentName_ = moduleName;
- String version = String.valueOf(J2EEUtils.getJ2EEVersion(clientInitialProject_, moduleName));
- String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getJ2eeLevels();
- for (int i=0; i< validVersions.length; i++)
- {
- if (validVersions[i].equals(version))
- {
- clientJ2EEVersion_ = validVersions[i];
- }
- }
- }
- else
- {
- //Pick the first one
- IProject[] projects = WebServiceRuntimeExtensionUtils.getAllProjects();
- if (projects.length>0)
- {
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(projects[0].getName());
- String moduleName = J2EEUtils.getFirstWebModuleName(projects[0]);
- clientComponentName_ = moduleName;
- String version = String.valueOf(J2EEUtils.getJ2EEVersion(projects[0], moduleName));
- String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getJ2eeLevels();
- for (int i=0; i< validVersions.length; i++)
- {
- if (validVersions[i].equals(version))
- {
- clientJ2EEVersion_ = validVersions[i];
- }
- }
-
- }
- else
- {
- //there are no projects in the workspace. Pass the default names for new projects.
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
- clientComponentName_ = ResourceUtils.getDefaultWebComponentName();
- }
- }
- }
- */
-
- /*
- private void setClientDefaultProject()
- {
- //Handle the case where no valid initial selection exists
- if (clientInitialProject_ == null || (clientInitialProject_!=null && clientRuntimeJ2EEType_==null))
- {
- //Select the first existing project that is valid.
- setClientProjectToFirstValid();
- return;
- }
-
- ValidationUtils vu = new ValidationUtils();
- if (!vu.isProjectServiceProject(clientInitialProject_, wsdlURI_, parser_))
- {
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientInitialProject_.getName());
- clientComponentName_ = clientInitialComponentName_;
- }
- else
- {
- setClientProjectToFirstValid();
- }
-
- }
- */
-
- /*
- private void setClientProjectToFirstValid()
- {
- //WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
- ValidationUtils vu = new ValidationUtils();
- String[] projectNames = getRuntime2ClientTypes().getChoice().getChoice().getList().getList();
-
- for (int i=0;i<projectNames.length; i++)
- {
- IProject project = ProjectUtilities.getProject(projectNames[i]);
- IVirtualComponent[] vcs = J2EEUtils.getComponentsByType(project, getClientComponentType());
- if (project.isOpen() && vcs!=null && vcs.length>0)
- {
-
- //Get the runtime target of the project
- IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
- String runtimeTargetId = null;
- if (runtimeTarget != null)
- runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-
- for (int j=0; j < vcs.length; j++)
- {
- //Get the J2EE level
- int versionId = J2EEUtils.getJ2EEVersion(vcs[j]);
- String versionString = String.valueOf(versionId);
-
-
-
- if (clientJ2EEVersion_ != null && clientJ2EEVersion_.length()>0 && clientJ2EEVersion_.equals(versionString))
- {
- if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, clientIds_.getRuntimeId()) &&
- ((runtimeTarget == null) ||
- ((runtimeTarget!=null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, clientIds_.getRuntimeId())))
- )
- {
- if (!vu.isProjectServiceProject(project, wsdlURI_, parser_))
- {
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(projectNames[i]);
- clientComponentName_ = vcs[j].getName();
- return;
- }
- }
- }
- }
- }
- }
-
- //No valid project was found. Enter a new project name.
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
- clientComponentName_ = ResourceUtils.getDefaultWebProjectName();
- }
- */
-
- protected IResource getResourceFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- return resource;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
-
- /*
- private void setClientDefaultEAR()
- {
- //Client-side
- String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
- IProject initialClientProject = ProjectUtilities.getProject(initialClientProjectName);
- //IProject defaultClientEAR = getDefaultEARFromClientProject(initialClientProject);
- String[] clientEARInfo = getDefaultEARFromClientProject(initialClientProject, clientComponentName_);
-
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(clientEARInfo[0]);
- clientEarComponentName_ = clientEARInfo[1];
- }
- */
- /*
- private void setClientDefaultEARNew()
- {
- String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
- IProject initialClientProject = (IProject)((new StringToIProjectTransformer()).transform(initialClientProjectName));
- IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(initialClientProject, clientComponentName_);
- if (earComps.length>0)
- {
- //Pick the first one
- IVirtualComponent earComp = earComps[0];
- String earProjectName = earComp.getProject().getName();
- String earComponentName = earComp.getName();
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(earProjectName);
- clientEarComponentName_ = earComponentName;
- }
- else
- {
- //Component is not associated with any EARs, so pick the first EAR you see with the correct J2EE version.
- IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
- if (allEarComps.length>0)
- {
- for (int i=0; i<allEarComps.length; i++)
- {
- if (clientJ2EEVersion_.equals(String.valueOf(J2EEUtils.getJ2EEVersion(allEarComps[i]))))
- {
- String earProjectName = allEarComps[i].getProject().getName();
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(earProjectName);
- clientEarComponentName_ = allEarComps[i].getName();
-
- }
-
- }
- }
- else
- {
- //there are no Ears.
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultClientEARProjectName());
- clientEarComponentName_ = ResourceUtils.getDefaultClientEARComponentName();
- }
-
-
- }
- }
- */
- /**
- *
- * @param project
- * @return
- *
- *
- */
-
-
- protected String getDefaultClientEarProjectName()
- {
- IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
- IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(clientProject);
- if (earComps.length>0)
- {
- //Pick the first one
- return earComps[0].getName();
- }
-
- //Either project does not exist or component is not associated with any EARs, so pick the first EAR you see with the correct J2EE version.
- IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
- if (allEarComps.length>0)
- {
- //TODO Choose an existing EAR that can be added to the server and who's J2EE level in consistent with
- //that of the selected project, if applicable. Picking the first one for now.
- return allEarComps[0].getName();
- }
- else
- {
- //there are no Ears.
- return ResourceUtils.getDefaultClientEARProjectName();
- }
- }
-
-
- /*
- private IStatus setClientDefaultServer()
- {
- IStatus status = Status.OK_STATUS;
- //Calculate reasonable default server based on initial project selection.
- String initialClientProjectName = runtimeClientTypes_.getChoice().getChoice().getList().getSelection();
- IProject initialClientProject = ProjectUtilities.getProject(initialClientProjectName);
- if (initialClientProject.exists())
- {
- String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialClientProject, clientComponentName_, clientIds_.getRuntimeId(), true);
- if (serverInfo!=null)
- {
- if (serverInfo[0]!=null && serverInfo[0].length()>0)
- {
- clientIds_.setServerId(serverInfo[0]);
- }
- if (serverInfo[1]!=null && serverInfo[1].length()>0)
- {
- clientIds_.setServerInstanceId(serverInfo[1]);
- }
- }
- }
- else //the project does not exist.
- {
- //Does the EAR exist?
- String initialClientEARProjectName = runtimeClientTypes_.getChoice().getChoice().getChoice().getList().getSelection();
- IProject initialClientEARProject = ProjectUtilities.getProject(initialClientEARProjectName);
- if (initialClientEARProject.exists())
- {
- String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialClientEARProject, clientEarComponentName_, clientIds_.getRuntimeId(), false);
- if (serverInfo!=null)
- {
- if (serverInfo[0]!=null && serverInfo[0].length()>0)
- {
- clientIds_.setServerId(serverInfo[0]);
- }
- if (serverInfo[1]!=null && serverInfo[1].length()>0)
- {
- clientIds_.setServerInstanceId(serverInfo[1]);
- }
- }
- }
- else
- {
- String[] serverInfo = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(clientIds_.getRuntimeId(), clientJ2EEVersion_);
- if (serverInfo!=null)
- {
- if (serverInfo[0]!=null && serverInfo[0].length()>0)
- {
- clientIds_.setServerId(serverInfo[0]);
- }
- if (serverInfo[1]!=null && serverInfo[1].length()>0)
- {
- clientIds_.setServerInstanceId(serverInfo[1]);
- }
- }
- else
- {
- //Since the project and the EAR are both new, try changing the J2EE level
- boolean foundServer = false;
- WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId());
- if (wsrt != null)
- {
- String[] versions = wsrt.getJ2eeLevels();
- if (versions != null && versions.length > 0)
- {
- for (int k=0; k<versions.length; k++)
- {
- //If this J2EE version is different from the current one, see if there is
- //a server available.
- if (clientJ2EEVersion_!=versions[k])
- {
- String[] si = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(clientIds_.getRuntimeId(), versions[k]);
- if (si!=null)
- {
- if (si[0]!=null && si[0].length()>0)
- {
- clientIds_.setServerId(si[0]);
- }
- if (si[1]!=null && si[1].length()>0)
- {
- clientIds_.setServerInstanceId(si[1]);
- }
- clientJ2EEVersion_ = versions[k];
- foundServer = true;
- break;
- }
-
- }
- }
- }
- }
- //No valid server runtimes appear to be configured, this is an error condition.
- if (!foundServer)
- {
- String runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById(clientIds_.getRuntimeId());
- String serverLabels = getServerLabels(clientIds_.getRuntimeId());
- status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_NO_SERVER_RUNTIME", new String[]{runtimeLabel, serverLabels}) );
- }
-
- }
- }
-
- }
-
- return status;
- }
- */
- protected String getServerLabels(String clientRuntimeId)
- {
- String[] validServerFactoryIds = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByClientRuntime(clientRuntimeId);
- //String[] validServerLabels = new String[validServerFactoryIds.length];
- StringBuffer validServerLabels = new StringBuffer();
- for (int i=0; i<validServerFactoryIds.length; i++)
- {
- if (i>0)
- {
- validServerLabels.append(", ");
- }
- validServerLabels.append(WebServiceRuntimeExtensionUtils.getServerLabelById(validServerFactoryIds[i]));
-
- }
- return validServerLabels.toString();
- }
-
-
- protected void updateClientProject(String projectName, String serviceTypeId)
- {
- boolean isEJB = false;
- String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(serviceTypeId);
- isEJB = (implId.equals("org.eclipse.jst.ws.wsImpl.ejb"));
- String[] updatedNames = ResourceUtils.getClientProjectComponentName(projectName, projectName, isEJB);
- clientProjectName_ = updatedNames[0];
- clientComponentType_ = getDefaultClientProjectTemplate();
-
- }
-
-
- /*
- protected void updateClientEARs()
- {
- //Set EAR selection to null if the project/server defaults imply an EAR should not be created
- String clientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
- IProject clientProject = ProjectUtilities.getProject(clientProjectName);
- if (clientProject != null && clientProject.exists())
- {
- //Get the runtime target on the serviceProject
- IRuntime clientTarget = ServerSelectionUtils.getRuntimeTarget(clientProjectName);
- String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(clientProject));
- if (clientTarget != null)
- {
- if (!ServerUtils.isTargetValidForEAR(clientTarget.getRuntimeType().getId(),j2eeVersion))
- {
- //Default the EAR selection to be empty
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setIndex(-1);
- clientEarComponentName_="";
- clientNeedEAR_ = false;
- }
- }
-
- }
- else
- {
- String serverId = clientIds_.getServerId();
- if (serverId != null)
- {
- //Use the server type
- String clientServerTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId);
- if (clientServerTargetId!=null && clientServerTargetId.length()>0)
- {
- if (!ServerUtils.isTargetValidForEAR(clientServerTargetId,clientJ2EEVersion_))
- {
- //Default the EAR selection to be empty
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setIndex(-1);
- clientEarComponentName_="";
- clientNeedEAR_ = false;
- }
- }
- }
- }
- }
- */
-
- private void setDefaultsForExtension(IEnvironment env)
- {
- IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils2.getClientRuntime(clientRuntimeId_);
- if (wsrt != null)
- {
- WebServiceClientInfo wsInfo = new WebServiceClientInfo();
- wsInfo.setServerFactoryId(clientIds_.getServerId());
- wsInfo.setServerInstanceId(clientIds_.getServerInstanceId());
- wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
- wsInfo.setWebServiceRuntimeId(clientIds_.getRuntimeId());
- wsInfo.setWsdlURL(wsdlURI_);
-
- webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
- WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
- if (resourceContext_ != null)
- {
- context_ = new SimpleContext(true, true, true, true, true, true, test_, false, scenario, resourceContext_.isOverwriteFilesEnabled(), resourceContext_
- .isCreateFoldersEnabled(), resourceContext_.isCheckoutFilesEnabled());
- }
- }
-
- }
-
- public void setClientInitialSelection(IStructuredSelection selection)
- {
- if (clientInitialProject_ == null)
- {
- clientInitialProject_ = getProjectFromInitialSelection(selection);
- }
- }
-
- public void setClientInitialProject(IProject clientInitialProject)
- {
- clientInitialProject_ = clientInitialProject;
- }
-
- /**
- * @param initialInitialSelection_ The initialInitialSelection_ to set.
- */
- public void setInitialInitialSelection(IStructuredSelection initialInitialSelection)
- {
- initialInitialProject_ = getProjectFromInitialSelection(initialInitialSelection);
- }
-
- public boolean getClientNeedEAR()
- {
- return clientNeedEAR_;
- }
-
- /**
- * @param parser_ The parser_ to set.
- */
- public void setWebServicesParser(WebServicesParser parser) {
- parser_ = parser;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
- }
-
- public void setTestService(boolean testService)
- {
- test_ = testService;
- }
-
- public void setResourceContext( ResourceContext resourceContext )
- {
- resourceContext_ = resourceContext;
- }
-
- private IProject getProjectFromInitialSelection(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;
- }
-
- private String getComponentNameFromInitialSelection(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;
-
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
- if (comp!=null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- /*
- private String getClientProjectTypeFromRuntimeId(IProject p, String runtimeId)
- {
- //Navigate the runtimeClientTypes to see if we can navigate from the provided
- //runtime to the provided project's name.
- String pName = p.getName();
- String[] runtimeIds = getRuntime2ClientTypes().getList().getList();
- int numberOfRuntimes = runtimeIds.length;
- //Get the index of the runtimeId we are interested in
- for (int i=0; i<numberOfRuntimes; i++)
- {
- if (runtimeIds[i].equals(runtimeId))
- {
- //Get the list of client project types for this runtimeId
- SelectionListChoices clientProjectTypesToProjects= getRuntime2ClientTypes().getChoice(i);
- String[] clientProjectTypes = clientProjectTypesToProjects.getList().getList();
- for (int j=0; j<clientProjectTypes.length; j++)
- {
- //Get the list of projects for this clientProjectType. If pName
- //is in this list, we know the runtimeId supports this project
- //and we know the client project type.
- String[] clientProjects = clientProjectTypesToProjects.getChoice(j).getList().getList();
- for (int k=0; k<clientProjects.length; k++)
- {
- if (clientProjects[k].equals(pName))
- {
- //Found the project!!
- return clientProjectTypes[j];
- }
- }
- }
-
- }
- }
-
- //We didn't find the project under any of this runtimes client project types.
- //This means that this runtime does not support that client type. Return null
- return null;
- }
- */
-
- protected String[] getAllFlexibleProjects()
- {
- Vector v = new Vector();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < projects.length; i++)
- {
- if (!projects[i].getName().equals("Servers") && !projects[i].getName().startsWith("."))
- {
- v.add(projects[i].getName());
- }
- }
-
- return (String[])v.toArray(new String[0]);
-
- }
-
- /**
- * This inner class is being used to pass around Web service runtime
- * and J2EE level information.
- *
- */
- protected class WSRuntimeJ2EEType
- {
- private String wsrId_;
- private String j2eeVersionId_;
- private String clientProjectTypeId; //only used for client-side defaulting
-
- public WSRuntimeJ2EEType()
- {
- //making this ctor public so that subclasses can instantiate.
- }
- /**
- * @return Returns the j2eeVersionId_.
- */
- public String getJ2eeVersionId()
- {
- return j2eeVersionId_;
- }
- /**
- * @param versionId_ The j2eeVersionId_ to set.
- */
- public void setJ2eeVersionId(String versionId_)
- {
- j2eeVersionId_ = versionId_;
- }
- /**
- * @return Returns the wsrId_.
- */
- public String getWsrId()
- {
- return wsrId_;
- }
- /**
- * @param wsrId_ The wsrId_ to set.
- */
- public void setWsrId(String wsrId_)
- {
- this.wsrId_ = wsrId_;
- }
-
- /**
- * @return Returns the clientProjectTypeId.
- */
- public String getClientProjectTypeId()
- {
- return clientProjectTypeId;
- }
- /**
- * @param clientProjectTypeId The clientProjectTypeId to set.
- */
- public void setClientProjectTypeId(String clientProjectTypeId)
- {
- this.clientProjectTypeId = clientProjectTypeId;
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
deleted file mode 100644
index 33352d4d1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
+++ /dev/null
@@ -1,729 +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.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-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.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-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.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-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.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IRuntime;
-
-public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
-
-
-
- private final String EAR_PERMITTED_PROJECT_TYPE = "EAR_PERMITTED_PROJECT_TYPE";
- //private final String JAVA_PROJECT_TYPE_ID = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless";
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- //private SelectionListChoices projects_;
-
- private boolean needEAR_;
-
- private TypeRuntimeServer trsIds_;
-
- //private String j2eeVersion_;
-
- private String projectTypeId_ = EAR_PERMITTED_PROJECT_TYPE;
-
- private Listener statusListener_;
-
- private Text messageText_;
-
- private boolean isClient_ = false;
-
- private MessageUtils msgUtils;
-
- private byte CREATE_PROJECT = (byte) 1;
-
- private byte CREATE_EAR = (byte) 2;
-
- private byte ADD_EAR_ASSOCIATION = (byte) 4;
-
- private Combo moduleProject_;
- private Combo earProject_;
- private Combo projectType_;
-
- private String[] templates_;
-
- //private String componentType_;
-
- private ModifyListener moduleProjectListener_;
- private ModifyListener moduleListener_;
- private ModifyListener earProjectListener_;
- private ModifyListener earModuleListener_;
-
- private String initialModuleName_;
-
-
-
- /*
- * CONTEXT_ID PWRS0006 for the service-side Web project combo box of the
- * runtime selection Page
- */
- private String INFOPOP_PWRS_COMBO_PROJECT = pluginId_ + ".PWRS0006";
-
- //private Combo module_;
-
- /* CONTEXT_ID PWRS0012 for the EAR combo box of the runtime selection Page */
- private String INFOPOP_PWRS_COMBO_EAR = pluginId_ + ".PWRS0012";
-
- /* CONTEXT_ID PWRS0018 for the client project type combo box of the runtime selection Page */
- private String INFOPOP_PWRS_COMBO_CLIENT_PROJECT_TYPE = pluginId_ + ".PWRS0018";
-
- /* CONTEXT_ID PWRS0024 for the service project type combo box of the runtime selection Page */
- private String INFOPOP_PWRS_COMBO_SERVICE_PROJECT_TYPE = pluginId_ + ".PWRS0018";
-
- //private Combo earModule_;
-
- /*
- * Default Constructor
- */
- public ProjectSelectionWidget() {
- }
-
- /*
- * ProjectSelectionWidget @param isClient
- */
- public ProjectSelectionWidget(boolean isClient) {
- this.isClient_ = isClient;
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
- msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_);
-
- statusListener_ = statusListener;
-
- if (isClient_)
- {
- projectType_ = uiUtils.createCombo(parent, "LABEL_CLIENT_TYPE", "TOOLTIP_PWCR_COMBO_CLIENT_TYPE", INFOPOP_PWRS_COMBO_CLIENT_PROJECT_TYPE, SWT.SINGLE | SWT.BORDER);
- moduleProject_ = uiUtils.createCombo(parent, "LABEL_CLIENT_PROJECT", "LABEL_CLIENT_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- //module_ = uiUtils.createCombo(parent, "LABEL_CLIENT_MODULE", "LABEL_CLIENT_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- earProject_ = uiUtils.createCombo(parent, "LABEL_CLIENT_EAR_PROJECT", "LABEL_CLIENT_EAR_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- //earModule_ = uiUtils.createCombo(parent, "LABEL_CLIENT_EAR_MODULE", "LABEL_CLIENT_EAR_MODULE", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER );
- }
- else
- {
- projectType_ = uiUtils.createCombo(parent, "LABEL_SERVICE_TYPE", "TOOLTIP_PWCR_COMBO_SERVICE_TYPE", INFOPOP_PWRS_COMBO_SERVICE_PROJECT_TYPE, SWT.SINGLE | SWT.BORDER);
- moduleProject_ = uiUtils.createCombo(parent, "LABEL_SERVICE_PROJECT", "LABEL_SERVICE_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- //module_ = uiUtils.createCombo(parent, "LABEL_SERVICE_MODULE", "LABEL_SERVICE_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- earProject_ = uiUtils.createCombo(parent, "LABEL_SERVICE_EAR_PROJECT", "LABEL_SERVICE_EAR_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- //earModule_ = uiUtils.createCombo(parent, "LABEL_SERVICE_EAR_MODULE", "LABEL_SERVICE_EAR_MODULE", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER );
- }
-
- //Temporarily remove the listeners
-
- moduleProjectListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- handleProjectChanged();
- statusListener_.handleEvent( null );
- }
- };
- /*
- moduleListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- handleModuleChanged();
- statusListener_.handleEvent( null );
- }
- };
-
- earProjectListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- handleEarProjectChanged();
- statusListener_.handleEvent( null );
- }
- };
-
- earModuleListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- statusListener_.handleEvent( null );
- }
- };
- */
- // message area
- messageText_ = uiUtils.createText(parent, "LABEL_NO_LABEL", "LABEL_NO_LABEL", null, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY);
- setEarProjectItems();
-
- return this;
- }
-
- private void listenersOn()
- {
- moduleProject_.addModifyListener( moduleProjectListener_ );
- //earProject_.addModifyListener( earModuleListener_ );
- }
-
- private void listenersOff()
- {
- moduleProject_.removeModifyListener( moduleProjectListener_ );
- //earModule_.removeModifyListener( earModuleListener_ );
- }
-
- /*
- private void handleModuleProjectChanged(String moduleName)
- {
- String projectName = moduleProject_.getText();
- IProject project = null;
-
- if( projectName.equals( "" ) )
- {
- module_.setItems( new String[0] );
-
- return;
- }
-
- project = ProjectUtilities.getProject( projectName );
-
-
- IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, componentType_ );
- String[] modules = new String[components.length];
-
- for( int index = 0; index < components.length; index++ )
- {
- modules[index] = components[index].getName();
- }
-
- module_.setItems( modules );
-
- if( modules.length > 0 )
- {
- if (moduleName != null)
- {
- module_.setText(moduleName);
- }
- else
- {
- module_.setText( modules[0] );
- }
-
- }
- else
- {
- module_.setText( projectName );
- }
-
- }
- */
-
- /*
- private void handleModuleChanged()
- {
- IVirtualComponent component = getEarModuleForModule();
-
- if( component != null )
- {
- String earProject = component.getProject().getName();
- String componentName = component.getName();
-
- // This will cause the module list to be update via a listener.
- earProject_.setText( earProject );
- earModule_.setText( componentName );
- }
- else
- {
- earProject_.setText( "" );
- earModule_.setText( "" );
- }
-
- updateEAREnabledState();
- }
- */
-
- /*
- private void handleEarProjectChanged()
- {
-
- String projectName = earProject_.getText();
-
- if( projectName != null && !projectName.equals( "" ))
- {
- IProject project = ProjectUtilities.getProject( projectName );
-
- IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, J2EEUtils.EAR );
- String[] earModules = new String[components.length];
-
- for( int index = 0; index < components.length; index++ )
- {
- earModules[index] = components[index].getName();
- }
-
- earModule_.setItems( earModules );
-
- if( earModules.length > 0 )
- {
- earModule_.setText( earModules[0] );
- }
- else
- {
- earModule_.setText( projectName );
- }
- }
- else
- {
- earModule_.setItems( new String[0] );
- }
- }
- */
-
- /*
- private IVirtualComponent getEarModuleForModule()
- {
- String projectName = moduleProject_.getText();
-
- if( projectName.equals( "" ) )
- {
- return null;
- }
-
- IProject project = ProjectUtilities.getProject( projectName );
-
- IVirtualComponent[] components = J2EEUtils.getReferencingEARComponents( project );
-
- return components.length == 0 ? null : components[0];
- }
- */
-
- /*
- public void setProjectChoices(SelectionListChoices projects)
- {
- listenersOff();
-
- projects_ = projects;
-
- String selectedModuleProject = projects.getList().getSelection();
- String selectedEarModuleProject = projects.getChoice().getList().getSelection();
- String[] projectNames = getProjects();
-
- moduleProject_.setItems( projectNames );
- moduleProject_.setText( selectedModuleProject );
- earProject_.setItems( projectNames );
- earProject_.setText( selectedEarModuleProject );
-
- handleModuleProjectChanged(initialModuleName_);
- handleModuleChanged();
- updateEAREnabledState();
- listenersOn();
- }
- */
-
-
-
- /*
- public SelectionListChoices getProjectChoices()
- {
- return projects_;
- }
- */
-
- public String getProjectName()
- {
- return moduleProject_.getText();
- }
-
- public void setProjectName( String name )
- {
- listenersOff();
- moduleProject_.setText( name );
- initialModuleName_ = name;
- handleProjectChanged();
- listenersOn();
- }
-
- public String getEarProjectName()
- {
- return earProject_.getText();
- }
-
- public void setEarProjectName( String name )
- {
- listenersOff();
- earProject_.setText( name );
- listenersOn();
- }
-
- public void setComponentType( String type )
- {
- projectType_.setText(type);
- }
-
- public String getComponentType()
- {
- int idx = projectType_.getSelectionIndex();
- if (templates_ != null)
- {
- return templates_[idx];
- }
- else
- {
- String templateLabel = projectType_.getText();
- String templateId = FacetUtils.getTemplateIdByLabel(templateLabel);
- return templateId;
- }
-
- }
-
- public boolean getNeedEAR()
- {
- return needEAR_;
- }
-
- public void setNeedEAR(boolean b)
- {
- needEAR_ = b;
- if (needEAR_)
- {
- earProject_.setEnabled(true);
- populateEARCombos();
- }
- else
- {
- earProject_.setEnabled(false);
- earProject_.setText("");
- }
- }
-
- public void setTypeRuntimeServer(TypeRuntimeServer trs)
- {
- trsIds_ = trs;
- listenersOff();
- updateEARState();
- listenersOn();
- }
-
- public void setProjectTypeId(String id)
- {
- projectTypeId_ = id;
- }
-
- private String[] getProjects()
- {
- IProject[] projects = J2EEUtils.getAllFlexibleProjects();
- String[] projectNames = new String[projects.length];
-
- for( int index = 0; index < projects.length; index++ )
- {
- projectNames[index] = projects[index].getName();
- }
-
- return projectNames;
- }
-
- public void refreshProjectItems()
- {
- listenersOff();
- String selectedModuleProject = moduleProject_.getText();
- String runtimeId = trsIds_.getRuntimeId();
- String typeId = trsIds_.getTypeId();
-
- //Get all the projects that are compatible with the type and runtime
- String[] projectNames = null;
- if (isClient_)
- {
- projectNames = WebServiceRuntimeExtensionUtils2.getProjectsForClientTypeAndRuntime(typeId, runtimeId);
- }
- else
- {
- projectNames = WebServiceRuntimeExtensionUtils2.getProjectsForServiceTypeAndRuntime(typeId, runtimeId);
- }
-
- moduleProject_.setItems(projectNames);
- moduleProject_.setText(selectedModuleProject);
- System.out.println("moduleProject_ = "+moduleProject_.getText()+"..");
- handleProjectChanged();
- listenersOn();
- }
-
- public void setEarProjectItems()
- {
- IVirtualComponent[] ears = J2EEUtils.getAllEARComponents();
- String[] earProjectNames = new String[ears.length];
- for (int i=0; i<earProjectNames.length; i++)
- {
- earProjectNames[i]=ears[i].getProject().getName();
- }
- earProject_.setItems(earProjectNames);
-
- if (earProjectNames.length > 0)
- earProject_.select(0);
- }
-
- private void handleProjectChanged()
- {
- updateEARState();
- updateTemplates();
- }
-
- private void updateTemplates()
- {
- String projectName = moduleProject_.getText();
- if (projectName != null && projectName.length()>0)
- {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project.exists())
- {
- projectType_.setEnabled(false);
- projectType_.setText("");
- }
- else
- {
- populateProjectTypeCombo();
- projectType_.setEnabled(true);
- }
- }
- }
-
- private void populateProjectTypeCombo()
- {
- String[] templates = null;
- if (isClient_)
- {
- templates = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(trsIds_.getTypeId(), trsIds_.getRuntimeId());
- }
- else
- {
- templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(trsIds_.getTypeId(), trsIds_.getRuntimeId());
- }
-
- String[] templateLabels = FacetUtils.getTemplateLabels(templates);
- projectType_.setItems(templateLabels);
- templates_ = templates;
-
- if (templates.length > 0)
- {
- //If a "..web.." template is there, pick that as the default.
- int webTemplateIndex = getWebTemplateIndex(templates);
- if (webTemplateIndex > -1)
- {
- projectType_.select(webTemplateIndex);
- }
- else
- {
- projectType_.select(0);
- }
-
- }
- }
-
- private int getWebTemplateIndex(String[] templateIds)
- {
- for (int i=0; i<templateIds.length; i++)
- {
- if (templateIds[i].indexOf("web") > -1)
- {
- return i;
- }
- }
-
- return -1;
- }
-
- private void updateEARState()
- {
- if(!projectNeedsEAR(moduleProject_.getText()))
- {
- earProject_.setEnabled(false);
- earProject_.setText("");
- needEAR_ = false;
- }
- else
- {
- needEAR_ = true;
- earProject_.setEnabled(true);
- populateEARCombos();
- }
-
- }
-
- private void populateEARCombos()
- {
- earProject_.removeAll();
- String projectName = moduleProject_.getText();
- if (projectName != null && projectName.length() > 0)
- {
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (proj.exists())
- {
- IVirtualComponent[] ears = J2EEUtils.getReferencingEARComponents(proj);
- if (ears != null && ears.length > 0)
- {
- for (int i = 0; i < ears.length; i++)
- {
- earProject_.add(ears[i].getName());
- }
- earProject_.select(0);
- return;
- }
- }
-
- String earName = projectName + "EAR";
- earProject_.setText(earName);
- }
- else
- {
- setEarProjectItems();
- }
- }
-
- private boolean projectNeedsEAR(String projectName)
- {
- //Use the server type
- if (trsIds_ != null && trsIds_.getServerId() != null)
- {
- String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(trsIds_.getServerId());
- if (targetId!=null && targetId.length()>0)
- {
- if (!ServerUtils.isTargetValidForEAR(targetId,"13")) //rm j2ee
- {
- return false;
- }
- }
- }
-
- return true;
- }
-
- private IStatus handleSetMessageText() {
- IStatus status = Status.OK_STATUS;
- try {
- byte result = (byte) 0;
- if (moduleProject_.getText().length() != 0 && earProject_.getText().length() != 0) {
- String projectText = moduleProject_.getText();
- String earText = earProject_.getText();
- IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectText);
- IProject ear = ResourceUtils.getWorkspaceRoot().getProject(earText);
- if (project != null) {
- if (!project.exists()) {
- result = (byte) (result | CREATE_PROJECT);
- }
- if (!ear.exists()) {
- result = (byte) (result | CREATE_EAR);
- }
-
- if (project.exists() && J2EEUtils.exists(project) && ear.exists() && J2EEUtils.exists(ear)) {
- if (!J2EEUtils.isComponentAssociated(ear, project)) result = (byte) (result | ADD_EAR_ASSOCIATION);
- }
- }
- }
- if (isClient_) {
- messageText_.setText(getValidationMessage(result, msgUtils.getMessage("MSG_CLIENT_SUB")));
- }
- else {
- messageText_.setText(getValidationMessage(result, msgUtils.getMessage("MSG_SERVICE_SUB")));
- }
- }
- catch (Exception e) {
- return StatusUtils.errorStatus( msgUtils.getMessage("PAGE_MSG_VALIDATION_INTERNAL_ERROR"), e );
- }
- return status;
- }
-
- private String getValidationMessage(byte result, String serviceOrClient) {
- String msg = null;
- switch (result) {
- case 0:
- return "";
- case 1:
- case 5:
- msg = "MSG_PROJECT_WILL_BE_CREATED";
- break;
- case 2:
- case 6:
- msg = "MSG_EAR_WILL_BE_CREATED";
- break;
- case 3:
- case 7:
- msg = "MSG_PROJECT_AND_EAR_CREATED";
- break;
- case 4:
- msg = "MSG_EAR_WILL_BE_ASSOCIATED";
- break;
- }
- return msg != null ? msgUtils.getMessage(msg, new Object[] { serviceOrClient}) : "";
- }
-
- public IStatus getStatus()
- {
- IStatus finalStatus = Status.OK_STATUS;
- handleSetMessageText();
- String projectText = moduleProject_.getText();
- String earText = earProject_.getText();
- String moduleText = msgUtils.getMessage( "MSG_MODULE" );
-
- if (projectText==null || projectText.length()==0)
- {
- if (isClient_)
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_CLIENT_PROJECT_EMPTY", new String[]{""} ) );
- else
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_SERVICE_PROJECT_EMPTY", new String[]{""} ) );
- }
-
- if (needEAR_ && (earText==null || earText.length()==0))
- {
- if (isClient_)
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_CLIENT_EAR_EMPTY", new String[]{""} ) );
- else
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_SERVICE_EAR_EMPTY", new String[]{""} ) );
- }
-
-// TODO: Defect 107997 - Revisit prject and module creation logic
-// if( !FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp() )
-// {
-// IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectText);
-//
-// if( project != null && project.exists() )
-// {
-// String moduleName = module_.getText();
-// IVirtualComponent component = J2EEUtils.getVirtualComponent( project, moduleName );
-//
-// if( !component.exists() && !moduleName.equals( projectText ) )
-// {
-// finalStatus = new SimpleStatus("",msgUtils.getMessage("MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME" ),Status.ERROR);
-// }
-// }
-// }
-
- return finalStatus;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java
deleted file mode 100644
index 028ce08e7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java
+++ /dev/null
@@ -1,255 +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.ui.widgets.runtime;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-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.ModifyListener;
-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.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-
-
-public class RuntimeServerSelectionWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private Text runtime_;
- private Text server_;
- //private Text j2eeVersionText;
- private Composite parent_;
- private boolean isClientContext_;
- private TypeRuntimeServer ids_;
- //private String j2eeVersion_;
- private MessageUtils msgUtils_;
- private Listener statusListener_;
-
- /* CONTEXT_ID PWRS0004 for the service-side runtime selection of the runtime selection Page */
- private String INFOPOP_PWRS_GROUP_SERVICE_RUNTIME = pluginId_ + ".PWRS0004";
-
- /* CONTEXT_ID PWRS0005 for the service-sdie server selection of the runtime selection Page */
- private String INFOPOP_PWRS_GROUP_SERVICE_SERVER = pluginId_ + ".PWRS0005";
-
- /* CONTEXT_ID PWRS0009 for the J2EE version selection of the runtime selection Page */
- private String INFOPOP_PWRS_J2EE_VERSION = pluginId_ + ".PWRS0009";
-
- public RuntimeServerSelectionWidget( boolean isClientScenario )
- {
- isClientContext_ = isClientScenario;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
- */
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_ );
-
- parent_ = parent;
- statusListener_ = statusListener;
-
- // Runtime label and text
- runtime_ = uiUtils.createText( parent, "LABEL_RUNTIMES_LIST",
- "TOOLTIP_PWRS_TEXT_RUNTIME",
- INFOPOP_PWRS_GROUP_SERVICE_RUNTIME, SWT.READ_ONLY );
-
- // Server label and text
- server_ = uiUtils.createText( parent, "LABEL_SERVERS_LIST",
- "TOOLTIP_PWRS_TEXT_SERVER",
- INFOPOP_PWRS_GROUP_SERVICE_SERVER, SWT.READ_ONLY );
-
- Button editButton = new Button( parent, SWT.NONE );
- editButton.setText( msgUtils_.getMessage("LABEL_EDIT_BUTTON"));
- editButton.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleEditButton();
- }
- } );
-
- // Dummy label that goes on the right side of the edit button.
- new Label( parent, SWT.NONE );
-
- return this;
- }
-
- public TypeRuntimeServer getTypeRuntimeServer()
- {
- return ids_;
- }
-
- public void setTypeRuntimeServer( TypeRuntimeServer ids )
- {
- ids_ = ids;
- setLabels();
- }
-
- private void setLabels()
- {
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById( ids_.getRuntimeId() );
- String serverLabel = null;
-
- if( ids_.getServerInstanceId() == null )
- {
- // Get the label for the general server type.
- //WebServiceServer server = registry.getWebServiceServerByFactoryId( ids_.getServerId() );
- //serverLabel = server == null ? "" : server.getLabel();
- String serverId = ids_.getServerId();
- if (serverId != null)
- serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
- }
- else
- {
- // Get the label for the server instance.
- //serverLabel = registry.getServerInstanceLabelFromInstanceId( ids_.getServerInstanceId() );
- String serverInstanceId = ids_.getServerInstanceId();
- if (serverInstanceId != null)
- serverLabel = WebServiceRuntimeExtensionUtils2.getServerInstanceLabelFromInstanceId(serverInstanceId);
- }
- // rskreg
- runtimeLabel = runtimeLabel == null ? "" : runtimeLabel;
-
- runtime_.setText( runtimeLabel );
- if (serverLabel != null)
- server_.setText( serverLabel );
-
- }
-
- public void handleEditButton()
- {
- byte mode = isClientContext_ ? (byte)1 : (byte)0;
-
- RuntimeServerSelectionDialog dialog
- = dialog = new RuntimeServerSelectionDialog( parent_.getShell(), mode, ids_, "14" ); //rm j2ee
- dialog.create();
- dialog.handleServerViewSelectionEvent();
- int result = dialog.open();
-
- if (result == Window.OK)
- {
- ids_ = dialog.getTypeRuntimeServer();
- setLabels();
- statusListener_.handleEvent(null);
- }
- }
-
- public void addModifyListener(ModifyListener listener)
- {
- if (runtime_ != null)
- runtime_.addModifyListener(listener);
- }
-
- public void removeModifyListener(ModifyListener listener)
- {
- if (runtime_ != null)
- runtime_.removeModifyListener(listener);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public IStatus getStatus()
- {
- IStatus status = Status.OK_STATUS;
- String scenario = isClientContext_ ? msgUtils_.getMessage( "MSG_CLIENT_SUB" )
- : msgUtils_.getMessage( "MSG_SERVICE_SUB" );
-
- String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById( ids_.getRuntimeId() );
- String serverLabel = ids_.getServerId() == null ? "" : WebServiceRuntimeExtensionUtils2.getServerLabelById(ids_.getServerId());
-
-
- if( ids_.getRuntimeId() == null || runtimeLabel == null || runtimeLabel.equals("" ))
- {
- status = StatusUtils.errorStatus(msgUtils_.getMessage( "MSG_NO_RUNTIME", new String[]{ scenario } ) );
- }
- else if( ids_.getServerId() == null || serverLabel.equals( "" ))
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage( "MSG_NO_SERVER", new String[]{ scenario } ) );
- }
-
- //Check if only stub runtime is available for the selected server type
-
- String serverFactoryId = ids_.getServerId();
- //
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType!=null) {
-
- //Find a Runtime which is not a stub
- //IRuntime nonStubRuntime = 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];
- String thisRuntimeTypeId = runtime.getRuntimeType().getId();
- if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
- //Found an appropriate IRuntime that is not a stub
- foundNonStubRuntime=true;
- break;
- }
- }
-
- if (!foundNonStubRuntime)
- {
- String servertypeLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId);
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_STUB_ONLY",new String[]{servertypeLabel}) );
- }
- }
-
- //
-
- //--------- check if WSCT exists for these selections
- if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && isClientContext_)
- {
-
- if (!WebServiceRuntimeExtensionUtils2.isServerClientRuntimeTypeSupported( ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId()))
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ) );
- }
-
- }
-
- //--------- check if WSSRT exists for these selections
- if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && !isClientContext_)
- {
-
- if (!WebServiceRuntimeExtensionUtils2.isServerRuntimeTypeSupported(ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId())) {
- status = StatusUtils.errorStatus( msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ) );
- }
-
- }
-
-
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
deleted file mode 100644
index c29b8d8f8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
+++ /dev/null
@@ -1,348 +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.ui.widgets.test;
-
-import java.util.List;
-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.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-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.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the
-* JBWizard Plugin
-*
-*
-*/
-public class ClientTestDelegateCommand extends AbstractDataModelOperation
-{
- private WebServiceTestRegistry testRegistry;
- private SelectionList testFacilities;
- private String jspFolder;
- private BooleanSelection[] methods;
- private String sampleServerTypeID;
- private IServer sampleExistingServer;
- private String proxyBean;
- private String sampleProject;
- private String sampleP;
- private String clientProject;
- private String clientP;
- private String clientC;
- private boolean clientNeedEAR;
- private String clientEarProjectName;
- private String clientEarComponentName;
- private TypeRuntimeServer serverIds;
- private String serviceProject;
- private String serviceP;
- private String wsdlServiceURL;
- private boolean isTestWidget = false;
- private String setEndpointMethod;
- private List endpoints;
-
- public ClientTestDelegateCommand ()
- {
- testRegistry = WebServiceTestRegistry.getInstance();
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- String clientTestID = testFacilities.getSelection();
-
- //Get the webservice extension
-
- WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(clientTestID);
- IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();
- TestInfo testInfo = getTestInfo();
-
- status = commandFactoryExecution(iwst.generate(testInfo),env, monitor );
- if(status.getSeverity() == Status.ERROR){
- return status;
- }
- status = commandFactoryExecution(iwst.launch(testInfo),env, monitor );
- if(status.getSeverity() == Status.ERROR){
- return status;
- }
-
- return status;
- }
-
- private IStatus commandFactoryExecution(ICommandFactory commandFactory,IEnvironment env, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
-
- while(commandFactory.hasNext())
- {
- AbstractDataModelOperation operation = commandFactory.getNextCommand();
- operation.setEnvironment( env );
-
- try
- {
- status = operation.execute( monitor, null );
- }
- catch( Exception exc )
- {
- status = StatusUtils.errorStatus( exc );
- }
-
- if(status.getSeverity() == Status.ERROR){
- IStatusHandler sHandler = env.getStatusHandler();
- sHandler.reportError(status);
- return status;
- }
- }
- return status;
- }
-
-
- //Helper method which sets up the TestInfo data structure
- private TestInfo getTestInfo()
- {
- IServer serviceExistingServer = null;
- String serviceServerTypeID = null;
-
- //service server info
- if(serverIds != null){
- if (serverIds.getServerInstanceId() != null)
- serviceExistingServer = ServerCore.findServer(serverIds.getServerInstanceId());
- }
- if (serviceExistingServer != null)
- serviceServerTypeID = serviceExistingServer.getServerType().getId();
-
-
- if(clientProject != null){
- int index = clientProject.indexOf("/");
- if (index!=-1){
- clientP = clientProject.substring(0,index);
- clientC = clientProject.substring(index + 1);
- }
- }
-
-
- if(sampleProject != null){
- int index = sampleProject.indexOf("/");
- if (index!=-1){
- sampleP = sampleProject.substring(0,index);
- }
- }
-
-
-
- TestInfo testInfo = new TestInfo();
- testInfo.setClientExistingServer(sampleExistingServer);
- testInfo.setClientServerTypeID(sampleServerTypeID);
- testInfo.setJspFolder(jspFolder);
- testInfo.setEndpoint(endpoints);
- testInfo.setGenerationProject(sampleP);
- testInfo.setProxyBean(proxyBean);
- testInfo.setSetEndpointMethod(setEndpointMethod);
- testInfo.setClientProject(clientP);
- testInfo.setClientModule(clientC);
- testInfo.setClientNeedEAR(clientNeedEAR);
- testInfo.setClientEARProject(clientEarProjectName);
- testInfo.setClientEARModule(clientEarComponentName);
- testInfo.setMethods(methods);
-
- //if this is a client scenario the service stuff is empty
- if(serviceServerTypeID == null){
- serviceServerTypeID = sampleServerTypeID;
- serviceExistingServer = sampleExistingServer;
- }
-
-
- testInfo.setServiceServerTypeID(serviceServerTypeID);
- testInfo.setServiceExistingServer(serviceExistingServer);
- //wsdl stuff
- testInfo.setServiceProject(getWSDLProject());
- testInfo.setWsdlServiceURL(wsdlServiceURL);
- return testInfo;
- }
-
-
-
- //The test facilities retrieved from the extension
- //plus the default
- public void setTestFacility(SelectionList selection)
- {
- testFacilities = selection;
- }
-
- public void setFolder(String folder)
- {
- }
-
- public void setJspFolder(String jspFolder)
- {
- this.jspFolder = jspFolder;
- }
-
- public void setMethods(BooleanSelection[] methods)
- {
- this.methods = methods;
- }
-
- public void setRunClientTest(boolean runClientTest)
- {
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- public void setSampleProject(String sampleProject)
- {
- this.sampleProject = sampleProject;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- public void setScenarioContext(ScenarioContext scenarioContext)
- {
- }
-
- public void setClientTestRegistry(WebServiceTestRegistry testRegistry)
- {
- this.testRegistry = testRegistry;
- }
-
- public void setSampleServerTypeID(String sampleServerTypeID)
- {
- this.sampleServerTypeID = sampleServerTypeID;
- }
-
- public void setSampleExistingServer(IServer sampleExistingServer)
- {
- this.sampleExistingServer = sampleExistingServer;
- }
-
- public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
- {
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
- {
- serverIds = ids;
- }
-
- public String getSampleServerTypeID()
- {
- return sampleServerTypeID;
- }
-
- public IServer getSampleExistingServer()
- {
- return sampleExistingServer;
- }
-
- public void setClientServer(String clientServer)
- {
- }
-
- public void setServerProject(String serviceProject)
- {
- this.serviceProject = serviceProject;
- }
-
- public String getWSDLProject()
- {
- if(serviceProject != null){
- int index = serviceProject.indexOf("/");
- if (index!=-1) {
- serviceP = serviceProject.substring(0,index);
- return serviceP;
- }
- }
-
- return clientP;
- }
-
- public void setWsdlURI(String wsdlServiceURL)
- {
- this.wsdlServiceURL = wsdlServiceURL;
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- }
-
- public boolean getIsTestWidget()
- {
- return isTestWidget;
- }
-
- public void setClientEarProjectName(String clientEarProjectName)
- {
- this.clientEarProjectName = clientEarProjectName;
- }
-
- public void setClientEarComponentName(String clientEarComponentName)
- {
- this.clientEarComponentName = clientEarComponentName;
- }
-
-
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public void setSetEndpointMethod(String setEndpointMethod)
- {
- this.setEndpointMethod = setEndpointMethod;
- }
- /**
- * @param endpoint The endpoint to set.
- */
- 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 boolean getClientNeedEAR() {
- return clientNeedEAR;
- }
-
- public void setClientNeedEAR(boolean clientNeedEAR) {
- this.clientNeedEAR = clientNeedEAR;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
deleted file mode 100644
index f86bb2619..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
+++ /dev/null
@@ -1,59 +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.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.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-public class ClientTestFragment extends BooleanFragment
-{
- private boolean testService;
- private boolean genProxy;
- private boolean launchedTest = false;
-
- public ClientTestFragment( String id )
- {
- SequenceFragment clientTestRoot = new SequenceFragment();
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return testService && genProxy;
- }
- };
- setCondition( condition );
-
- clientTestRoot.add( new SimpleFragment( new WebServiceClientTestArrivalCommand(), "" ) );
- clientTestRoot.add( new SimpleFragment( id ) );
- setTrueFragment( clientTestRoot );
-
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- this.genProxy = genProxy;
- }
-
- public void setTestService( Boolean testService )
- {
- this.testService = testService.booleanValue();
- }
-
- public boolean getLaunchedTest()
- {
- return launchedTest;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
deleted file mode 100644
index 4bd489f3c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
+++ /dev/null
@@ -1,416 +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.ui.widgets.test;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FolderResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-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.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-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;
-
-
-public class ClientTestWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- /*CONTEXT_ID PWSM0001 for the Sample Page*/
- private String INFOPOP_PWSM_PAGE = "PWSM0001";
- //
- private Button testCheckbox_;
- /*CONTEXT_ID PWSM0002 for the Test check box of the Sample Page*/
- private String INFOPOP_PWSM_CHECKBOX_TEST = "PWSM0002";
-
- private Combo testTypeCombo_;
- /*CONTEXT_ID PWSM0003 for the Test Type Combo box of the Sample Page*/
- private String INFOPOP_PWSM_COMBOBOX_TEST = "PWSM0003";
-
- private Text jspFolderText_;
- /*CONTEXT_ID PWSM0008 for the JSP Folder field of the Sample Page*/
- private String INFOPOP_PWSM_TEXT_JSP_FOLDER = "PWSM0008";
-
- private Button sampleFolderBrowseButton_;
- /*CONTEXT_ID PWSM0009 for the JSP Folder Browse button of the Sample Page*/
- private String INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE = "PWSM0009";
-
- private Combo projectCombo_;
- /*CONTEXT_ID PWSM0010 for the Project combo box of the Sample Page*/
- private String INFOPOP_PWSM_COMBO_PROJECT = "PWSM0010";
-
- private Tree methodsTree_;
-
- private Button selectAllMethodsButton_;
- /*CONTEXT_ID PWSM0006 for the Select All button of the Sample Page*/
- private String INFOPOP_PWSM_BUTTON_SELECT_ALL = "PWSM0006";
-
- private Button deselectAllMethodsButton_;
- /*CONTEXT_ID PWSM0007 for the Deselect All button of the Sample Page*/
- private String INFOPOP_PWSM_BUTTON_DESELECT_ALL = "PWSM0007";
-
- private Text sampleFolderText_;
- /*CONTEXT_ID PWSM0014 for the Folder field of the Sample Page*/
- private String INFOPOP_PWSM_TEXT_SAMPLE_FOLDER = "PWSM0014";
- //
- private Button runTestCheckbox_;
- /*CONTEXT_ID PWSM0015 for the run test check box of the Sample Page*/
- private String INFOPOP_PWSM_CHECKBOX_LAUNCH = "PWSM0015";
- //
- private Combo earCombo_;
- /*CONTEXT_ID PWSM0016 for the EAR combo box of the Sample Page*/
- private String INFOPOP_PWSM_EAR_COMBO = "PWSM0016";
-
- private Composite comboGroup_;
- private SelectionList testFacilities_;
- private FolderResourceFilter folderFilter_ = new FolderResourceFilter();
- private IStructuredSelection initialSelection_;
- private boolean isTestWidget = false;
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- isTestWidget = true;
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
-
- parent.setToolTipText( msgUtils.getMessage( "TOOLTIP_PWSM_PAGE" ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWSM_PAGE );
-
- testCheckbox_ = uiUtils.createCheckbox( parent, "BUTTON_TEST",
- "TOOLTIP_PWSM_CHECKBOX_TEST",
- INFOPOP_PWSM_CHECKBOX_TEST );
- testCheckbox_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleTestButton();
- }
- });
-
- comboGroup_ = uiUtils.createComposite( parent, 3, 5, 0 );
-
- testTypeCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_TEST_TYPES",
- "TOOLTIP_PWSM_COMBOBOX_TEST",
- INFOPOP_PWSM_COMBOBOX_TEST,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- new Label( comboGroup_, SWT.NONE );
-
- projectCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_JSP_PROJECT_NAME",
- "TOOLTIP_PWSM_COMBO_PROJECT",
- INFOPOP_PWSM_COMBO_PROJECT,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- projectCombo_.setEnabled( false );
- new Label( comboGroup_, SWT.NONE );
-
-
- earCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_EAR_PROJECTS",
- "TOOLTIP_PWSM_EAR_PROJECT",
- INFOPOP_PWSM_EAR_COMBO,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- earCombo_.setEnabled( false );
- new Label( comboGroup_, SWT.NONE );
-
-
-
- sampleFolderText_ = uiUtils.createText( comboGroup_, "LABEL_FOLDER_NAME",
- "TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER",
- INFOPOP_PWSM_TEXT_SAMPLE_FOLDER,
- SWT.SINGLE | SWT.BORDER );
-
- sampleFolderText_.addModifyListener( new ModifyListener()
- {
- public void modifyText( ModifyEvent evt )
- {
- handleFolderText();
- }
- });
-
-
- sampleFolderBrowseButton_ = uiUtils.createPushButton( comboGroup_, "BUTTON_BROWSE",
- "TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE",
- INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE );
- sampleFolderBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSampleBrowse();
- }
- });
-
- jspFolderText_ = uiUtils.createText( comboGroup_, "LABEL_JSP_FOLDER_NAME",
- "TOOLTIP_PWSM_TEXT_JSP_FOLDER",
- INFOPOP_PWSM_TEXT_JSP_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- jspFolderText_.setEnabled( false );
-
- Group methodsGroup = uiUtils.createGroup( parent, "LABEL_METHODS",
- "TOOLTIP_PWSM_TREE_METHODS", null );
-
- methodsGroup.setLayoutData( uiUtils.createFillAll() );
-
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- methodsGroup.setLayout( layout );
-
- // TODO No infopop for this tree.
- methodsTree_ = uiUtils.createTree( methodsGroup, "TOOLTIP_PWSM_TREE_METHODS",
- null,
- SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK );
-
- Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-
- selectAllMethodsButton_
- = uiUtils.createPushButton( selectButtons, "BUTTON_SELECT_ALL",
- "TOOLTIP_PWSM_BUTTON_SELECT_ALL",
- INFOPOP_PWSM_BUTTON_SELECT_ALL );
- selectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( true );
- }
- });
-
- deselectAllMethodsButton_
- = uiUtils.createPushButton( selectButtons, "BUTTON_DESELECT_ALL",
- "TOOLTIP_PWSM_BUTTON_DESELECT_ALL",
- INFOPOP_PWSM_BUTTON_DESELECT_ALL );
- deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( false );
- }
- });
-
- runTestCheckbox_ = uiUtils.createCheckbox( parent, "BUTTON_RUN_TEST",
- "TOOLTIP_PWSM_CHECKBOX_LAUNCH",
- INFOPOP_PWSM_CHECKBOX_LAUNCH );
-
- return this;
- }
-
- private void handleFolderText()
- {
- String folder = sampleFolderText_.getText();
- String jspFolder = jspFolderText_.getText();
- int index = jspFolder.lastIndexOf(Path.SEPARATOR);
- if(index == -1) return;
- jspFolder = jspFolder.substring(0,index + 1);
- jspFolder = jspFolder + folder;
- jspFolderText_.setText(jspFolder);
- }
-
- private void handleSampleBrowse()
- {
- IPath selectedPath = null;
- IResource initialResource = null;
- IPath projectPath = new Path( projectCombo_.getText() ).makeAbsolute();
- IResource project = ResourceUtils.findResource( projectPath );
-// IContainer webModuleContainer = ResourceUtils.getWebModuleServerRoot( (IProject)project);
- IContainer webModuleContainer = J2EEUtils.getFirstWebContentContainer((IProject)project);
- try
- {
- initialResource = ResourceUtils.getResourceFromSelection( initialSelection_ );
- }
- catch( CoreException exc )
- {
- }
-
- if( initialResource == null )initialResource = project;
-
- IResource resource = DialogUtils.browseResources( comboGroup_.getShell(),
- project,
- initialResource,
- folderFilter_ );
-
- if( resource != null )
- {
- selectedPath = resource.getFullPath();
-
- int webModuleSegments = selectedPath.matchingFirstSegments(webModuleContainer.getFullPath());
-
- if ( webModuleSegments < 2 )
- {
- sampleFolderText_.setText("");
- handleFolderText();
- }
- else
- {
- sampleFolderText_.setText(selectedPath.removeFirstSegments(webModuleSegments).toString());
- handleFolderText();
- }
- }
- }
-
- private void handleTestButton()
- {
- boolean enabled = testCheckbox_.getSelection();
-
- testTypeCombo_.setEnabled( enabled );
- sampleFolderText_.setEnabled( enabled );
- methodsTree_.setEnabled( enabled );
- runTestCheckbox_.setEnabled( enabled );
- selectAllMethodsButton_.setEnabled( enabled );
- deselectAllMethodsButton_.setEnabled( enabled );
- sampleFolderBrowseButton_.setEnabled( enabled );
- }
-
- private void handleSelectAll( boolean value )
- {
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- items[i].setChecked(value);
- }
- }
-
- // Here are the getters and setters for this widget.
- public void setTestService( Boolean testService )
- {
- testCheckbox_.setSelection( testService.booleanValue() );
- handleTestButton();
- }
-
- public Boolean getTestService()
- {
- return new Boolean( testCheckbox_.getSelection() );
- }
-
- public void setTestFacility( SelectionList testFacilities )
- {
- testFacilities_ = testFacilities;
- testTypeCombo_.setItems( testFacilities.getList() );
- testTypeCombo_.select( testFacilities.getIndex() );
- }
-
- public SelectionList getTestFacility()
- {
- testFacilities_.setIndex( testTypeCombo_.getSelectionIndex() );
- return testFacilities_;
- }
-
- public String getTestID()
- {
- return testTypeCombo_.getText();
- }
-
- public void setSampleProject(String clientProject)
- {
- projectCombo_.setItems( new String[]{ clientProject } );
- projectCombo_.select(0);
- }
-
- public void setSampleProjectEAR(String clientProjectEAR)
- {
- earCombo_.setItems( new String[]{ clientProjectEAR } );
- earCombo_.select(0);
- }
-
- public String getFolder()
- {
- return sampleFolderText_.getText();
- }
-
- public void setFolder( String folder )
- {
- sampleFolderText_.setText( folder );
- }
-
- public boolean getIsTestWidget()
- {
- return isTestWidget;
- }
-
- public void setJspFolder( String folder )
- {
- jspFolderText_.setText( folder );
- }
-
- public String getJspFolder()
- {
- return jspFolderText_.getText();
- }
-
- public void setLaunchedServiceTestName (String launchedServiceTestName)
- {
- }
-
- public boolean getRunClientTest()
- {
- return runTestCheckbox_.getSelection();
- }
-
- public void setRunClientTest( boolean value )
- {
- runTestCheckbox_.setSelection( value );
- }
-
- public BooleanSelection[] getMethods()
- {
- TreeItem[] items = methodsTree_.getItems();
- BooleanSelection[] methods = new BooleanSelection[items.length];
-
- for( int index = 0; index < items.length; index++ )
- {
- methods[index] = new BooleanSelection( items[index].getText(), items[index].getChecked() );
- }
-
- return methods;
- }
-
- public void setMethods( BooleanSelection[] methods )
- {
- methodsTree_.removeAll();
-
- for( int index = 0; index < methods.length; index++ )
- {
- if(methods[index] == null)continue;
- TreeItem item = new TreeItem( methodsTree_, SWT.NULL );
- item.setText( methods[index].getValue() );
- item.setChecked( methods[index].isSelected() );
- }
- }
-
- public void setInitialSelection( IStructuredSelection selection )
- {
- initialSelection_ = selection;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
deleted file mode 100644
index f7b8c03f5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
+++ /dev/null
@@ -1,125 +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.ui.widgets.test;
-
-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.Plugin;
-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.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class CopyWebServiceUtilsJarCommand extends AbstractDataModelOperation
-{
- private String sampleProject;
- private MessageUtils msgUtils;
-
-/**
- * Default CTOR;
- */
-
-
-public CopyWebServiceUtilsJarCommand()
-{
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
- IEnvironment env = getEnvironment();
-
- try
- {
- ProgressUtils.report( monitor, msgUtils.getMessage( "PROGRESS_INFO_COPY_WEBSERVICE_UTILS" ) );
- IProject sampleIProject = ProjectUtilities.getProject(sampleProject);
- IPath webModulePath = J2EEUtils.getWebContentPath(sampleIProject);
- if (webModulePath == null)
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_PROJECT_NOT_FOUND") );
-
- IStatus status = copyIFile("webserviceutils.jar",webModulePath,"WEB-INF/lib/webserviceutils.jar", WebServiceConsumptionPlugin.getInstance(),env, monitor);
- if(status.getSeverity() == Status.ERROR){
- IStatusHandler sHandler = env.getStatusHandler();
- IStatus errorStatus = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS") );
- sHandler.reportError(errorStatus);
- return status;
- }
-
-
- }
- catch (Exception e) {
- IStatusHandler sHandler = env.getStatusHandler();
- IStatus errorStatus = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS") );
- sHandler.reportError(errorStatus);
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS"), e);
- }
- return Status.OK_STATUS;
-}
-
-/**
- *
- */
-private IStatus copyIFile(String source, IPath targetPath, String targetFile, Plugin plugin,IEnvironment env, IProgressMonitor monitor )
-{
-
- if (plugin != null)
- {
- IPath target = targetPath.append(new Path(targetFile));
-
- ProgressUtils.report( monitor, msgUtils.getMessage( "PROGRESS_INFO_COPYING_FILE" ) );
- try
- {
- ResourceContext context = new TransientResourceContext();
- context.setOverwriteFilesEnabled(true);
- context.setCreateFoldersEnabled(true);
- context.setCheckoutFilesEnabled(true);
- IResource resource = FileResourceUtils.findResource(target);
- if(resource != null) return Status.OK_STATUS;
- FileResourceUtils.createFile(context,
- target,
- plugin.openStream(new Path(source)),
- monitor,
- env.getStatusHandler());
- }
- catch (Exception e) {
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS") ,e);
- }
- }
- return Status.OK_STATUS;
-}
-
-public void setSampleProject(String sampleProject)
-{
- this.sampleProject = sampleProject;
-}
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
deleted file mode 100644
index e6828443d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
+++ /dev/null
@@ -1,174 +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.consumption.ui.widgets.test;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-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.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-
-public class CreateSampleProjectCommand extends AbstractDataModelOperation
-{
- private String sampleProject;
- private String sampleProjectEar;
- private IServer existingServer;
- private String serverFactoryId;
- private boolean needEAR;
- private String j2eeVersion;
-
-
- public CreateSampleProjectCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- if (!root.getProject(sampleProject).exists() || !root.getProject(sampleProjectEar).exists())
- {
- //Do the following
- //1. Create the Web project/component to house the sample JSPs.
- //2. If needEAR is true then
- // - create a EAR project and component if it doesn't exist
- // - add the Web component to the EAR component
- //3. Add the right component to the server.
- CreateModuleCommand command = new CreateModuleCommand();
- command.setProjectName(sampleProject);
- command.setModuleName(sampleProject);
- command.setModuleType(CreateModuleCommand.WEB);
- command.setServerFactoryId(serverFactoryId);
- command.setServerInstanceId(existingServer.getId());
- command.setJ2eeLevel(j2eeVersion);
- command.setEnvironment( env );
- IStatus status = command.execute( monitor, null ) ;
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- if (needEAR)
- {
- CreateModuleCommand commandEAR = new CreateModuleCommand();
- commandEAR.setProjectName(sampleProjectEar);
- //TODO The EAR component name is not necessarily the same as the project name
- //so the component name needs to somehow be piped into this command
- commandEAR.setModuleName(sampleProjectEar);
- commandEAR.setModuleType(CreateModuleCommand.EAR);
- commandEAR.setServerFactoryId(serverFactoryId);
- commandEAR.setServerInstanceId(existingServer.getId());
- commandEAR.setJ2eeLevel(j2eeVersion);
- commandEAR.setEnvironment( env );
- status = commandEAR.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-
- //Associate the service module and service EAR
- AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
- associateCommand.setProject(sampleProject);
- associateCommand.setModule(sampleProject);
- associateCommand.setEARProject(sampleProjectEar);
- //TODO The EAR component name is not necessarily the same as the project name
- //so the component name needs to somehow be piped into this command
- associateCommand.setEar(sampleProjectEar);
- associateCommand.setEnvironment( env );
- status = associateCommand.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- //Add the EAR to the server
- AddModuleToServerCommand commandInstall = new AddModuleToServerCommand();
- commandInstall.setServerInstanceId(existingServer.getId());
- commandInstall.setProject(sampleProjectEar);
- //TODO The EAR component name is not necessarily the same as the project name
- //so the component name needs to somehow be piped into this command
- commandInstall.setModule(sampleProjectEar);
- commandInstall.setEnvironment( env );
- status = commandInstall.execute( monitor, null ) ;
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- else
- {
- //Add the Web component to the server
- AddModuleToServerCommand commandInstall = new AddModuleToServerCommand();
- commandInstall.setServerInstanceId(existingServer.getId());
- commandInstall.setProject(sampleProject);
- commandInstall.setModule(sampleProject);
- commandInstall.setEnvironment( env );
-
- status = commandInstall.execute( monitor, null ) ;
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- }
- return Status.OK_STATUS;
- }
-
- public void setSampleProject(String sampleProject)
- {
- this.sampleProject = sampleProject;
- }
-
- public void setSampleProjectEAR(String sampleProjectEar)
- {
- this.sampleProjectEar = sampleProjectEar;
- }
-
- public void setExistingServer(IServer existingServer) {
-
- this.existingServer = existingServer;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
-
- /**
- * @param needEAR The needEAR to set.
- */
- public void setNeedEAR(boolean needEAR)
- {
- this.needEAR = needEAR;
- }
-
- /**
- * @param version The j2eeVersion to set.
- */
- public void setJ2eeVersion(String version)
- {
- j2eeVersion = version;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java
deleted file mode 100644
index 9c6df0cba..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java
+++ /dev/null
@@ -1,73 +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.ui.widgets.test;
-
-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;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the
-* JBWizard Plugin
-*
-*
-*/
-public class FinishDefaultCommand extends AbstractDataModelOperation
-{
- private String sampleServerTypeID;
- private IServer sampleExistingServer;
- private String sampleServerInstanceId;
-
-
- public FinishDefaultCommand ()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
- if(sampleServerInstanceId != null){
- sampleExistingServer = ServerCore.findServer(sampleServerInstanceId);
- if (sampleExistingServer != null)
- sampleServerTypeID = sampleExistingServer.getServerType().getId();
-
- }
- return status;
-
- }
-
- public void setServerInstanceId(String serverInstanceId)
- {
- this.sampleServerInstanceId = serverInstanceId;
- }
-
- public String getSampleServerTypeID()
- {
- return sampleServerTypeID;
-
- }
-
- public IServer getSampleExistingServer()
- {
- return sampleExistingServer;
- }
-
- public void setExistingServerId(String existingServerId)
- {
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java
deleted file mode 100644
index f90c1b5ac..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java
+++ /dev/null
@@ -1,64 +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 May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-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.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishJavaTestFragment extends BooleanFragment
-{
- private boolean generateProxy;
-
- public FinishJavaTestFragment()
- {
- SequenceFragment javaTestRoot = new SequenceFragment();
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return generateProxy;
- }
- };
- setCondition(condition);
- javaTestRoot.add(new SimpleFragment(new TestClientDepartureInitCommand(), ""));
- javaTestRoot.add(new SimpleFragment(new BuildProjectCommand(), ""));
- setTrueFragment(javaTestRoot);
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- public void setIsJSPGen(boolean jspGen)
- {
-
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
deleted file mode 100644
index aeb174ab7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
+++ /dev/null
@@ -1,105 +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 May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-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.common.Condition;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishTestFragment extends BooleanFragment{
-
- private boolean isTestWidget;
- private boolean generateProxy;
- private String launchedServiceTestName;
- private boolean testService;
- private String testID;
- public FinishTestFragment()
- {
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- if(!testService) return false;
- if(launchedServiceTestName == null) return true;
- if(launchedServiceTestName != null)
- if((!launchedServiceTestName.equals("") && (!isPreferedAWSDLTest() || (isTestWidget && isClientTestJava())) && generateProxy) || launchedServiceTestName.equals("")) return true;
-
- return false;
- }
- };
-
- setTrueFragment(new WebServiceTestClientDepartureFragment());
- setCondition(condition);
- }
-
- public void setLaunchedServiceTestName(String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
-
- public boolean isPreferedAWSDLTest()
- {
- ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- String[] testTypes = scenarioContext.getWebServiceTestTypes();
- WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
- WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[0]);
- if(wscte.testWSDL())
- return true;
- return false;
- }
-
- public boolean isClientTestJava()
- {
- if(testID == null) return false;
- WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
- WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testID);
- if(!wscte.testWSDL())
- return true;
- return false;
- }
-
-
- public void setTestService(boolean testService)
- {
- this.testService = testService;
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- public void setTestID(String testID)
- {
- this.testID = testID;
- }
-
- public void setIsTestWidget(boolean isTestWidget)
- {
- this.isTestWidget = isTestWidget;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java
deleted file mode 100644
index 6c61ebaaa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java
+++ /dev/null
@@ -1,52 +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.ui.widgets.test;
-
-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;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class TestClientDepartureInitCommand extends AbstractDataModelOperation
-{
-
- private boolean forceBuild;
-
- public TestClientDepartureInitCommand()
- {
- forceBuild = true;
- }
-
- public boolean getForceBuild()
- {
- return forceBuild;
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
- {
- return Status.OK_STATUS;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
deleted file mode 100644
index d3e5fb5b5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
+++ /dev/null
@@ -1,95 +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 May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-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.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 Style - Code Templates
- */
-public class TestDefaultingFragment extends AbstractDataModelOperation
-{
-
- private SelectionList testFacilities;
- private String launchedServiceTestName;
- private ScenarioContext scenarioContext;
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- // test facilities
- selectTestFacility();
- return status;
- }
-
- // The test facilities retrieved from the extension
- // plus the default
- public SelectionList getTestFacility()
- {
- return testFacilities;
- }
-
-
-
- // ***********************
- // This method uses the preference to
- // select the correct test facility
- //
- //***********************
- private void selectTestFacility()
- {
- //if we find something we launched earlier
- //put it on the bottom
- String[] testTypes = scenarioContext.getWebServiceTestTypes();
- String[] newTestTypes = new String[testTypes.length];
- boolean launched = false;
- int j = 0;
- for(int i = 0;i<testTypes.length;i++){
- if(testTypes[i].equals(launchedServiceTestName))
- launched = true;
- else{
- newTestTypes[j] = testTypes[i];
- j++;
- }
- }
-
- if(launched)
- newTestTypes[testTypes.length - 1] = launchedServiceTestName;
-
- testFacilities = new SelectionList(newTestTypes,0);
- }
-
- public void setLaunchedServiceTestName(String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java
deleted file mode 100644
index a4efaabcb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java
+++ /dev/null
@@ -1,54 +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.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-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 TestWebServiceClient extends AbstractWebServiceClient {
-
- public TestWebServiceClient(WebServiceClientInfo clientInfo){
- super(clientInfo);
- }
-
- 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){
- return null;
- }
-
- 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;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java
deleted file mode 100644
index 07f436804..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java
+++ /dev/null
@@ -1,30 +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 May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLFinishFragment extends BooleanFragment{
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java
deleted file mode 100644
index d81df90ab..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java
+++ /dev/null
@@ -1,188 +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 May 4, 2004
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-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.core.runtime.Status;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-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.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-/**
- * @author gilberta
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLTestLaunchCommand extends AbstractDataModelOperation
-{
- private String testID;
- private String launchedServiceTestName;
- private TypeRuntimeServer serviceids;
- private String serverProject;
- private String serverModule;
- private String wsdlURI;
- private MessageUtils msgUtils;
- private List endpoints;
- private IServer serviceExistingServer = null;
- private String serviceServerTypeID = null;
- private String serviceServerInstanceId = null;
-
- public WSDLTestLaunchCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
- WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(testID);
- IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();
- TestInfo testInfo = getTestInfo();
-
-
- status = commandFactoryExecution(iwst.launch(testInfo),env, monitor);
-
- //Dont need to shut everything down because the wsdl test doesnt work
- if(status.getSeverity() != Status.OK){
- IStatusHandler sHandler = env.getStatusHandler();
- IStatus infoStatus = StatusUtils.infoStatus( msgUtils.getMessage("MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST") );
- sHandler.reportInfo(infoStatus);
- return infoStatus;
- }
- return status;
-
- }
-
- private IStatus commandFactoryExecution(ICommandFactory commandFactory,IEnvironment env, IProgressMonitor monitor)
- {
- IStatus status = Status.OK_STATUS;
- while(commandFactory.hasNext())
- {
- AbstractDataModelOperation operation = commandFactory.getNextCommand();
-
- if (operation != null)
- {
- try
- {
- operation.setEnvironment( env );
- status = operation.execute( monitor, null );
- }
- catch( Exception exc )
- {
- status = StatusUtils.errorStatus( exc );
- }
- }
-
- if(status.getSeverity() == Status.ERROR){
- IStatusHandler sHandler = env.getStatusHandler();
- sHandler.reportError(status);
- return status;
- }
- }
- return status;
- }
-
-
- private TestInfo getTestInfo()
- {
- // get the server stuff
- if (serviceids.getServerInstanceId() != null)
- serviceExistingServer = ServerCore.findServer(serviceids.getServerInstanceId());
- else if (serviceServerInstanceId!=null)
- serviceExistingServer = ServerCore.findServer(serviceServerInstanceId);
-
- if (serviceExistingServer != null)
- serviceServerTypeID = serviceExistingServer.getServerType().getId();
- else
- serviceServerTypeID = serviceids.getServerId();
- // server will be created in ServerDeployableConfigurationCommand
-
- TestInfo testInfo = new TestInfo();
- if (serviceExistingServer!=null)
- testInfo.setServiceExistingServer(serviceExistingServer);
- testInfo.setServiceServerTypeID(serviceServerTypeID);
- testInfo.setServiceProject(serverProject);
- testInfo.setWsdlServiceURL(wsdlURI);
- testInfo.setEndpoint(endpoints);
- return testInfo;
-
- }
-
-
- public void setTestID(String testID)
- {
- this.testID = testID;
- }
-
- public String getLaunchedServiceTestName()
- {
- return launchedServiceTestName;
- }
- 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 void setExternalBrowser(boolean externalBrowser)
- {
- }
-
- public void setEndpoint(List endpoints)
- {
- this.endpoints = endpoints;
- }
-
-public String getServerModule() {
- return serverModule;
-}
-
-public void setServerModule(String serverModule) {
- this.serverModule = serverModule;
-}
-
-public void setServiceServerInstanceId(String ssInstanceId){
- this.serviceServerInstanceId = ssInstanceId;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
deleted file mode 100644
index 2815fea85..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
+++ /dev/null
@@ -1,235 +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.consumption.ui.widgets.test;
-
-import java.util.List;
-import java.util.ListIterator;
-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.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-/**
-* This task sets up all the defaults for the webservice test
-* client page
-*
-*/
-public class WebServiceClientTestArrivalCommand extends AbstractDataModelOperation
-{
- public static final String DEFAULT_WEB_MODULE_ROOT = "WebContent";
- public static final String DEFAULT_SAMPLE_WEB_PROJECT_EXT = "Sample";
-
- private MessageUtils msgUtils;
- public static String SAMPLE_DIR = "sample";
-
- private String clientProject;
- private String clientProjectEAR;
- private String clientP;
- private String clientC;
- private IProject clientIProject;
- private String folder;
- private String jspFolder;
- private BooleanSelection[] methods;
- private String proxyBean;
- private String sampleProject;
- private String sampleP;
- private String sampleC;
- private String sampleProjectEAR;
-
-
-
- /**
- * Constructs a new WebServiceClientTestArrivalTask object with the given label and description.
- */
- public WebServiceClientTestArrivalCommand ()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
-
- sampleProjectAndEarSetup(env);
-
- //Get the sample Folder ready
- StringBuffer sb = new StringBuffer();
-
- sb.append("/").append(sampleC).append("/").append(DEFAULT_WEB_MODULE_ROOT).append("/");
- folder = SAMPLE_DIR + getBean();
-
- sb.append(folder);
- jspFolder = sb.toString();
-
- //get the method names ready
- //find the full path of the file in the project
- /*
- * Getting the method names using javamof introspection
- */
- if(proxyBean == null){
- IStatusHandler sHandler = env.getStatusHandler();
- IStatus errorStatus = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_JTS_PROXY_NOT_COMPILED") );
- sHandler.reportError(errorStatus);
- return errorStatus;
-
- }
-
-
- JavaMofReflectionCommand javamofcommand = new JavaMofReflectionCommand();
- javamofcommand.setProxyBean(proxyBean);
- javamofcommand.setClientProject(clientP);
- javamofcommand.setEnvironment( env );
-
-
-
- try{
- IStatus mofStatus = javamofcommand.execute( monitor, null);
- if(mofStatus.getSeverity() == Status.ERROR)
- return mofStatus;
- }catch(Exception exc){
- IStatusHandler sHandler = env.getStatusHandler();
- IStatus errorStatus = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_JTS_PROXY_NOT_COMPILED") );
- sHandler.reportError(errorStatus);
- return errorStatus;
- }
- JavaHelpers javaHelpers = javamofcommand.getJavaClass();
- if (javaHelpers == null) return status;
-
- JavaClass javaClass = null;
- if(javaHelpers instanceof JavaClass)
- javaClass = (JavaClass)javaHelpers;
- else return status;
- List methodList = javaClass.getPublicMethods();
- BooleanSelection[] tempMethods = new BooleanSelection[methodList.size()];
- ListIterator listIterator = methodList.listIterator();
-
- int j = 0;
- while (listIterator.hasNext())
- {
- Method method = (Method)listIterator.next();
- if(method.isConstructor()) continue;
-
- tempMethods[j] = new BooleanSelection( method.getMethodElementSignature(), true);
- j++;
- }
- methods = tempMethods;
- return status;
- }
- public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
-
- private void sampleProjectAndEarSetup(IEnvironment env)
- {
- if(clientProject == null) return;
- else{
- int index = clientProject.indexOf("/");
- clientP = clientProject.substring(0,index);
- clientC = clientProject.substring(index + 1);
- }
-
- clientIProject = (IProject)ProjectUtilities.getProject(clientP);
-
- if(J2EEUtils.isWebComponent(clientIProject)){
- sampleProject = clientProject;
- sampleP = clientP;
- sampleC = clientC;
- }
- else{
- sampleP = clientP + DEFAULT_SAMPLE_WEB_PROJECT_EXT;
- sampleC = clientC + DEFAULT_SAMPLE_WEB_PROJECT_EXT;
- sampleProject = sampleP + "/" + sampleC;
-
-
- }
- sampleProjectEAR = clientProjectEAR;
- if (sampleProjectEAR == null || sampleProjectEAR.length()==0){
- sampleProjectEAR = sampleP + DEFAULT_SAMPLE_EAR_PROJECT_EXT + "/" + sampleC + DEFAULT_SAMPLE_EAR_PROJECT_EXT;
- }
-
- }
-
- //getters and setters
-
- private String getBean()
- {
- int index = proxyBean.lastIndexOf(".");
- String end = "";
- if(index != -1){
- end = proxyBean.substring(index + 1);
- }
- String bean = end.substring(0,end.length());
-
- return bean;
- }
-
-
-
-
- public String getFolder()
- {
- return folder;
- }
-
- public String getJspFolder()
- {
- return jspFolder;
- }
-
- public BooleanSelection[] getMethods()
- {
- return methods;
- }
-
- public String getSampleProject()
- {
- return sampleProject;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
-
- public void setClientProjectEAR(String clientProjectEAR)
- {
- this.clientProjectEAR = clientProjectEAR;
- }
-
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- public String getSampleProjectEAR()
- {
- return sampleProjectEAR;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java
deleted file mode 100644
index 00bdfd0b4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.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
- *******************************************************************************/
-/*
- * 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.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand;
-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;
-
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestClientDepartureFragment extends SequenceFragment
-{
- public WebServiceTestClientDepartureFragment()
- {
- add(new SimpleFragment(new FinishDefaultCommand(),""));
- add(new SimpleFragment(new ClientTestDelegateCommand(),""));
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping(TestClientDepartureInitCommand.class, "ForceBuild",BuildProjectCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",ClientTestDelegateCommand.class);
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
deleted file mode 100644
index 61d390ca2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
+++ /dev/null
@@ -1,114 +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.ui.widgets.test.explorer;
-
-import java.util.Iterator;
-import java.util.List;
-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.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.ext.test.WSDLTestFinishCommand;
-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.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 ExplorerServiceTestCommand extends AbstractDataModelOperation implements WSDLTestFinishCommand
-{
-
- private boolean externalBrowser = true;
- private String wsdlServiceURL;
- private String serviceServerTypeID;
- private IServer serviceExistingServer;
- private String serviceProject;
- private List endpoints;
-
- /**
- * Constructs a new WebServiceExplorerLaunch object with the given label and description.
- */
- public ExplorerServiceTestCommand ()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
-
- StartProjectCommand spc = new StartProjectCommand( true );
- spc.setServiceServerTypeID(serviceServerTypeID);
- spc.setServiceExistingServer(serviceExistingServer);
- IProject project = (IProject) ResourceUtils.findResource(serviceProject);
- spc.setServiceProject(project);
- spc.setIsWebProjectStartupRequested(true);
- spc.setEnvironment( env );
-
- status = spc.execute( monitor, null );
- if (status.getSeverity() == Status.ERROR)
- return status;
-
- WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
- launchCommand.setForceLaunchOutsideIDE(externalBrowser);
- Vector launchOptionVector = new Vector();
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,wsdlServiceURL));
- if (endpoints != null)
- for (Iterator it = endpoints.iterator(); it.hasNext();)
- launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString()));
- launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0]));
- launchCommand.setEnvironment( env );
- status = launchCommand.execute( monitor, null );
- return status;
- }
-
- public void setExternalBrowser(boolean externalBrowser)
- {
- this.externalBrowser = externalBrowser;
- }
-
- public void setWsdlServiceURL(String wsdlServiceURL)
- {
- this.wsdlServiceURL = wsdlServiceURL;
- }
-
- public void setServerTypeID(String serviceServerTypeID)
- {
- this.serviceServerTypeID = serviceServerTypeID;
- }
-
- public void setExistingServer(IServer serviceExistingServer)
- {
- this.serviceExistingServer = serviceExistingServer;
- }
-
- public void setServiceProject(String serviceProject)
- {
- this.serviceProject = serviceProject;
- }
-
- public void setEndpoint(List endpoints)
- {
- this.endpoints = endpoints;
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java
deleted file mode 100644
index 063061dbf..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java
+++ /dev/null
@@ -1,74 +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.ui.widgets.test.explorer;
-
-import java.util.Iterator;
-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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-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.wsrt.TestInfo;
-
-public class WSEGenerateCommand extends AbstractDataModelOperation
-{
-
- private TestInfo testInfo;
-
- public WSEGenerateCommand(TestInfo testInfo){
- this.testInfo = testInfo;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
-
- StartProjectCommand spc = new StartProjectCommand( true );
- spc.setServiceServerTypeID(testInfo.getServiceServerTypeID());
- spc.setServiceExistingServer(testInfo.getServiceExistingServer());
- IProject project = (IProject) ProjectUtilities.getProject(testInfo.getServiceProject());
- spc.setServiceProject(project);
- spc.setIsWebProjectStartupRequested(true);
- spc.setEnvironment( env );
-
- status = spc.execute( monitor, null );
- if (status.getSeverity() == Status.ERROR)
- return status;
-
- WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
- launchCommand.setForceLaunchOutsideIDE(false);
- Vector launchOptionVector = new Vector();
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,testInfo.getWsdlServiceURL()));
- if (testInfo.getEndpoint() != null)
- for (Iterator it = testInfo.getEndpoint().iterator(); it.hasNext();)
- launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString()));
- launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0]));
- launchCommand.setEnvironment( env );
- status = launchCommand.execute( monitor, null );
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java
deleted file mode 100644
index cfa116d05..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.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.consumption.ui.widgets.test.explorer;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class WSEWebServiceTester implements IWebServiceTester {
-
- public ICommandFactory generate(TestInfo testInfo){
- Vector commands = new Vector();
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory launch(TestInfo testInfo){
- Vector commands = new Vector();
- commands.add(new WSEGenerateCommand(testInfo));
- return new SimpleCommandFactory(commands);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java
deleted file mode 100644
index ecb320e5a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java
+++ /dev/null
@@ -1,35 +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.ui.widgets.test.explorer;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public class WebServiceExplorerExecutable implements WebServiceExecutable
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public AbstractDataModelOperation getFinishCommand()
- {
- return new ExplorerServiceTestCommand();
- }
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
deleted file mode 100644
index 35000b28c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
+++ /dev/null
@@ -1,206 +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.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-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.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-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.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class AddModuleDependenciesCommand extends AbstractDataModelOperation
-{
-
- private TestInfo testInfo;
-
- private IProject sampleIProject;
- private IProject clientIProject;
- private IProject sampleEARIProject;
- private String sampleEARProject;
- private String sampleEARModule;
-
- public AddModuleDependenciesCommand(TestInfo testInfo)
- {
- this.testInfo = testInfo;
- }
-
- /**
- * Execute WebServerDefaultingTask Set the default server name and id given a
- * deployable.
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- try
- {
- createSampleProjects(env, monitor );
- clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-
- if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject))
- {
- String uri = clientIProject.getName() + ".jar";
- if (J2EEUtils.isJavaComponent(clientIProject))
- addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, uri);
- addJAROrModuleDependency(sampleIProject, uri);
- addBuildPath(sampleIProject, clientIProject);
- }
- }
- catch (IOException ioe)
- {
- }
- catch (CoreException ce)
- {
- }
- return Status.OK_STATUS;
- }
-
- private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject, String uri)
- {
- // TODO Remove refs to old command
-// AddUtilityJARMapCommand cmd = new AddUtilityJARMapCommand(earProject, uri, javaProject);
-// cmd.execute();
- }
-
- private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
- {
- ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
- manifest.mergeClassPath(new String[]{uri});
- J2EEProjectUtilities.writeManifest(project, manifest);
-
- }
-
- public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
-
- private void createSampleProjects(IEnvironment env, IProgressMonitor monitor )
- {
-
-
-
- sampleIProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
- clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-
- if (testInfo.getClientNeedEAR()) {
- if(testInfo.getClientEARProject() == null || testInfo.getClientEARProject().length() == 0){
- sampleEARProject = testInfo.getGenerationProject() + DEFAULT_SAMPLE_EAR_PROJECT_EXT;
- }
- else{
- sampleEARProject = testInfo.getClientEARProject();
- }
-
- sampleEARIProject = ProjectUtilities.getProject(sampleEARProject);
- if(sampleEARIProject == null || !sampleEARIProject.isOpen()){
-
- CreateModuleCommand createEAR = new CreateModuleCommand();
- createEAR.setProjectName(sampleEARProject);
- createEAR.setModuleName(sampleEARModule);
- createEAR.setServerInstanceId(testInfo.getClientExistingServer().getId());
- createEAR.setServerFactoryId(testInfo.getClientServerTypeID());
- createEAR.setModuleType(CreateModuleCommand.EAR);
- createEAR.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject));
- createEAR.setEnvironment( env );
- IStatus status = createEAR.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- }
-
- AddModuleToServerCommand modToServer = new AddModuleToServerCommand();
- modToServer.setModule(sampleEARModule);
- modToServer.setProject(sampleEARProject);
- modToServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
- modToServer.setEnvironment( env );
- status = modToServer.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- }
-
- }
- }
-
- if (!sampleIProject.isOpen())
- {
- CreateModuleCommand createSample = new CreateModuleCommand();
- createSample.setProjectName(testInfo.getGenerationProject());
- createSample.setModuleType(CreateModuleCommand.WEB);
- createSample.setServerInstanceId(testInfo.getClientExistingServer().getId());
- createSample.setServerFactoryId(testInfo.getClientServerTypeID());
- createSample.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject));
- createSample.setEnvironment( env );
- IStatus status = createSample.execute( monitor, null );
-
- if (testInfo.getClientNeedEAR()) {
-// Associate the client module and service EAR
- AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
- associateCommand.setProject(testInfo.getGenerationProject());
- associateCommand.setEARProject(sampleEARProject);
- associateCommand.setEar(sampleEARModule);
- associateCommand.setEnvironment( env );
- status = associateCommand.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- }
- }
-
- StartServerCommand startServer = new StartServerCommand(false, true);
- startServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
- startServer.setEnvironment( env );
- status = startServer.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- }
-
- }
-
- }
-
- private void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException
- {
- IJavaProject javaProject = JavaCore.create(referencingProject);
- if (javaProject != null)
- {
- IClasspathEntry[] oldCp = javaProject.getRawClasspath();
- IClasspathEntry[] newCp = new IClasspathEntry[oldCp.length + 1];
- for (int i = 0; i < oldCp.length; i++)
- newCp[i] = oldCp[i];
- newCp[newCp.length - 1] = JavaCore.newProjectEntry(referencedProject.getFullPath());
- javaProject.setRawClasspath(newCp, new NullProgressMonitor());
- }
- }
-
-
-
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java
deleted file mode 100644
index e7d91d9aa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java
+++ /dev/null
@@ -1,172 +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.ui.widgets.test.wssample;
-
-import org.eclipse.core.resources.IFile;
-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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.MethodFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.ResultFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.GeneratePageCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.JavaToModelCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class GSTCGenerateCommand extends AbstractDataModelOperation
-{
-
- public static String INPUT = "Input.jsp";
- public static String TEST_CLIENT = "TestClient.jsp";
- public static String RESULT = "Result.jsp";
- public static String METHOD = "Method.jsp";
-
- private TestInfo testInfo;
- private Model proxyModel;
- private String jspfolder;
-
- public GSTCGenerateCommand(TestInfo testInfo){
- this.testInfo = testInfo;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand();
- copy.setSampleProject(testInfo.getGenerationProject());
- copy.setEnvironment( env );
- status = copy.execute( monitor, null);
- if (status.getSeverity() == Status.ERROR) return status;
- setJSPFolder();
- status = createModel(env, monitor);
- if (status.getSeverity() == Status.ERROR) return status;
- status = generatePages(env);
- if (status.getSeverity() == Status.ERROR) return status;
- return status;
- }
-
- private void setJSPFolder(){
- //if the client is not a webcomponent then the
- //sample must have been created, we must now factor in
- //flexible projects
-
- IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
- if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)){
- IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject());
- IPath path = J2EEUtils.getWebContentPath(project);
- int index = testInfo.getJspFolder().lastIndexOf("/");
- String jsp = testInfo.getJspFolder().substring(index + 1);
- StringBuffer sb = new StringBuffer();
- sb.append("/").append(path.toString()).append("/").append(jsp);
- jspfolder = sb.toString();
- }
- else
- jspfolder = testInfo.getJspFolder();
-
-
- }
-
- //create the model from the resource
- private IStatus createModel(IEnvironment env, IProgressMonitor monitor ) {
- JavaToModelCommand jtmc = new JavaToModelCommand();
- jtmc.setMethods(testInfo.getMethods());
- jtmc.setClientProject(testInfo.getClientProject());
- jtmc.setProxyBean(testInfo.getProxyBean());
- jtmc.setEnvironment( env );
- IStatus status = jtmc.execute( monitor, null);
- if (status.getSeverity() == Status.ERROR) return status;
- proxyModel = jtmc.getJavaDataModel();
- return status;
- }
-
- /**
- * Generate the four jsps that make up this
- * sample app.
- */
- private IStatus generatePages(IEnvironment env)
- {
- IStatus status = Status.OK_STATUS;
- IPath fDestinationFolderPath = new Path(jspfolder);
- fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();
- IWorkspaceRoot fWorkspace = ResourcesPlugin.getWorkspace().getRoot();
-
- IPath pathTest = fDestinationFolderPath.append(TEST_CLIENT);
- IFile fileTest = fWorkspace.getFile(pathTest);
- GeneratePageCommand gpcTest = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- new TestClientFileGenerator(INPUT,METHOD,RESULT),fileTest);
- //gpcTest.setStatusMonitor(getStatusMonitor());
- gpcTest.setEnvironment( env );
- status = gpcTest.execute( null, null );
- if (status.getSeverity() == Status.ERROR )
- return status;
-
-
- //input codegen
- IPath pathInput = fDestinationFolderPath.append(INPUT);
- IFile fileInput = fWorkspace.getFile(pathInput);
- InputFileGenerator inputGenerator = new InputFileGenerator(RESULT);
- GeneratePageCommand gpcInput = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- inputGenerator,fileInput);
- //gpcInput.setStatusMonitor(getStatusMonitor());
- gpcInput.setEnvironment( env );
- status = gpcInput.execute( null, null );
- if (status.getSeverity() == Status.ERROR )
- return status;
-
- //method codegen
- IPath pathMethod = fDestinationFolderPath.append(METHOD);
- IFile fileMethod = fWorkspace.getFile(pathMethod);
- MethodFileGenerator methodGenerator = new MethodFileGenerator(INPUT);
- methodGenerator.setClientFolderPath(jspfolder);
- GeneratePageCommand gpcMethod = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- methodGenerator,fileMethod);
- //gpcMethod.setStatusMonitor(getStatusMonitor());
- gpcMethod.setEnvironment( env );
- status = gpcMethod.execute( null, null );
- if (status.getSeverity() == Status.ERROR )
- return status;
-
-
- //result codegen
- IPath pathResult = fDestinationFolderPath.append(RESULT);
- IFile fileResult = fWorkspace.getFile(pathResult);
- ResultFileGenerator rfg = new ResultFileGenerator();
- rfg.setClientFolderPath(jspfolder);
- rfg.setSetEndpointMethod(testInfo.getSetEndpointMethod());
- GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- rfg,fileResult);
- gpcResult.setEnvironment( env );
- status = gpcResult.execute( null, null );
-
- return status;
- }
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
deleted file mode 100644
index 3aa37dda7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
+++ /dev/null
@@ -1,169 +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.ui.widgets.test.wssample;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-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.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.PublishProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class GSTCLaunchCommand extends AbstractDataModelOperation
-{
-
- public static String INPUT = "Input.jsp";
- public static String TEST_CLIENT = "TestClient.jsp";
- public static String RESULT = "Result.jsp";
- public static String METHOD = "Method.jsp";
-
- private TestInfo testInfo;
- private MessageUtils msgUtils;
- private String jspfolder;
-
- public GSTCLaunchCommand(TestInfo testInfo){
- this.testInfo = testInfo;
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- setJSPFolder();
-
- return launchSample(env, monitor);
- }
- private void setJSPFolder(){
- //if the client is not a webcomponent then the
- //sample must have been created, we must now factor in
- //flexible projects
-
- IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
- if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)){
- IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject());
- IPath path = J2EEUtils.getWebContentPath(project);
- int index = testInfo.getJspFolder().lastIndexOf("/");
- String jsp = testInfo.getJspFolder().substring(index + 1);
- StringBuffer sb = new StringBuffer();
- sb.append("/").append(path.toString()).append("/").append(jsp);
- jspfolder = sb.toString();
- }
- else
- jspfolder = testInfo.getJspFolder();
-
-
- }
-
- private IStatus launchSample (IEnvironment env, IProgressMonitor monitor ) {
- IStatus status = Status.OK_STATUS;
- IPath fDestinationFolderPath = new Path(jspfolder);
- fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();
- PublishProjectCommand ppc = new PublishProjectCommand();
- ppc.setServerTypeID(testInfo.getClientServerTypeID());
- ppc.setExistingServer(testInfo.getClientExistingServer());
- ppc.setProject(testInfo.getGenerationProject());
- ppc.setEnvironment( env );
- status = ppc.execute( monitor, null );
-
- StartServerCommand serverCommand = new StartServerCommand( true, true );
- serverCommand.setServerInstanceId( testInfo.getClientExistingServer().getId() );
- serverCommand.setEnvironment( env );
-
- status = serverCommand.execute(monitor, null);
- if (status.getSeverity() == Status.ERROR) return status;
-
- IProject sampleProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
- IPath newPath = new Path(ServerUtils.getWebComponentURL(sampleProject, testInfo.getClientServerTypeID(),testInfo.getClientExistingServer()));
- int count = J2EEUtils.getWebContentPath(sampleProject).segmentCount();
-
- newPath = newPath.append(fDestinationFolderPath.removeFirstSegments(count).makeAbsolute());
- StringBuffer urlString = new StringBuffer(newPath.append(TEST_CLIENT).toString());
- if (testInfo.getEndpoint() != null && !testInfo.getEndpoint().isEmpty())
- {
- urlString.append("?endpoint=");
- urlString.append(testInfo.getEndpoint().get(0).toString());
- }
-
- try{
- URL url;
- url = new URL(urlString.toString());
-
- for( int retries = 0; retries < 10; retries++ )
- {
- try
- {
- // Test the URLs
- (new URL(newPath.append(RESULT).toString())).openStream();
- (new URL(newPath.append(METHOD).toString())).openStream();
- (new URL(newPath.append(INPUT).toString())).openStream();
- (new URL(newPath.append(TEST_CLIENT).toString())).openStream();
- // Looks good, exit loop
- break;
- }
- catch( IOException ioe )
- {
- try
- {
- Thread.sleep(1000);
- }
- catch (InterruptedException ie) {}
- }
- }
-
- IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport();
- IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR, null, null, null);
- browser.openURL(url);
- return status;
- }catch(PartInitException exc){
- //TODO: change error message
- env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc);
- status = StatusUtils.warningStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL") );
- try {
- env.getStatusHandler().report(status);
- } catch (StatusException e) {
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), e );
- }
- return status;
- }catch(MalformedURLException exc){
- env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc);
- status = StatusUtils.warningStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), exc );
- try {
- env.getStatusHandler().report(status);
- } catch (StatusException e) {
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), e );
- }
- return status;
- }
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java
deleted file mode 100644
index 29f1651d6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.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.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.wsrt.TestInfo;
-
-public class GSTCWebServiceTester implements IWebServiceTester {
-
- public ICommandFactory generate(TestInfo testInfo){
- Vector commands = new Vector();
- commands.add(new AddModuleDependenciesCommand(testInfo));
- commands.add(new GSTCGenerateCommand(testInfo));
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory launch(TestInfo testInfo){
- Vector commands = new Vector();
- commands.add(new GSTCLaunchCommand(testInfo));
- return new SimpleCommandFactory(commands);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java
deleted file mode 100644
index a001eb719..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java
+++ /dev/null
@@ -1,331 +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.ui.widgets.test.wssample;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-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.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.PublishProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.MethodFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.ResultFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.GeneratePageCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.JavaToModelCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand;
-import org.eclipse.jst.ws.internal.ext.test.JavaProxyTestCommand;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils;
-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.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class WSSampleFinishCommand extends AbstractDataModelOperation implements JavaProxyTestCommand
-{
-
- public static String INPUT = "Input.jsp";
- public static String TEST_CLIENT = "TestClient.jsp";
- public static String RESULT = "Result.jsp";
- public static String METHOD = "Method.jsp";
-
- private MessageUtils msgUtils;
-
- private Model proxyModel;
- private String sampleServerTypeID;
- private IServer sampleExistingServer;
-
-
- private String clientProject;
- private String jspFolder;
- private boolean runClientTest;
- private String sampleProject;
- private BooleanSelection[] methods;
- private String proxyBean;
- private String setEndpointMethod;
- private List endpoints;
-
- /**
- * Constructs a new JavaBeanToSampleActiveTask object with the given label and description.
- */
- public WSSampleFinishCommand ()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
- //setters and getters to be removed
- CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand();
- copy.setSampleProject(sampleProject);
- copy.setEnvironment( env );
- status = copy.execute( monitor, null );
- if (status.getSeverity() == Status.ERROR) return status;
- status = createModel(env, monitor );
- if (status.getSeverity() == Status.ERROR) return status;
- status = generatePages(env, monitor );
- if (status.getSeverity() == Status.ERROR) return status;
- //if (!isSuccessful()) return;
- status = launchSample(env, monitor);
- return status;
- }
-
-
- /**
- * Generate the four jsps that make up this
- * sample app.
- */
- protected IStatus generatePages(IEnvironment env, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- IPath fDestinationFolderPath = new Path(jspFolder);
- fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();
- IWorkspaceRoot fWorkspace = ResourcesPlugin.getWorkspace().getRoot();
-
- IPath pathTest = fDestinationFolderPath.append(TEST_CLIENT);
- IFile fileTest = fWorkspace.getFile(pathTest);
- GeneratePageCommand gpcTest = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- new TestClientFileGenerator(INPUT,METHOD,RESULT),fileTest);
- //gpcTest.setStatusMonitor(getStatusMonitor());
- gpcTest.setEnvironment( env );
- status = gpcTest.execute( monitor, null );
- if (status.getSeverity() == Status.ERROR )
- return status;
-
-
- //input codegen
- IPath pathInput = fDestinationFolderPath.append(INPUT);
- IFile fileInput = fWorkspace.getFile(pathInput);
- InputFileGenerator inputGenerator = new InputFileGenerator(RESULT);
- GeneratePageCommand gpcInput = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- inputGenerator,fileInput);
- //gpcInput.setStatusMonitor(getStatusMonitor());
- gpcInput.setEnvironment( env );
- status = gpcInput.execute( monitor, null );
- if (status.getSeverity() == Status.ERROR )
- return status;
-
- //method codegen
- IPath pathMethod = fDestinationFolderPath.append(METHOD);
- IFile fileMethod = fWorkspace.getFile(pathMethod);
- MethodFileGenerator methodGenerator = new MethodFileGenerator(INPUT);
- methodGenerator.setClientFolderPath(jspFolder);
- GeneratePageCommand gpcMethod = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- methodGenerator,fileMethod);
- //gpcMethod.setStatusMonitor(getStatusMonitor());
- gpcMethod.setEnvironment( env );
- status = gpcMethod.execute( monitor, null );
- if (status.getSeverity() == Status.ERROR )
- return status;
-
-
- //result codegen
- IPath pathResult = fDestinationFolderPath.append(RESULT);
- IFile fileResult = fWorkspace.getFile(pathResult);
- ResultFileGenerator rfg = new ResultFileGenerator();
- rfg.setClientFolderPath(jspFolder);
- rfg.setSetEndpointMethod(setEndpointMethod);
- GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- rfg,fileResult);
- //gpcResult.setStatusMonitor(getStatusMonitor());
- gpcResult.setEnvironment( env );
- status = gpcResult.execute( monitor, null );
-
- return status;
- }
-
-
- protected IStatus launchSample (IEnvironment env, IProgressMonitor monitor ) {
-
- IStatus status = Status.OK_STATUS;
- if (!runClientTest) return status;
-
-
- IPath fDestinationFolderPath = new Path(jspFolder);
- fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();
-
- PublishProjectCommand ppc = new PublishProjectCommand();
- ppc.setServerTypeID(sampleServerTypeID);
- ppc.setExistingServer(sampleExistingServer);
- ppc.setProject(sampleProject);
- ppc.setEnvironment( env );
- status = ppc.execute( monitor, null );
-
- StartProjectCommand spc = new StartProjectCommand(false );
- spc.setServiceServerTypeID(sampleServerTypeID);
- spc.setSampleExistingServer(sampleExistingServer);
- IProject project = (IProject) ResourceUtils.findResource(sampleProject);
- spc.setSampleProject(project);
- spc.setIsWebProjectStartupRequested(true);
- spc.setEnvironment( env );
-
- status = spc.execute( monitor, null );
- if (status.getSeverity() == Status.ERROR) return status;
-
- IPath newPath = new Path(ResourceUtils.getWebProjectURL(ResourceUtils.getProjectOf(fDestinationFolderPath),sampleServerTypeID,sampleExistingServer));
- newPath = newPath.append(fDestinationFolderPath.removeFirstSegments(2).makeAbsolute());
- StringBuffer urlString = new StringBuffer(newPath.append(TEST_CLIENT).toString());
- if (endpoints != null && !endpoints.isEmpty())
- {
- urlString.append("?endpoint=");
- urlString.append(endpoints.get(0).toString());
- }
-
- try{
- URL url;
- url = new URL(urlString.toString());
-
- for( int retries = 0; retries < 10; retries++ )
- {
- try
- {
- // Test the URLs
- (new URL(newPath.append(RESULT).toString())).openStream();
- (new URL(newPath.append(METHOD).toString())).openStream();
- (new URL(newPath.append(INPUT).toString())).openStream();
- (new URL(newPath.append(TEST_CLIENT).toString())).openStream();
- // Looks good, exit loop
- break;
- }
- catch( IOException ioe )
- {
- try
- {
- Thread.sleep(1000);
- }
- catch (InterruptedException ie) {}
- }
- }
-
- IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport();
- IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, null, null, null);
- browser.openURL(url);
- return status;
- }catch(PartInitException exc){
- //TODO: change error message
- env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc);
- status = StatusUtils.warningStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), exc );
- try {
- env.getStatusHandler().report(status);
- } catch (StatusException e) {
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), e );
- }
- return status;
- }catch(MalformedURLException exc){
- env.getLog().log(ILog.WARNING, 5048, this, "launchSample", exc);
- status = StatusUtils.warningStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), exc );
- try {
- env.getStatusHandler().report(status);
- } catch (StatusException e) {
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), e );
- }
- return status;
- }
- }
-
-
-
- protected IStatus createModel(IEnvironment env, IProgressMonitor monitor ) {
-
- //create the model from the resource
- JavaToModelCommand jtmc = new JavaToModelCommand();
- jtmc.setMethods(methods);
- jtmc.setClientProject(clientProject);
- jtmc.setProxyBean(proxyBean);
- jtmc.setEnvironment( env );
- //jtmc.setStatusMonitor(getStatusMonitor());
- IStatus status = jtmc.execute( monitor, null);
- if (status.getSeverity() == Status.ERROR) return status;
-
- proxyModel = jtmc.getJavaDataModel();
- return status;
- }
-
- public void setServerTypeID(String sampleServerTypeID)
- {
- this.sampleServerTypeID = sampleServerTypeID;
- }
-
- public void setExistingServer(IServer sampleExistingServer)
- {
- this.sampleExistingServer = sampleExistingServer;
- }
-
- public void setJspFolder(String jspFolder)
- {
- this.jspFolder = jspFolder;
- }
-
- public void setRunClientTest(boolean runClientTest)
- {
- this.runClientTest = runClientTest;
- }
-
- public void setSampleProject(String sampleProject)
- {
- this.sampleProject = sampleProject;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- public void setMethods(BooleanSelection[] methods)
- {
- this.methods = methods;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public void setSetEndpointMethod(String setEndpointMethod)
- {
- this.setEndpointMethod = setEndpointMethod;
- }
-
- public void setEndpoint(List endpoints)
- {
- this.endpoints = endpoints;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java
deleted file mode 100644
index 59f68f977..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java
+++ /dev/null
@@ -1,33 +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.ui.widgets.test.wssample;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public class WebServiceWSSampleExecutable implements WebServiceExecutable
-{
-
-
- public AbstractDataModelOperation getFinishCommand()
- {
- return new WSSampleFinishCommand();
- }
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index e19b750e6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,59 +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.ui.wizard;
-
-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.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType;
-
-
-public class PrivateUDDIRegistryTypeRegistry
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private static PrivateUDDIRegistryTypeRegistry instance_;
-
- private PrivateUDDIRegistryTypeRegistry() {
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceClientTypeRegistry object.
- */
- public static PrivateUDDIRegistryTypeRegistry getInstance() {
- if (instance_ == null) {
- instance_ = new PrivateUDDIRegistryTypeRegistry();
- }
-
- return instance_;
- }
-
- public PrivateUDDIRegistryType getPrivateUDDIRegistryType() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "privateUDDIRegistryType");
-
- try {
- Object configElement = ((config.length > 0) ? config[0].createExecutableExtension("class") : null);
- if(configElement != null && configElement instanceof PrivateUDDIRegistryType)
- return (PrivateUDDIRegistryType)configElement;
- else
- return null;
- }
- catch (CoreException e) {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 0070383df..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,96 +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.ui.wizard;
-
-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;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryType;
-
-
-public class PublicUDDIRegistryTypeRegistry
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- private static PublicUDDIRegistryTypeRegistry instance_;
- private Vector types_;
- private Vector configElements_;
-
- private PublicUDDIRegistryTypeRegistry() {
- types_ = new Vector();
- configElements_ = new Vector();
-
- init();
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceClientTypeRegistry object.
- */
- public static PublicUDDIRegistryTypeRegistry getInstance() {
- if (instance_ == null) {
- instance_ = new PublicUDDIRegistryTypeRegistry();
- }
-
- return instance_;
- }
-
- public void init() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "publicUDDIRegistryType");
-
- for (int i = 0; i < config.length; i++) {
- try {
- Object configElement = config[i].createExecutableExtension("class");
-
- if( configElement instanceof PublicUDDIRegistryType) {
- types_.add(configElement);
- configElements_.add(config[i]);
- }
- }
- catch (CoreException e) {}
- }
- }
-
- public PublicUDDIRegistryType[] getAllPublicUDDIRegistryTypes() {
- PublicUDDIRegistryType[] types = new PublicUDDIRegistryType[types_.size()];
- for (int i = 0; i < types_.size(); i++) {
- types[i] = (PublicUDDIRegistryType)types_.elementAt(i);
- }
- return types;
- }
-
- public PublicUDDIRegistryType getPublicUDDIRegistryTypeByID(String id) {
- for (int i = 0; i < configElements_.size(); i++) {
- IConfigurationElement c = (IConfigurationElement)configElements_.elementAt(i);
- if (c.getAttribute("id").equals(id))
- return (PublicUDDIRegistryType)types_.elementAt(i);
- }
- return null;
- }
-
- public String getPublicUDDIRegistryTypeIDByName(String name) {
- for (int i = 0; i < types_.size(); i++) {
- PublicUDDIRegistryType type = (PublicUDDIRegistryType)types_.elementAt(i);
- if (type.getName().equals(name))
- return ((IConfigurationElement)configElements_.elementAt(i)).getAttribute("id");
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
deleted file mode 100644
index ce4d40b93..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
+++ /dev/null
@@ -1,842 +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.ui.wizard;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor;
-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.Color;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-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.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.server.core.IModuleType;
-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.ServerCore;
-import org.eclipse.wst.server.ui.ServerUICore;
-
-public class RuntimeServerSelectionDialog extends Dialog implements Listener {
-
- private Shell thisShell;
- private Group viewSelectionGroup_;
- private Text messageBanner_;
- private Composite primaryGroup_;
- private Group runtimesGroup_;
- private Group serversGroup_;
- private Tree runtimesList_;
- private Tree serverList_;
- private Button viewSelectionByRuntimeButton_;
- private Button viewSelectionByServerButton_;
- private Button viewSelectionByExploreButton_;
- private Combo j2eeVersionCombo;
- /*
- * CONTEXT_ID PWRS0001 for the selection of runtime, server and project combination
- */
- private String INFOPOP_PWRS_DIALOG = WebServiceConsumptionUIPlugin.ID + ".PWRS0001";
- /* CONTEXT_ID PWRS0002 for the runtime selection on in the dailog */
- private String INFOPOP_PWRS_LIST_RUNTIMES = WebServiceConsumptionUIPlugin.ID + ".PWRS0002";
- /* CONTEXT_ID PWRS0003 for the server selection in the dialog */
- private String INFOPOP_PWRS_LIST_SERVERS = WebServiceConsumptionUIPlugin.ID + ".PWRS0003";
- /*
- * CONTEXT_ID PWRS0004 for the EJB Project combo box of the runtime selection dialog
- */
- // private String INFOPOP_PWRS_EJB_PROJECT = WebServiceConsumptionUIPlugin.ID
- // + ".PWRS0004";
- /*
- * CONTEXT_ID PWRS0005 for the runtime view radio button of the runtime selection dialog
- */
- private String INFOPOP_PWRS_RADIO_RUNTIME = WebServiceConsumptionUIPlugin.ID + ".PWRS0005";
- /*
- * CONTEXT_ID PWRS0006 for the server view radio button of the runtime selection dialog
- */
- private String INFOPOP_PWRS_RADIO_SERVER = WebServiceConsumptionUIPlugin.ID + ".PWRS0006";
- /*
- * CONTEXT_ID PWRS0007 for the explore view radio button of the runtime selection dialog
- */
- private String INFOPOP_PWRS_RADIO_EXPLORE = WebServiceConsumptionUIPlugin.ID + ".PWRS0007";
- /*
- * CONTEXT_ID PWRS0008 for the Web Project combo box of the runtime selection dialog
- */
- // private String INFOPOP_PWRS_COMBO_PROJECT =
- // WebServiceConsumptionUIPlugin.ID + ".PWRS0008";
- /*
- * CONTEXT_ID PWRS0009 for the J2EE version combo box of the runtime selection dialog
- */
- private String INFOPOP_PWRS_J2EE_VERSION = WebServiceConsumptionUIPlugin.ID + ".PWRS0009";
-
- // rskreg
- //private WebServiceServerRuntimeTypeRegistry wssrtRegistry;
- //private WebServiceClientTypeRegistry wsctRegistry;
- // rskreg
- private Hashtable serverLabels_;
- private Hashtable existingServersTable_;
- private String defaultServer_;
- private String defaultRuntime_;
- private String typeId_;
- // rskreg
- //private IWebServiceRuntime selectedRuntime_;
- //private WebServiceRuntimeInfo selectedRuntime_;
- private RuntimeDescriptor selectedRuntime_;
- // rskreg
- private IServer selectedServer_;
- private String selectedServerLabel_;
- private String selectedServerFactoryID_;
- private boolean isExistingServer_;
- private boolean validateOn_ = false;
- private byte selectionMode_;
- private final byte MODE_SERVICE = (byte) 0;
- private final String SERVER_TYPES_ICON = "icons/servers/servers_obj.gif";
- private final String EXISTING_SERVERS_ICON = "icons/servers/existing_server_obj.gif";
- private String j2eeVersion;
- private String serverInstanceID_;
-
- public RuntimeServerSelectionDialog(Shell shell, byte mode, TypeRuntimeServer ids, String j2eeVersion) {
- super(shell);
- selectionMode_ = mode;
- typeId_ = ids.getTypeId();
- defaultRuntime_ = ids.getRuntimeId();
- defaultServer_ = ids.getServerId();
- serverInstanceID_ = ids.getServerInstanceId();
- setIsExistingServer(ids.getServerInstanceId() != null);
- serverLabels_ = new Hashtable();
- existingServersTable_ = new Hashtable();
- // rskreg
- //wsctRegistry = WebServiceClientTypeRegistry.getInstance();
- //wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
- // rskreg
- this.j2eeVersion = j2eeVersion;
- }
-
- public TypeRuntimeServer getTypeRuntimeServer() {
- TypeRuntimeServer ids = new TypeRuntimeServer();
-
- ids.setTypeId(typeId_);
- if (selectedRuntime_ != null)
- ids.setRuntimeId(selectedRuntime_.getId());
-
- if( selectedServerFactoryID_ == null )
- {
- ids.setServerId( defaultServer_ );
- ids.setServerInstanceId( serverInstanceID_ );
- }
- else
- {
- ids.setServerId(selectedServerFactoryID_);
-
- if (isExistingServer_ && selectedServer_ != null)
- {
- ids.setServerInstanceId(selectedServer_.getId());
- }
- }
-
- return ids;
- }
-
- public String getJ2EEVersion() {
- return j2eeVersion;
- }
-
- private boolean getIsExistingServer() {
- return isExistingServer_;
- }
-
- private void setIsExistingServer(boolean isExisting) {
- isExistingServer_ = isExisting;
- }
-
- protected Control createContents(Composite parent) {
- Composite comp = (Composite) super.createContents(parent);
- parent.getShell().pack();
- return comp;
- }
-
- protected Control createDialogArea(Composite parent) {
- validateOn_ = false;
- thisShell = parent.getShell();
- if (thisShell == null) {
- thisShell = createShell();
- }
- Composite composite = (Composite) super.createDialogArea(parent);
- GridLayout gl;
- GridData gd;
- // Window title
- if (selectionMode_ == MODE_SERVICE)
- thisShell.setText(getMessage("%PAGE_TITLE_WS_RUNTIME_SELECTION"));
- else
- thisShell.setText(getMessage("%PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION"));
-
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- helpSystem.setHelp(thisShell, INFOPOP_PWRS_DIALOG);
- // Dialog description banner
- messageBanner_ = new Text(composite, SWT.READ_ONLY | SWT.WRAP);
- messageBanner_.setText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION") + "\n" + " "); // reserves a second line for message display
- messageBanner_.setToolTipText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION"));
- gd = new GridData(GridData.FILL_HORIZONTAL);
- messageBanner_.setLayoutData(gd);
- // -----------------------------------------------------------------------//
- new Label(composite, SWT.HORIZONTAL);
- // -----------------------------------------------------------------------//
- // Selection
- thisShell.setToolTipText(getMessage("%TOOLTIP_PWRS_PAGE"));
- viewSelectionGroup_ = new Group(composite, SWT.NONE);
- gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- viewSelectionGroup_.setLayout(gl);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- viewSelectionGroup_.setLayoutData(gd);
- if (selectionMode_ == MODE_SERVICE)
- viewSelectionGroup_.setText(getMessage("%LABEL_SELECTION_VIEW_TITLE"));
- else
- viewSelectionGroup_.setText(getMessage("%LABEL_CLIENT_SELECTION_VIEW_TITLE"));
- viewSelectionByServerButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
- viewSelectionByServerButton_.setText(getMessage("%LABEL_SELECTION_VIEW_SERVER"));
- viewSelectionByServerButton_.addListener(SWT.Selection, this);
- viewSelectionByServerButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_SERVER"));
- viewSelectionByServerButton_.setSelection(true);
- helpSystem.setHelp(viewSelectionByServerButton_, INFOPOP_PWRS_RADIO_SERVER);
- viewSelectionByRuntimeButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
- viewSelectionByRuntimeButton_.setText(getMessage("%LABEL_SELECTION_VIEW_RUNTIME"));
- viewSelectionByRuntimeButton_.addListener(SWT.Selection, this);
- viewSelectionByRuntimeButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_RUNTIME"));
- helpSystem.setHelp(viewSelectionByRuntimeButton_, INFOPOP_PWRS_RADIO_RUNTIME);
- viewSelectionByExploreButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
- viewSelectionByExploreButton_.setText(getMessage("%LABEL_SELECTION_VIEW_EXPLORE"));
- viewSelectionByExploreButton_.addListener(SWT.Selection, this);
- viewSelectionByExploreButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_EXPLORE"));
- helpSystem.setHelp(viewSelectionByExploreButton_, INFOPOP_PWRS_RADIO_EXPLORE);
- primaryGroup_ = new Composite(composite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 1;
- gl.makeColumnsEqualWidth = true;
- gd = new GridData(GridData.FILL_BOTH);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- runtimesGroup_ = new Group(primaryGroup_, SWT.NONE);
- gl = new GridLayout();
- runtimesGroup_.setLayout(gl);
- gd = new GridData(GridData.FILL_BOTH);
- runtimesGroup_.setLayoutData(gd);
- runtimesGroup_.setText(getMessage("%LABEL_RUNTIMES_LIST"));
- runtimesList_ = new Tree(runtimesGroup_, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- gd = new GridData(GridData.FILL_BOTH);
- runtimesList_.setLayoutData(gd);
- runtimesList_.addListener(SWT.Selection, this);
- runtimesList_.setToolTipText(getMessage("%TOOLTIP_PWRS_LIST_RUNTIMES"));
- helpSystem.setHelp(runtimesList_, INFOPOP_PWRS_LIST_RUNTIMES);
- // Server labels control
- serversGroup_ = new Group(primaryGroup_, SWT.NONE);
- gl = new GridLayout();
- serversGroup_.setLayout(gl);
- gd = new GridData(GridData.FILL_BOTH);
- serversGroup_.setLayoutData(gd);
- serversGroup_.setText(getMessage("%LABEL_SERVERS_LIST"));
- serverList_ = new Tree(serversGroup_, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- serverList_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
- serverList_.addListener(SWT.Selection, this);
- serverList_.setToolTipText(getMessage("%TOOLTIP_PWRS_LIST_SERVERS"));
- ServersList serverList = new ServersList();
- serverList.setServerTreeItems(serverList_);
- helpSystem.setHelp(serverList_, INFOPOP_PWRS_LIST_SERVERS);
- setRuntimesGroup();
- // J2EE version
- Composite j2eeVersionComposite = new Composite(composite, SWT.NONE);
- gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- gd = new GridData(GridData.FILL_HORIZONTAL);
- j2eeVersionComposite.setLayout(gl);
- j2eeVersionComposite.setLayoutData(gd);
- Label j2eeVersionLabel = new Label(j2eeVersionComposite, SWT.NONE);
- j2eeVersionLabel.setText(getMessage("%LABEL_J2EE_VERSION"));
- j2eeVersionCombo = new Combo(j2eeVersionComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
- gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- gd = new GridData(GridData.FILL_HORIZONTAL);
- j2eeVersionCombo.setLayout(gl);
- j2eeVersionCombo.setLayoutData(gd);
- j2eeVersionCombo.addListener(SWT.Selection, this);
- j2eeVersionCombo.setToolTipText(getMessage("%TOOLTIP_PWRS_J2EE_VERSION"));
- helpSystem.setHelp(j2eeVersionCombo, INFOPOP_PWRS_J2EE_VERSION);
- // -----------------------------------------------------------------------//
- new Label(composite, SWT.HORIZONTAL);
- validateOn_ = true;
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
- setJ2EEVersions();
- return composite;
- }
-
- private void setJ2EEVersions() {
- j2eeVersionCombo.setEnabled(true);
- j2eeVersionCombo.removeAll();
- String[] versions = null;
- // rskreg
- //if (selectedRuntime_ != null)
- //versions = selectedRuntime_.getJ2EEVersions();
- if (selectedRuntime_ != null)
- versions = selectedRuntime_.getJ2eeLevels();
- // rskreg
- if (versions != null) {
- //j2eeVersionCombo.setItems(versions);
- setJ2EEComboItems(versions);
- j2eeVersionCombo.select(0);
- if (j2eeVersion != null) {
- int i = j2eeVersionCombo.indexOf(J2EEUtils.getLabelFromJ2EEVersion(j2eeVersion));
- if (i > 0)
- j2eeVersionCombo.select(i);
- }
- }
- else
- j2eeVersionCombo.setEnabled(false);
- }
-
- private void setJ2EEComboItems(String[] versions)
- {
- String[] j2eeLabels = new String[versions.length];
- for (int i = 0; i < versions.length; i++)
- {
- String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
- if (label != null && label.length() >0)
- j2eeLabels[i] = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
- else
- j2eeLabels[i] = getMessage("%LABEL_NA");
- }
- j2eeVersionCombo.setItems(j2eeLabels);
- }
-
- private void setJ2EEVersionBasedOnServer()
- {
- //Get the list of J2EE versions
- String[] versions = null;
- if (selectedRuntime_ == null || selectedServerFactoryID_== null)
- return;
-
- // rskreg
- //versions = selectedRuntime_.getJ2EEVersions();
- versions = selectedRuntime_.getJ2eeLevels();
- // rskreg
- if (versions==null)
- return;
-
- //Pick the first version that the selected server supports
- for (int i=0; i<versions.length; i++)
- {
- if (isServerValid(selectedServerFactoryID_, versions[i]))
- {
- //Set the j2ee level to this version
- String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
- j2eeVersionCombo.setText(label);
- setJ2EEVersionFromJ2EEVersionCombo();
- }
- }
- }
-
-
- private boolean isServerValid(String serverFactoryId, String j2eeVersion)
- {
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- if (stJ2EEVersion == null)
- return false;
-
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType!=null)
- {
- IRuntimeType serverRuntime = serverType.getRuntimeType();
- IModuleType[] mTypes = serverRuntime.getModuleTypes();
- for (int i=0; i<mTypes.length; i++)
- {
- IModuleType mType = mTypes[i];
- String type = mType.getId();
- String moduleVersion = mType.getVersion();
- if (type.equals(IServerTargetConstants.WEB_TYPE) && moduleVersion.equals(stJ2EEVersion))
- {
- //Found a match, return true!
- return true;
- }
- }
- }
- //no match found or the server type was null. Return false.
- return false;
- }
-
- private void validateServerRuntimeSelection() {
- // Check if the extension exists
- if (selectionMode_ == MODE_SERVICE) {
- if (selectedServerFactoryID_!=null && selectedRuntime_!=null) {
- // rskreg
- //WebServiceServerRuntimeType wssrt = wssrtRegistry.getWebServiceServerRuntimeType(selectedServerFactoryID_, selectedRuntime_.getId(), typeId_);
- // rskreg
- // rm WebServiceServerRuntimeType wssrt =
- // wssrtRegistry.getWebServiceServerRuntimeType(selectedServerFactoryID_,
- // selectedRuntime_.getId(), wse.getWebServiceType());
- // rm if (wssrt!=null &&
- // wssrtRegistry.isServerSupportedForChosenType(wse.getWebServiceType(),selectedServerFactoryID_))
- // {
-
- //rskreg
- boolean wssrtSupported = WebServiceRuntimeExtensionUtils2.isServerRuntimeTypeSupported(selectedServerFactoryID_,selectedRuntime_.getId(),typeId_);
- //if (wssrt != null && wssrtRegistry.isServerSupportedForChosenType(typeId_, selectedServerFactoryID_)) {
- //setOKStatusMessage();
- //}
-
- if (wssrtSupported && WebServiceRuntimeExtensionUtils2.isServerSupportedForChosenServiceType(typeId_, selectedServerFactoryID_)) {
- setOKStatusMessage();
- }
- // rskreg
- else {
- setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
- }
- }
- }
- else {
- // rm String clientId =
- // wsctRegistry.getClientTypeIdByName(clientScenarioId_);
- String clientId = typeId_;
- // rm String clientId =
- // wsctRegistry.getClientTypeIdByName(wse.getProxySelected());
- // rskreg
-
- //WebServiceServer wss = wsctRegistry.getWebServiceServerByFactoryId(selectedServerFactoryID_);
-
- //if (wss == null || selectedRuntime_ == null || !wsctRegistry.webServiceClientRuntimeTypeExists(wss.getId(), selectedRuntime_.getId(), clientId)) {
- //setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
- //}
- if (selectedServerFactoryID_==null || selectedRuntime_ == null || !WebServiceRuntimeExtensionUtils2.isServerClientRuntimeTypeSupported(selectedServerFactoryID_, selectedRuntime_.getId(), clientId)) {
- setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
- }
- // rskreg
- else {
- setOKStatusMessage();
- }
- }
- // Disable OK button if the runtime selection is invalid
- TreeItem[] runtimeSel = runtimesList_.getSelection();
- if (runtimeSel == null || runtimeSel.length <= 0 || runtimeSel[0].getText().length() == 0) {
- disableOKButton();
- }
- // Disable OK button if server selection is invalid
- TreeItem[] serverSel = serverList_.getSelection();
- String currentSelection = (serverSel != null && serverSel.length > 0) ? serverSel[0].getText() : "";
- if (serverSel == null || currentSelection.length() == 0) {
- disableOKButton();
- }
- if (!serverLabels_.containsKey(currentSelection) || !existingServersTable_.containsKey(currentSelection)) {
- disableOKButton();
- setOKStatusMessage();
- }
- // Disable OK button if category is selected rather than a server
- if (serverSel.length > 0 && serverSel[0].getItemCount()!=0) {
- disableOKButton();
- }
- else {
- enableOKButton();
- }
-
- }
-
- private void setOKStatusMessage() {
- messageBanner_.setText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION"));
- Color black = new Color(thisShell.getDisplay(), 0x00, 0, 0);
- messageBanner_.setForeground(black);
- enableOKButton();
- }
-
- private void setERRORStatusMessage(String message) {
- messageBanner_.setText(getMessage(message));
- Color red = new Color(thisShell.getDisplay(), 0xFF, 0, 0);
- messageBanner_.setForeground(red);
- disableOKButton();
- }
-
- private void disableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(false);
- }
-
- private void enableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(true);
- }
-
- protected void okPressed() {
- setJ2EEVersionFromJ2EEVersionCombo();
- //j2eeVersion = (j2eeVersionCombo.getEnabled()) ? j2eeVersionCombo.getText() : null;
- setReturnCode(OK);
- close();
- }
-
- private void setJ2EEVersionFromJ2EEVersionCombo()
- {
- if (j2eeVersionCombo.getEnabled())
- {
- String j2eeLabel = j2eeVersionCombo.getText();
- String j2eeVersionString = J2EEUtils.getJ2EEVersionFromLabel(j2eeLabel);
- if (j2eeVersionString != null && j2eeVersionString.length() > 0)
- j2eeVersion = j2eeVersionString;
- else
- j2eeVersion = null;
- }
- else
- j2eeVersion = null;
- }
- /**
- * 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) {
- if (!validateOn_)
- return;
- enableOKButton();
- if (viewSelectionByRuntimeButton_ == event.widget) {
- handleRuntimeViewSelectionEvent();
- return;
- }
- else if (viewSelectionByServerButton_ == event.widget) {
- handleServerViewSelectionEvent();
- return;
- }
- else if (viewSelectionByExploreButton_ == event.widget) {
- handleExploreViewSelectionEvent();
- return;
- }
- else if (j2eeVersionCombo == event.widget) {
- setJ2EEVersionFromJ2EEVersionCombo();
- //j2eeVersion = (j2eeVersionCombo.getEnabled()) ? j2eeVersionCombo.getText() : null;
- return;
- }
- else if (runtimesList_ == event.widget) {
- TreeItem[] runtimeSel = runtimesList_.getSelection();
- processRuntimeListSelection(runtimeSel[0].getText());
- validateServerRuntimeSelection();
- setJ2EEVersions();
- setJ2EEVersionBasedOnServer();
- }
- else if (serverList_ == event.widget) {
- processServerListSelection();
- validateServerRuntimeSelection();
- setJ2EEVersionBasedOnServer();
- }
- }
-
- private void handleRuntimeViewSelectionEvent() {
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- gl.makeColumnsEqualWidth = true;
- GridData gd = new GridData(GridData.FILL_BOTH);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- primaryGroup_.layout();
-
- // TODO: Show all runtimes, and only servers supported by current type id
- }
-
- //
- // Called by handleEvent() when the user selects the layout to view
- //
- public void handleServerViewSelectionEvent() {
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- gl.makeColumnsEqualWidth = true;
- GridData gd = new GridData(GridData.FILL_BOTH);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- primaryGroup_.layout();
- serversGroup_.setLocation(5, 5);
- runtimesGroup_.setLocation(4, 100);
- serversGroup_.layout();
- runtimesGroup_.layout();
-
- // TODO: Show all servers, and only runtimes supported by the current type id
- }
-
- //
- // Called by handleEvent() when the user selects the layout to view
- //
- private void handleExploreViewSelectionEvent() {
- GridLayout gl;
- gl = (GridLayout) primaryGroup_.getLayout();
- gl.numColumns = 2;
- gl.makeColumnsEqualWidth = true;
- GridData gd = new GridData(GridData.FILL_BOTH);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- primaryGroup_.layout();
-
- // TODO: Show all servers and runtimes from the type id
-
- }
-
- private void processRuntimeListSelection(String runtimeName) {
-
- if (selectionMode_ == MODE_SERVICE) {
- selectedRuntime_ = WebServiceRuntimeExtensionUtils2.getRuntimeByLabel(runtimeName);
- }
- else {
- selectedRuntime_ = WebServiceRuntimeExtensionUtils2.getRuntimeByLabel(runtimeName);
- }
- }
-
- private void processServerListSelection() {
- String currentSelection;
- TreeItem[] serverSel = serverList_.getSelection();
- if (serverSel != null && serverSel.length > 0) {
- currentSelection = serverSel[0].getText();
- if (serverLabels_.containsKey(currentSelection) || existingServersTable_.containsKey(currentSelection)) {
- if (existingServersTable_.containsKey(currentSelection)) {
- selectedServer_ = (IServer) existingServersTable_.get(currentSelection);
- selectedServerLabel_ = currentSelection;
- selectedServerFactoryID_ = selectedServer_.getServerType().getId();
- }
- else if (serverLabels_.containsKey(currentSelection)) {
- TreeItem parentItem = serverSel[0].getParentItem();
- if (parentItem != null && !parentItem.getText().equalsIgnoreCase(getMessage("%LABEL_TREE_EXISTING_SERVERS"))) {
- selectedServerLabel_ = currentSelection;
- selectedServer_ = null;
- selectedServerFactoryID_ = (String) serverLabels_.get(currentSelection);
- }
- }
-
- // check if isExistingServer or new ServerType
- TreeItem parentItem = serverSel[0].getParentItem();
- if (parentItem != null && parentItem.getText().equalsIgnoreCase(getMessage("%LABEL_TREE_EXISTING_SERVERS"))) {
- setIsExistingServer(true);
- }
- else {
- setIsExistingServer(false);
- }
- }
- else {
- selectedServer_ = null;
- selectedServerLabel_ = null;
- selectedServerFactoryID_ = null;
- setIsExistingServer(false);
- return;
- }
- }
- }
-
- private static String getMessage(String key) {
- return WebServiceConsumptionUIPlugin.getMessage(key);
- }
-
- private void setRuntimesGroup() {
- runtimesList_.removeAll();
- String[] runtimes = null;
-
- if (selectionMode_ == MODE_SERVICE) {
- runtimes = WebServiceRuntimeExtensionUtils2.getRuntimesByServiceType(typeId_);
- }
- else {
- runtimes = WebServiceRuntimeExtensionUtils2.getAllRuntimesForClientSide();
- }
-
- TreeItem[] runtimeName = new TreeItem[runtimes.length];
-
- if (runtimes != null) {
- for (int i = 0; i < runtimes.length; i++) {
- String runtimeLabel = getRuntimeLabel(runtimes[i]);
- runtimeName[i] = new TreeItem(runtimesList_, SWT.NONE);
- runtimeName[i].setText(runtimeLabel);
-
- if (runtimes[i].equalsIgnoreCase(defaultRuntime_)) {
- runtimesList_.setSelection(new TreeItem[] { runtimeName[i]});
- selectedRuntime_ = getRuntime(runtimes[i]);
- }
- }
- }
- }
-
- private String getRuntimeLabel(String type) {
- return getRuntime(type).getLabel();
- }
-
- private RuntimeDescriptor getRuntime(String type) {
- if (selectionMode_ == MODE_SERVICE) {
- return WebServiceRuntimeExtensionUtils2.getRuntimeById(type);
- }
- else {
- return WebServiceRuntimeExtensionUtils2.getRuntimeById(type);
- }
- }
-
- /**
- *
- * ServersList class
- *
- * Class which easily creates the Tree structure and entries for existing servers and server types
- */
- public class ServersList {
-
- private TreeItem[] existingServersTree;
- boolean existingServer = false;
-
- public void setServerTreeItems(Tree serversList) {
- this.setExistingServersTree(serversList);
- this.setServerTypesTree(serversList);
- }
-
- public void setExistingServersTree(Tree serverList) {
- String[] serverIds = this.getAllExistingServers();
- existingServersTree = new TreeItem[1];
- TreeItem[] existingServerItems = new TreeItem[serverIds.length];
- existingServersTree[0] = new TreeItem(serverList, SWT.NONE);
- existingServersTree[0].setText(getMessage("%LABEL_TREE_EXISTING_SERVERS"));
- ImageDescriptor id = WebServiceConsumptionUIPlugin.getImageDescriptor(EXISTING_SERVERS_ICON);
- if (id != null)
- existingServersTree[0].setImage(id.createImage());
- for (int k = 0; k < serverIds.length; k++) {
- IServerType serverType = ServerCore.findServerType(((IServer) existingServersTable_.get(serverIds[k])).getServerType().getId());
- if (serverType != null) {
- existingServerItems[k] = new TreeItem(existingServersTree[0], SWT.NONE);
- existingServerItems[k].setText(serverIds[k]);
- if (serverIds[k].equalsIgnoreCase(defaultServer_) && getIsExistingServer()) {
- existingServersTree[0].setExpanded(true);
- serverList.setSelection(new TreeItem[] { existingServerItems[k]});
- existingServer = true;
- RuntimeServerSelectionDialog.this.setIsExistingServer(true);
- selectedServer_ = (IServer) existingServersTable_.get(defaultServer_);
- selectedServerLabel_ = serverIds[k];
- selectedServerFactoryID_ = selectedServer_.getServerType().getId();
- }
- existingServerItems[k].setImage(ServerUICore.getLabelProvider().getImage(serverType));
- }
- }
- }
-
- public void setServerTypesTree(Tree serverList) {
-
- TreeItem[] serverTypesTree = new TreeItem[1];
- serverTypesTree[0] = new TreeItem(serverList, SWT.NONE);
- serverTypesTree[0].setText(getMessage("%LABEL_TREE_SERVER_TYPES"));
- ImageDescriptor id = WebServiceConsumptionUIPlugin.getImageDescriptor(SERVER_TYPES_ICON);
- if (id != null)
- serverTypesTree[0].setImage(id.createImage());
- Hashtable categories_ = new Hashtable();
- Hashtable categoryTreeItem = new Hashtable();
- String[] serverIds = null;
- // rm String wst = wse.getWebServiceType();
- if (selectionMode_ == MODE_SERVICE) {
- serverIds = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByServiceType(typeId_);
- }
- else {
- serverIds = WebServiceRuntimeExtensionUtils2.getAllClientServerFactoryIds();
- }
- // rm serverId =
- // wssrtRegistry.getServerFactoryIdsByType(wse.getWebServiceType());
- if (serverIds == null) {
- serverIds = getAllServerTypes();
- }
- TreeItem[] parent = new TreeItem[serverIds.length];
- TreeItem[] item = new TreeItem[serverIds.length];
- if (serverIds != null) {
- for (int i = 0; i < serverIds.length; i++) {
- String server = ServerUtils.getInstance().getServerLabelForId(serverIds[i]);
- if (server != null) {
- RuntimeServerSelectionDialog.this.serverLabels_.put(server, serverIds[i]);
- IServerType serverType = ServerCore.findServerType(serverIds[i]);
- IRuntimeType runtimeType = serverType.getRuntimeType();
- if (!categories_.containsKey(serverType) && runtimeType != null) {
- categories_.put(serverType, runtimeType);
- if (categoryTreeItem.get(runtimeType) == null) {
- String categoryText = runtimeType.getName();
- Image categoryImage = ServerUICore.getLabelProvider().getImage(runtimeType);
- parent[i] = new TreeItem(serverTypesTree[0], SWT.NONE);
- parent[i].setText(categoryText);
- parent[i].setImage(categoryImage);
- categoryTreeItem.put(runtimeType, parent[i]);
- }
- else {
- parent[i] = (TreeItem) categoryTreeItem.get(runtimeType);
- }
- String factoryText = serverType.getName();
- Image factoryImage = ServerUICore.getLabelProvider().getImage(serverType);
- item[i] = new TreeItem(parent[i], SWT.NONE);
- item[i].setText(factoryText);
- item[i].setImage(factoryImage);
- item[i].setData(serverType);
- if (factoryText.equalsIgnoreCase(defaultServer_) && !existingServer) {
- serverList.setSelection(new TreeItem[] { item[i]});
- selectedServer_ = null;
- selectedServerLabel_ = factoryText;
- selectedServerFactoryID_ = (String) serverLabels_.get(selectedServerLabel_);
- }
- }
- }
- }
- }
-
- }
-
- /**
- * Get all servers in the workspace
- *
- * @return String[] of existing server names
- */
- private String[] getAllExistingServers() {
- Vector serverIds = new Vector();
- {
- IServer[] servers = ServerCore.getServers();
- if (servers != null && servers.length!=0) {
- for (int i = 0; i < servers.length; i++) {
- IServer server = (IServer) servers[i];
- serverIds.add(server.getName());
- existingServersTable_.put(server.getName(), server);
- }
- }
- }
- return (String[]) serverIds.toArray(new String[serverIds.size()]);
- }
-
- /**
- * Get all server types available for creation
- *
- * @return String[] of server names
- */
- private String[] getAllServerTypes() {
- Vector serverTypes_ = new Vector();
- IServerType[] defaultServersList = ServerCore.getServerTypes();
- for (int i = 0; i < defaultServersList.length; i++) {
- IServerType serverType = (IServerType) defaultServersList[i];
- serverTypes_.add(serverType.getId());
- }
- return (String[]) serverTypes_.toArray(new String[serverTypes_.size()]);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java
deleted file mode 100644
index 2d28a715f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java
+++ /dev/null
@@ -1,193 +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.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class TypeSelectionFilter
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public String[] getWebServiceTypeByInitialSelection(IStructuredSelection initialSelection, ArrayList webServiceTypeList)
- {
-
- ArrayList supportedTypes = new ArrayList();
- if (initialSelection != null && initialSelection.size() == 1)
- {
-
- // Check for null initial selection
- Object initialObject = initialSelection.getFirstElement();
- if (initialObject == null)
- {
- return null;
- }
- // Match up resource type metadata with initial selection
- Iterator iter = webServiceTypeList.iterator();
- while (iter.hasNext())
- {
- String wst = (String)iter.next();
- String scenario = wst.substring(0,wst.indexOf("/"));
- String implId = wst.substring(wst.indexOf("/")+1);
- //IWebServiceType wst = (IWebServiceType)iter.next();
- //String typeId = (String)wst.getId();
- if (scenario.equals(String.valueOf(WebServiceScenario.BOTTOMUP)) && !supportedTypes.contains(wst))
- {
-
-
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
- String[] resourceTypes = wsimpl.getResourceTypeMetadata();
- for (int i=0; i<resourceTypes.length; i++)
- {
- if (resourceTypes[i]!=null)
- {
- if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
- {
- String name = null;
- IResource resource = null;
-
- try
- {
- resource = ResourceUtils.getResourceFromSelection(initialObject);
- }
- catch( CoreException exc )
- {
- resource = null;
- }
-
- if (resource instanceof IContainer)
- {
- name = initialObject.getClass().getName();
- }
- else if( resource != null )
- {
- name = resource.getFullPath().toString();
- }
- else
- {
- name = initialObject.getClass().getName();
- }
- String[] extensions = wsimpl.getExtensionMetadata();
- if (acceptsName(name, extensions))
- {
- supportedTypes.add(wst);
- }
- }
-
- }
- }
- }
- }
-
- //If no wsImpls have accepted this selection, check if this is WSDL. If it is,
- //add the top-down Java service type to the list.
- if (supportedTypes.isEmpty())
- {
- String[] resourceTypes = {"File", "IResource", "String", "ServiceImpl", "ServiceRefImpl", "WSDLResourceImpl"};
- for (int i=0; i<resourceTypes.length; i++)
- {
- if (resourceTypes[i]!=null)
- {
- if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
- {
- String name = null;
- IResource resource = null;
-
- try
- {
- resource = ResourceUtils.getResourceFromSelection(initialObject);
- }
- catch( CoreException exc )
- {
- resource = null;
- }
-
- if (resource instanceof IContainer)
- {
- name = initialObject.getClass().getName();
- }
- else if( resource != null )
- {
- name = resource.getFullPath().toString();
- }
- else
- {
- name = initialObject.getClass().getName();
- }
- String[] extensions = {".wsdl", ".wsil", ".html", ".ServiceImpl", ".ServiceRefImpl", ".WSDLResourceImpl"};
- if (acceptsName(name, extensions))
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
- entrybuff.append("/");
- entrybuff.append("org.eclipse.jst.ws.wsImpl.java");
- String entry = entrybuff.toString();
- supportedTypes.add(entry);
- }
- }
-
- }
- }
- }
-
- }
-
-
-
- if (supportedTypes.isEmpty())
- {
- //It's not a registered implementation and its not WSDL so return null;
- return null;
- }
- else
- {
- return (String[])supportedTypes.toArray(new String[0]);
- }
- }
- //
- // Checks if the given name is acceptable based upon its extension
- //
- private boolean acceptsName ( String name, String[] extensions)
- {
- //Return true if "all" extensions are supported.
-
- if (extensions[0]!=null)
- {
- if (extensions[0].equals("all"))
- {
- return true;
- }
- }
-
- for (int i=0; i<extensions.length; i++)
- {
- if (extensions[i]!=null)
- {
- if (name.endsWith(extensions[i]))
- return true;
- }
- }
- return false;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java
deleted file mode 100644
index b58fb52e3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java
+++ /dev/null
@@ -1,193 +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.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class TypeSelectionFilter2
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public String[] getWebServiceTypeByInitialSelection(IStructuredSelection initialSelection, ArrayList webServiceTypeList)
- {
-
- ArrayList supportedTypes = new ArrayList();
- if (initialSelection != null && initialSelection.size() == 1)
- {
-
- // Check for null initial selection
- Object initialObject = initialSelection.getFirstElement();
- if (initialObject == null)
- {
- return null;
- }
- // Match up resource type metadata with initial selection
- Iterator iter = webServiceTypeList.iterator();
- while (iter.hasNext())
- {
- String wst = (String)iter.next();
- String scenario = wst.substring(0,wst.indexOf("/"));
- String implId = wst.substring(wst.indexOf("/")+1);
- //IWebServiceType wst = (IWebServiceType)iter.next();
- //String typeId = (String)wst.getId();
- if (scenario.equals(String.valueOf(WebServiceScenario.BOTTOMUP)) && !supportedTypes.contains(wst))
- {
-
-
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
- String[] resourceTypes = wsimpl.getResourceTypeMetadata();
- for (int i=0; i<resourceTypes.length; i++)
- {
- if (resourceTypes[i]!=null)
- {
- if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
- {
- String name = null;
- IResource resource = null;
-
- try
- {
- resource = ResourceUtils.getResourceFromSelection(initialObject);
- }
- catch( CoreException exc )
- {
- resource = null;
- }
-
- if (resource instanceof IContainer)
- {
- name = initialObject.getClass().getName();
- }
- else if( resource != null )
- {
- name = resource.getFullPath().toString();
- }
- else
- {
- name = initialObject.getClass().getName();
- }
- String[] extensions = wsimpl.getExtensionMetadata();
- if (acceptsName(name, extensions))
- {
- supportedTypes.add(wst);
- }
- }
-
- }
- }
- }
- }
-
- //If no wsImpls have accepted this selection, check if this is WSDL. If it is,
- //add the top-down Java service type to the list.
- if (supportedTypes.isEmpty())
- {
- String[] resourceTypes = {"File", "IResource", "String", "ServiceImpl", "ServiceRefImpl", "WSDLResourceImpl"};
- for (int i=0; i<resourceTypes.length; i++)
- {
- if (resourceTypes[i]!=null)
- {
- if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
- {
- String name = null;
- IResource resource = null;
-
- try
- {
- resource = ResourceUtils.getResourceFromSelection(initialObject);
- }
- catch( CoreException exc )
- {
- resource = null;
- }
-
- if (resource instanceof IContainer)
- {
- name = initialObject.getClass().getName();
- }
- else if( resource != null )
- {
- name = resource.getFullPath().toString();
- }
- else
- {
- name = initialObject.getClass().getName();
- }
- String[] extensions = {".wsdl", ".wsil", ".html", ".ServiceImpl", ".ServiceRefImpl", ".WSDLResourceImpl"};
- if (acceptsName(name, extensions))
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
- entrybuff.append("/");
- entrybuff.append("org.eclipse.jst.ws.wsImpl.java");
- String entry = entrybuff.toString();
- supportedTypes.add(entry);
- }
- }
-
- }
- }
- }
-
- }
-
-
-
- if (supportedTypes.isEmpty())
- {
- //It's not a registered implementation and its not WSDL so return null;
- return null;
- }
- else
- {
- return (String[])supportedTypes.toArray(new String[0]);
- }
- }
- //
- // Checks if the given name is acceptable based upon its extension
- //
- private boolean acceptsName ( String name, String[] extensions)
- {
- //Return true if "all" extensions are supported.
-
- if (extensions[0]!=null)
- {
- if (extensions[0].equals("all"))
- {
- return true;
- }
- }
-
- for (int i=0; i<extensions.length; i++)
- {
- if (extensions[i]!=null)
- {
- if (name.endsWith(extensions[i]))
- return true;
- }
- }
- return false;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
deleted file mode 100644
index 198c12dd3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
+++ /dev/null
@@ -1,80 +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.ui.wizard;
-
-import java.util.StringTokenizer;
-
- //
- // This class holds the set of distinguishing factors in determining
- // the default Web service type. The default Web Service type will be determined
- // by pattern matching the initial selection with the supported extension
- // and the resource type metadata specified in the manifest file.
- //
- public class TypeSelectionMetadata
- {
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public String[] extensionMeta;
- public String[] resourceTypeMeta;
-
- public TypeSelectionMetadata(String extensionMD, String resourceTypeMD)
- {
- setExtensionMetadata(extensionMD);
- setResourceTypeMetadata(resourceTypeMD);
- }
-
- public void setExtensionMetadata(String extensionMetadata)
- {
- StringTokenizer st = new StringTokenizer(extensionMetadata);
- extensionMeta = new String[st.countTokens()];
- int i=0;
- while (st.hasMoreElements())
- {
- String exten = (String)st.nextToken();
- if (exten!=null)
- {
- extensionMeta[i]=exten;
- }
- i++;
- }
-
- }
-
- public String[] getExtensionMetadata()
- {
- return extensionMeta;
- }
-
- public void setResourceTypeMetadata(String resourceTypeMetadata)
- {
- StringTokenizer st = new StringTokenizer(resourceTypeMetadata);
- resourceTypeMeta = new String[st.countTokens()];
- int i=0;
- while (st.hasMoreElements())
- {
- String resourceType = (String)st.nextToken();
- if (resourceType!=null)
- {
- resourceTypeMeta[i]=resourceType;
- }
- i++;
- }
- }
-
- public String[] getResourceTypeMetadata()
- {
- return resourceTypeMeta;
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
deleted file mode 100644
index 64bc552ba..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
+++ /dev/null
@@ -1,26 +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.ui.wizard;
-
-
-/**
-* This type is used to hold user or calculated
-* data to be use by finsih tasks
-*/
-public interface WebServiceInfo
-{
-
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java
deleted file mode 100644
index 7f3aa24ee..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java
+++ /dev/null
@@ -1,41 +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.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistryIBM implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryIBM() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_IBM;
- }
-
- public String getInquiryURL() {
- return "http://uddi.ibm.com/ubr/inquiryapi";
- }
-
- public String getPublishURL() {
- return "https://uddi.ibm.com/ubr/publishapi";
- }
-
- public String getRegistrationURL() {
- return "http://uddi.ibm.com/ubr/registry.html";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java
deleted file mode 100644
index 78d2c0ce0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java
+++ /dev/null
@@ -1,41 +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.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistryIBMTest implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryIBMTest() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST;
- }
-
- public String getInquiryURL() {
- return "http://uddi.ibm.com/testregistry/inquiryapi";
- }
-
- public String getPublishURL() {
- return "https://uddi.ibm.com/testregistry/publishapi";
- }
-
- public String getRegistrationURL() {
- return "http://uddi.ibm.com/testregistry/registry.html";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java
deleted file mode 100644
index bbbb8d7a4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java
+++ /dev/null
@@ -1,41 +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.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistryMicrosoft implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryMicrosoft() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT;
- }
-
- public String getInquiryURL() {
- return "http://uddi.microsoft.com/inquire";
- }
-
- public String getPublishURL() {
- return "https://uddi.microsoft.com/publish";
- }
-
- public String getRegistrationURL() {
- return "https://uddi.microsoft.com/register.aspx";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java
deleted file mode 100644
index a6f9bee2e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java
+++ /dev/null
@@ -1,41 +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.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistryMicrosoftTest implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryMicrosoftTest() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST;
- }
-
- public String getInquiryURL() {
- return "http://test.uddi.microsoft.com/inquire";
- }
-
- public String getPublishURL() {
- return "https://test.uddi.microsoft.com/publish";
- }
-
- public String getRegistrationURL() {
- return "http://test.uddi.microsoft.com/register.aspx";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
deleted file mode 100644
index 26e14b4b1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
+++ /dev/null
@@ -1,41 +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.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistryNTTComm implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryNTTComm() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM;
- }
-
- public String getInquiryURL() {
- return "http://www.uddi.ne.jp/ubr/inquiryapi";
- }
-
- public String getPublishURL() {
- return "https://www.uddi.ne.jp/ubr/publishapi";
- }
-
- public String getRegistrationURL() {
- return "http://www.ntt.com/uddi/";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
deleted file mode 100644
index 1ad68fe4a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
+++ /dev/null
@@ -1,41 +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.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistrySAP implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistrySAP() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_SAP;
- }
-
- public String getInquiryURL() {
- return "http://uddi.sap.com/UDDI/api/inquiry/";
- }
-
- public String getPublishURL() {
- return "https://uddi.sap.com/UDDI/api/publish/";
- }
-
- public String getRegistrationURL() {
- return "http://uddi.sap.com/";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
deleted file mode 100644
index 5fad14824..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
+++ /dev/null
@@ -1,41 +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.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistrySAPTest implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistrySAPTest() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST;
- }
-
- public String getInquiryURL() {
- return "http://udditest.sap.com/UDDI/api/inquiry/";
- }
-
- public String getPublishURL() {
- return "https://udditest.sap.com/UDDI/api/publish/";
- }
-
- public String getRegistrationURL() {
- return "http://udditest.sap.com/";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
deleted file mode 100644
index e4d9e6589..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
+++ /dev/null
@@ -1,25 +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.ui.wizard.uddi;
-
-public interface PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public String getName();
- public String getInquiryURL();
- public String getPublishURL();
- public String getRegistrationURL();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
deleted file mode 100644
index 8e7bde35a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
+++ /dev/null
@@ -1,43 +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.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.parser.PluginMessages;
-
-public class PublicUDDIRegistryXMethods implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryXMethods() {
- }
-
- public String getName() {
- return PluginMessages.PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS;
- }
-
- public String getInquiryURL() {
- //return "http://uddi.xmethods.net/inquire";
- return "http://uddi.xmethods.net/inquire2";
- }
-
- // Read-only registry. The publish and registration URLs don't exist.
- public String getPublishURL() {
- return "https://uddi.xmethods.net/publish2";
- }
-
- public String getRegistrationURL() {
- return "http://www.xmethods.net/ve2/Register.po?event=registerOrg";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
deleted file mode 100644
index 23193c1a5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
+++ /dev/null
@@ -1,65 +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.consumption.ui.wsil;
-
-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.ui.PlatformUI;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-
-
-
-public class AddWSDLToWSILWrapperCommand extends AbstractDataModelOperation
-{
- private AddWSDLToWSILCommand command;
- private Arguments args;
-
- public AddWSDLToWSILWrapperCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- if (command == null)
- command = new AddWSDLToWSILCommand();
- if (!args.isEmpty())
- {
- command.setArguments(args.getStringArguments());
- command.setWWWAuthenticationHandler(new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()));
- command.setEnvironment( env );
- return command.execute( null, null);
- }
- return Status.OK_STATUS;
- }
- /**
- * @param args The args to set.
- */
- public void setArgs(Arguments args)
- {
- this.args = args;
- }
-
- /**
- * @param command The command to set.
- */
- public void setCommand(AddWSDLToWSILCommand command)
- {
- this.command = command;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
deleted file mode 100644
index 7a177c5a8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
+++ /dev/null
@@ -1,75 +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.consumption.ui.wsil;
-
-import java.util.Vector;
-
-public class Arguments
-{
- private Vector args_;
-
- public Arguments()
- {
- args_ = new Vector();
- }
-
- public void add(String key, Object value)
- {
- args_.add(key);
- if (value != null)
- args_.add(value);
- }
-
- public void remove(String key)
- {
- int index = args_.indexOf(key);
- if (index >= 0)
- {
- args_.remove(index);
- args_.remove(index+1);
- }
- }
-
- public Object get(String key)
- {
- int index = args_.indexOf(key);
- if (index >= 0)
- return args_.get(index+1);
- else
- return null;
- }
-
- public void clear()
- {
- args_.clear();
- }
-
- public Object[] getArguments()
- {
- Object[] args = new Object[args_.size()];
- args_.copyInto(args);
- return args;
- }
-
- public String[] getStringArguments()
- {
- String[] args = new String[args_.size()];
- for (int i = 0; i < args.length; i++)
- args[i] = args_.get(i).toString();
- return args;
- }
-
- public boolean isEmpty()
- {
- return args_.isEmpty();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
deleted file mode 100644
index 61f9d5491..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
+++ /dev/null
@@ -1,157 +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.consumption.ui.wsil;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationHandler;
-
-
-public class DialogWWWAuthentication extends Dialog implements WWWAuthenticationHandler
-{
-
- /*CONTEXT_ID DBAS0001 for the HTTP basic authentication user name*/
- private final String INFOPOP_DBAS_USERNAME = WebServiceConsumptionUIPlugin.ID + ".DBAS0001";
-
- /*CONTEXT_ID DBAS0002 for the HTTP basic authentication password*/
- private final String INFOPOP_DBAS_PASSWORD = WebServiceConsumptionUIPlugin.ID + ".DBAS0002";
-
- private String usernameString_;
- private String passwordString_;
-
- private Text username_;
- private Text password_;
-
- private WWWAuthenticationException wwwae_;
-
- public DialogWWWAuthentication(Shell shell)
- {
- super(shell);
- usernameString_ = null;
- passwordString_ = null;
- wwwae_ = null;
- }
-
- /**
- * Called when the Cancel button is pressed.
- */
- protected void cancelPressed()
- {
- usernameString_ = null;
- passwordString_ = null;
- super.cancelPressed();
- }
-
- /**
- * Called when the OK button is pressed.
- */
- protected void okPressed()
- {
- String usernameString = username_.getText();
- usernameString_ = (usernameString.length() > 0) ? usernameString : null;
- String passwordString = password_.getText();
- passwordString_ = (passwordString.length() > 0) ? passwordString : null;
- 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(getMessage("%DIALOG_TITLE_HTTP_BASIC_AUTH"));
- }
-
- /**
- * 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.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.verticalSpacing = 15;
- composite.setLayout(gl);
-
- Label label = new Label(composite, SWT.WRAP);
- label.setText(getMessage("%LABEL_URL"));
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- label = new Label(composite, SWT.WRAP);
- label.setText(wwwae_.getURL());
- label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- label = new Label(composite, SWT.WRAP);
- label.setText(getMessage("%LABEL_HTTP_BASIC_AUTH_USERNAME"));
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- username_ = new Text(composite, SWT.BORDER);
- username_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- username_.setToolTipText(getMessage("%TOOLTIP_HTTP_BASIC_AUTH_USERNAME"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_USERNAME);
-
- label = new Label(composite, SWT.WRAP);
- label.setText(getMessage("%LABEL_HTTP_BASIC_AUTH_PASSWORD"));
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- password_ = new Text(composite, SWT.BORDER);
- password_.setEchoChar('*');
- password_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- password_.setToolTipText(getMessage("%TOOLTIP_HTTP_BASIC_AUTH_PASSWORD"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_PASSWORD);
-
- return composite;
- }
-
- private String getMessage(String msgId)
- {
- return WebServiceConsumptionUIPlugin.getMessage(msgId);
- }
-
- public void handleWWWAuthentication(WWWAuthenticationException wwwae)
- {
- usernameString_ = null;
- passwordString_ = null;
- wwwae_ = wwwae;
- open();
- }
-
- public String getUsername()
- {
- return usernameString_;
- }
-
- public String getPassword()
- {
- return passwordString_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
deleted file mode 100644
index b5c243bca..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
+++ /dev/null
@@ -1,524 +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.consumption.ui.wsil;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Image;
-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.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-
-public class TableViewerEditor extends Composite
-{
- private int DEFAULT_TABLE_HEIGHT_HINT = 100;
- private int DEFAULT_COLUMN_WIDTH = 80;
-
- private String[] columns_;
- private TableViewer tableViewer_;
- private Table table_;
- private TableEditor editor_;
- private TableEditorListener tableEditorListener_;
- private Text text_;
- private Button add_;
- private Button remove_;
-
- private List values_;
- private Object defaultValue_;
-
- public TableViewerEditor(Composite parent, String[] columns, List initValues, Object defaultValue)
- {
- super(parent, SWT.NONE);
- columns_ = columns;
- values_ = new ArrayList();
- if (initValues != null && initValues.size() > 0)
- values_.addAll(initValues);
- defaultValue_ = (defaultValue != null) ? defaultValue : new String("");
- createPartControl(this);
- }
-
- private void createPartControl(Composite parent)
- {
- GridLayout gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- setLayout(gl);
- setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite composite = new Composite(parent, SWT.NONE);
- gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- composite.setLayout(gl);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
- table_.setLayoutData(gd);
- table_.setHeaderVisible(true);
- table_.setLinesVisible(true);
- TableLayout tableLayout = new TableLayout();
- int maxWidth = DEFAULT_COLUMN_WIDTH;
- for (int i = 0; i < columns_.length; i++)
- {
- TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
- tableColumn.setText(columns_[i]);
- tableColumn.pack();
- int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth());
- maxWidth = Math.max(maxWidth, tableColumnWidth);
- ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true);
- tableLayout.addColumnData(columnData);
- }
- table_.setLayout(tableLayout);
- // initialize the table editor
- editor_ = new TableEditor(table_);
- // The editor must have the same size as the cell and must
- // not be any smaller than 50 pixels.
- editor_.horizontalAlignment = SWT.LEFT;
- editor_.grabHorizontal = true;
- editor_.minimumWidth = maxWidth;
- tableEditorListener_ = new TableEditorListener();
- table_.addMouseListener(tableEditorListener_);
- tableViewer_ = new TableViewer(table_);
- tableViewer_.getControl().addKeyListener(
- new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- // Del
- if (((int)e.character) == 127)
- handleDeleteKeyPressed();
- // Enter or space
- if (((int)e.character) == 13 || ((int)e.character) == 32)
- tableEditorListener_.editSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.setInput(values_);
- tableViewer_.addSelectionChangedListener(
- new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- enableRemove(true);
- }
- }
- );
-
- Composite buttonComposite = new Composite(composite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 2;
- gl.makeColumnsEqualWidth = true;
- buttonComposite.setLayout(gl);
- buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- add_ = new Button(buttonComposite, SWT.PUSH);
- add_.setText(WebServiceConsumptionUIPlugin.getMessage("%LABEL_ADD"));
- add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- add_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleAddButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
-
- remove_ = new Button(buttonComposite, SWT.PUSH);
- remove_.setText(WebServiceConsumptionUIPlugin.getMessage("%LABEL_REMOVE"));
- remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- remove_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleRemoveButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
- enableRemove(false);
- }
-
- private void enableRemove(boolean enabled)
- {
- remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- private void handleAddButtonSelected(SelectionEvent event)
- {
- values_.add(defaultValue_);
- refresh();
- setSelectionAsObject(values_.get(table_.getItemCount()-1));
- tableEditorListener_.editSelection();
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event)
- {
- handleDeleteKeyPressed();
- }
-
- private void handleDeleteKeyPressed()
- {
- internalDispose();
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection))
- {
- int selectionIndex = table_.getSelectionIndex();
- int selectionCount = table_.getItemCount();
- values_.remove(selectionIndex);
- if (selectionIndex < selectionCount-1)
- setSelectionAsObject(values_.get(selectionIndex));
- else if (selectionCount -2 >= 0)
- setSelectionAsObject(values_.get(selectionCount-2));
- refresh();
- }
- }
-
- private void internalRefresh()
- {
- // synchronize text field, previously selected table cell and model (inputObject)
- if (text_ != null)
- {
- TableItem oldTableItem = editor_.getItem();
- int oldColumnIndex = editor_.getColumn();
- if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length)
- {
- String oldText = text_.getText();
- oldTableItem.setText(oldColumnIndex, oldText);
- int oldRowIndex = table_.indexOf(oldTableItem);
- values_.set(oldRowIndex, oldText);
- }
- }
- }
-
- private void setSelectionAsObject(Object object)
- {
- tableViewer_.setSelection(new StructuredSelection(object), true);
- }
-
- public void setToolTipText(String string)
- {
- table_.setToolTipText(string);
- }
-
- public void setInfopop(String string)
- {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(table_, string);
- }
-
- public void setInput(List list)
- {
- values_.clear();
- values_.addAll(list);
- }
-
- public void refresh()
- {
- internalRefresh();
- tableViewer_.refresh();
- }
-
- public TableItem[] getItems()
- {
- internalRefresh();
- return table_.getItems();
- }
-
- public void setEnabled(boolean enabled)
- {
- super.setEnabled(enabled);
- add_.setEnabled(enabled);
- enableRemove(enabled);
- }
-
- public void dispose()
- {
- super.dispose();
- internalDispose();
- if (editor_ != null)
- editor_.dispose();
- if (table_ != null)
- table_.dispose();
- if (add_ != null)
- add_.dispose();
- if (remove_ != null)
- remove_.dispose();
- }
-
- private void internalDispose()
- {
- if (text_ != null)
- text_.dispose();
- text_ = null;
- }
-
- protected class TableEditorListener implements MouseListener
- {
- private int currSelectionIndex_;
- private int editRow_;
- private int editColumn_;
-
- public TableEditorListener()
- {
- super();
- currSelectionIndex_ = -1;
- editRow_ = -1;
- editColumn_ = -1;
- }
-
- public void mouseDoubleClick(MouseEvent e)
- {
- mouseDown(e);
- }
-
- public void mouseDown(MouseEvent e)
- {
- // refresh table
- internalRefresh();
- // Clean up previous text editor control
- internalDispose();
- // update table
- if (table_.isFocusControl())
- {
- int selectedRowIndex = getSelectedRow(table_, e.y);
- if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex)
- {
- TableItem tableItem = table_.getItem(selectedRowIndex);
- int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y);
- if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn()))
- editSelection(selectedRowIndex, selectedColumnIndex);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- public void mouseUp(MouseEvent e)
- {
- }
-
- private int getSelectedRow(Table table, int y)
- {
- TableItem[] tableItems = table.getItems();
- for (int i = 0; i < tableItems.length; i++)
- {
- Rectangle rectangle = tableItems[i].getBounds(0);
- if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height))
- return i;
- }
- return -1;
- }
-
- private int getSelectedColumn(TableItem tableItem, int x, int y)
- {
- for (int i = 0; i < columns_.length; i++)
- {
- if (tableItem.getBounds(i).contains(x, y))
- return i;
- }
- return -1;
- }
-
- private void editSelection(int row, int column)
- {
- editRow_ = row;
- editColumn_ = column;
- TableItem tableItem = table_.getItem(row);
- // Setup adapter for the new selection
- text_ = new Text(table_, SWT.NONE);
- String text = tableItem.getText(column);
- text_.setText((text != null) ? text : "");
- text_.addKeyListener(new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- // Esc
- if (((int)e.character) == 27)
- cancelSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- text_.addTraverseListener(new TraverseListener()
- {
- public void keyTraversed(TraverseEvent e)
- {
- if (e.detail == SWT.TRAVERSE_TAB_NEXT)
- traverseTabNext();
- else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
- traverseTabPrevious();
- }
- }
- );
- editor_.setEditor(text_, tableItem, column);
- text_.setFocus();
- text_.selectAll();
- }
-
- protected void traverseTabNext()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1))
- {
- if (editColumn_ < columns_.length-1)
- editColumn_++;
- else
- {
- editColumn_ = 0;
- editRow_++;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- protected void traverseTabPrevious()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == 0 && editColumn_ == 0))
- {
- if (editColumn_ > 0)
- editColumn_--;
- else
- {
- editColumn_ = columns_.length-1;
- editRow_--;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- public void cancelSelection()
- {
- internalDispose();
- internalRefresh();
- }
-
- public void editSelection()
- {
- int selectedRowIndex = table_.getSelectionIndex();
- if (selectedRowIndex != -1 && columns_.length > 0)
- {
- // refresh table
- internalRefresh();
- // Clean up any previous editor control
- internalDispose();
- editSelection(selectedRowIndex, 0);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- protected class ListContentProvider implements IStructuredContentProvider
- {
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- tableViewer_.add(getElements(newInput));
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof List)
- {
- List list = (List)inputElement;
- Object[] objects = new Object[list.size()];
- for (int i = 0; i < objects.length; i++)
- objects[i] = list.get(i);
- return objects;
- }
- else
- return new Object[0];
- }
- }
-
- protected class ListLabelProvider implements ITableLabelProvider
- {
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- return element.toString();
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
deleted file mode 100644
index 4dae50bac..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
+++ /dev/null
@@ -1,52 +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.ui.wsil;
-
-import java.net.MalformedURLException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-
-
-public class Utils
-{
- public Utils()
- {
- }
-
- public String toFileSystemURI(String relativePlatformURI)
- {
- if (relativePlatformURI != null)
- return toFileSystemURI(ResourceUtils.findResource(relativePlatformURI));
- else
- return null;
- }
-
- public String toFileSystemURI(IResource res)
- {
- if (res != null)
- {
- IPath path = res.getLocation();
- if (path != null)
- {
- try
- {
- return path.toFile().toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- }
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java
deleted file mode 100644
index 65bedf58f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java
+++ /dev/null
@@ -1,147 +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.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-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.ws.internal.wsrt.IWebServiceRuntime;
-
-public class ClientRuntimeDescriptor
-{
- private IConfigurationElement elem;
- private Hashtable allWebServiceClientImpls;
- private Hashtable allRuntimes;
- private String id;
- private WebServiceClientImpl clientImplementationType;
- private RuntimeDescriptor runtime;
- private String clientRuntimeClassName;
- private IWebServiceRuntime webServiceRuntime;
- private RequiredFacetVersion[] requiredFacetVersions;
- private Set projectFacetVersions;
-
- public ClientRuntimeDescriptor(IConfigurationElement elem, Hashtable allWebServiceClientImpls, Hashtable allRuntimes)
- {
- this.elem = elem;
- this.allWebServiceClientImpls = allWebServiceClientImpls;
- this.allRuntimes = allRuntimes;
- }
-
- public WebServiceClientImpl getClientImplementationType()
- {
- if (clientImplementationType == null)
- {
- String clientImplementationTypeId = elem.getAttribute("clientImplementationTypeId");
- clientImplementationType = (WebServiceClientImpl)allWebServiceClientImpls.get(clientImplementationTypeId);
- }
- return clientImplementationType;
- }
-
- public String getClientRuntimeClassName()
- {
- if (clientRuntimeClassName == null)
- {
- clientRuntimeClassName = elem.getAttribute("class");
- }
- return clientRuntimeClassName;
- }
-
- public String getId()
- {
- if (id == null)
- {
- id = elem.getAttribute("id");
- }
- return id;
- }
-
- public RequiredFacetVersion[] getRequiredFacetVersions()
- {
- if (requiredFacetVersions == null)
- {
- ArrayList requiredFacetVersionList = new ArrayList();
- IConfigurationElement[] facetElems = elem.getChildren("required-facet-version");
- for (int i = 0; i < facetElems.length; i++)
- {
- RequiredFacetVersion rfv = new RequiredFacetVersion();
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(facetElems[i].getAttribute("facet"));
- IProjectFacetVersion projectFacetVersion = projectFacet.getVersion(facetElems[i].getAttribute("version"));
- rfv.setProjectFacetVersion(projectFacetVersion);
- String allowNewerValue = facetElems[i].getAttribute("allow-newer");
- if (allowNewerValue == null)
- {
- rfv.setAllowNewer(false);
- }
- else
- {
- rfv.setAllowNewer(Boolean.valueOf(allowNewerValue).booleanValue());
- }
-
- requiredFacetVersionList.add(rfv);
- }
-
- requiredFacetVersions = (RequiredFacetVersion[])requiredFacetVersionList.toArray(new RequiredFacetVersion[]{});
- }
-
- return requiredFacetVersions;
- }
-
- public Set getProjectFacetVersions()
- {
- if (projectFacetVersions == null)
- {
- projectFacetVersions = new HashSet();
- RequiredFacetVersion[] rfv = getRequiredFacetVersions();
- for (int i=0; i<rfv.length; i++)
- {
- projectFacetVersions.add(rfv[i].getProjectFacetVersion());
- }
- }
-
- return projectFacetVersions;
- }
-
- public RuntimeDescriptor getRuntime()
- {
- if (runtime == null)
- {
- String runtimeId = elem.getAttribute("runtimeId");
- runtime = (RuntimeDescriptor)allRuntimes.get(runtimeId);
- }
- return runtime;
- }
-
- public IWebServiceRuntime getWebServiceRuntime()
- {
- if (webServiceRuntime == null)
- {
- try
- {
- webServiceRuntime = (IWebServiceRuntime)elem.createExecutableExtension("class");
- }
- catch(CoreException ce)
- {
-
- }
- }
-
- return webServiceRuntime;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
deleted file mode 100644
index 85a02603b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
+++ /dev/null
@@ -1,117 +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.ui.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class ClientType {
-
- private IConfigurationElement elem_;
- private Hashtable webServiceClientImpls_;
-
- private String id;
- private WebServiceClientImpl webServiceClientImpl;
- private String[] moduleTypesInclude;
- private String[] moduleTypesExclude;
-
-
-
- public ClientType(IConfigurationElement elem_, Hashtable webServiceClientImpls_)
- {
- super();
- this.elem_ = elem_;
- this.webServiceClientImpls_ = webServiceClientImpls_;
- }
-
-
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
-
-
- public String[] getModuleTypesExclude()
- {
- if (moduleTypesExclude==null)
- {
- String attr = elem_.getAttribute("moduleTypesExclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- moduleTypesExclude = new String[size];
- for (int i = 0; i < moduleTypesExclude.length; i++)
- moduleTypesExclude[i] = st.nextToken();
- }
- }
- return moduleTypesExclude;
- }
-
-
-
-
- public String[] getModuleTypesInclude()
- {
- if (moduleTypesInclude==null)
- {
- String attr = elem_.getAttribute("moduleTypesInclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- moduleTypesInclude = new String[size];
- for (int i = 0; i < moduleTypesInclude.length; i++)
- moduleTypesInclude[i] = st.nextToken();
- }
- }
- return moduleTypesInclude;
- }
-
-
-
-
- public WebServiceClientImpl getWebServiceClientImpl()
- {
- if (webServiceClientImpl==null)
- {
- String wscimplId = elem_.getAttribute("implId");
- webServiceClientImpl = (WebServiceClientImpl)webServiceClientImpls_.get(wscimplId);
- }
- return webServiceClientImpl;
- }
-
-
-
- /*
- public String getWebServiceClientTypeId()
- {
- if (webServiceClientTypeId==null)
- {
- webServiceClientTypeId = elem_.getAttribute("webServiceClientTypeId");
- }
- return webServiceClientTypeId;
- }
- */
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java
deleted file mode 100644
index 034a6e8ef..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java
+++ /dev/null
@@ -1,143 +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.ui.wsrt;
-
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class Context implements IContext {
- private WebServiceScenario scenario;
- private boolean develop;
- private boolean assemble;
- private boolean deploy;
- private boolean install;
- private boolean run;
- private boolean client;
- private boolean test;
- private boolean publish;
- private boolean overWriteFiles;
- private boolean createFolders;
- private boolean checkOutFiles;
-
- public boolean getAssemble() {
- return assemble;
- }
-
- public boolean getCheckOutFiles() {
- return checkOutFiles;
- }
-
- public boolean getClient() {
- return client;
- }
-
- public boolean getCreateFolders() {
- return createFolders;
- }
-
- public boolean getDeploy() {
- return deploy;
- }
-
- public boolean getDevelop() {
- return develop;
- }
-
- public boolean getInstall() {
- return install;
- }
-
- public boolean getOverWriteFiles() {
- return overWriteFiles;
- }
-
- public boolean getPublish() {
- return publish;
- }
-
- public boolean getRun() {
- return run;
- }
-
- public WebServiceScenario getScenario() {
- return scenario;
- }
-
- public boolean getTest() {
- return test;
- }
-
- public void setAssemble(boolean assemble) {
- this.assemble = assemble;
- }
-
-
- public void setCheckOutFiles(boolean checkOutFiles) {
- this.checkOutFiles = checkOutFiles;
- }
-
-
- public void setClient(boolean client) {
- this.client = client;
- }
-
-
- public void setCreateFolders(boolean createFolders) {
- this.createFolders = createFolders;
- }
-
-
- public void setDeploy(boolean deploy) {
- this.deploy = deploy;
- }
-
-
- public void setDevelop(boolean develop) {
- this.develop = develop;
- }
-
-
- public void setInstall(boolean install) {
- this.install = install;
- }
-
-
- public void setOverWriteFiles(boolean overWriteFiles) {
- this.overWriteFiles = overWriteFiles;
- }
-
-
- public void setPublish(boolean publish) {
- this.publish = publish;
- }
-
-
- public void setRun(boolean run) {
- this.run = run;
- }
-
-
- public void setScenario(WebServiceScenario scenario) {
- this.scenario = scenario;
- }
-
-
- public void setTest(boolean test) {
- this.test = test;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.java
deleted file mode 100644
index b6295375f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.java
+++ /dev/null
@@ -1,52 +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.ui.wsrt;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class RuntimeDescriptor
-{
-
- private IConfigurationElement elem;
- private String id;
- private String label;
-
-
- public RuntimeDescriptor(IConfigurationElement elem)
- {
- this.elem = elem;
- }
-
- public String getId()
- {
- if (id == null)
- {
- id = elem.getAttribute("id");
- }
- return id;
- }
-
- public String getLabel()
- {
- if (label == null)
- {
- label = elem.getAttribute("label");
- }
- return label;
- }
-
- public String[] getJ2eeLevels()
- {
- return new String[]{"13", "14"};
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java
deleted file mode 100644
index 631454bd6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.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.jst.ws.internal.consumption.ui.wsrt;
-
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-
-public class Selection implements ISelection {
-
- private Object[] selection;
-
- public Object[] getSelection()
- {
- return selection;
- }
-
- public void setSelection(Object[] selection)
- {
- this.selection = selection;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java
deleted file mode 100644
index 5e48dfe77..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java
+++ /dev/null
@@ -1,167 +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.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-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.ws.internal.wsrt.IWebServiceRuntime;
-
-
-public class ServiceRuntimeDescriptor
-{
- private IConfigurationElement elem;
- private Hashtable allWebServiceImpls;
- private Hashtable allRuntimes;
- private String id;
- private WebServiceImpl serviceImplementationType;
- private RuntimeDescriptor runtime;
- private boolean bottomUp = false;
- private boolean topDown = false;
- private String serviceRuntimeClassName;
- private IWebServiceRuntime webServiceRuntime;
- private RequiredFacetVersion[] requiredFacetVersions;
- private Set projectFacetVersions;
-
- public ServiceRuntimeDescriptor(IConfigurationElement elem, Hashtable allWebServiceImpls, Hashtable allRuntimes)
- {
- this.elem = elem;
- this.allWebServiceImpls = allWebServiceImpls;
- this.allRuntimes = allRuntimes;
-
- System.out.println("bottomUp = "+elem.getAttribute("bottomUp"));
- System.out.println("bottomUp = "+elem.getAttribute("topDown"));
-
- bottomUp = (Boolean.valueOf(elem.getAttribute("bottomUp"))).booleanValue();
- topDown = (Boolean.valueOf(elem.getAttribute("topDown"))).booleanValue();
- }
-
- public boolean getBottomUp()
- {
- return bottomUp;
- }
-
- public String getId()
- {
- if (id == null)
- {
- id = elem.getAttribute("id");
- }
- return id;
- }
-
-
- public RequiredFacetVersion[] getRequiredFacetVersions()
- {
- if (requiredFacetVersions == null)
- {
- ArrayList requiredFacetVersionList = new ArrayList();
- IConfigurationElement[] facetElems = elem.getChildren("required-facet-version");
- for (int i = 0; i < facetElems.length; i++)
- {
- RequiredFacetVersion rfv = new RequiredFacetVersion();
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(facetElems[i].getAttribute("facet"));
- IProjectFacetVersion projectFacetVersion = projectFacet.getVersion(facetElems[i].getAttribute("version"));
- rfv.setProjectFacetVersion(projectFacetVersion);
- String allowNewerValue = facetElems[i].getAttribute("allow-newer");
- if (allowNewerValue == null)
- {
- rfv.setAllowNewer(false);
- }
- else
- {
- rfv.setAllowNewer(Boolean.valueOf(allowNewerValue).booleanValue());
- }
-
- requiredFacetVersionList.add(rfv);
- }
-
- requiredFacetVersions = (RequiredFacetVersion[])requiredFacetVersionList.toArray(new RequiredFacetVersion[]{});
- }
-
- return requiredFacetVersions;
- }
-
- public Set getProjectFacetVersions()
- {
- if (projectFacetVersions == null)
- {
- projectFacetVersions = new HashSet();
- RequiredFacetVersion[] rfv = getRequiredFacetVersions();
- for (int i=0; i<rfv.length; i++)
- {
- projectFacetVersions.add(rfv[i].getProjectFacetVersion());
- }
- }
-
- return projectFacetVersions;
- }
-
- public RuntimeDescriptor getRuntime()
- {
- if (runtime == null)
- {
- String runtimeId = elem.getAttribute("runtimeId");
- runtime = (RuntimeDescriptor)allRuntimes.get(runtimeId);
- }
- return runtime;
- }
-
- public WebServiceImpl getServiceImplementationType()
- {
- if (serviceImplementationType == null)
- {
- String serviceImplementationTypeId = elem.getAttribute("serviceImplementationTypeId");
- serviceImplementationType = (WebServiceImpl)allWebServiceImpls.get(serviceImplementationTypeId);
- }
- return serviceImplementationType;
- }
-
- public String getServiceRuntimeClassName()
- {
- if (serviceRuntimeClassName == null)
- {
- serviceRuntimeClassName = elem.getAttribute("class");
- }
- return serviceRuntimeClassName;
- }
-
- public boolean getTopDown()
- {
- return topDown;
- }
-
- public IWebServiceRuntime getWebServiceRuntime()
- {
- if (webServiceRuntime == null)
- {
- try
- {
- webServiceRuntime = (IWebServiceRuntime)elem.createExecutableExtension("class");
- }
- catch(CoreException ce)
- {
-
- }
- }
-
- return webServiceRuntime;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
deleted file mode 100644
index 85bf5af4a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
+++ /dev/null
@@ -1,198 +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.ui.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServiceType {
-
- private IConfigurationElement elem_;
- private Hashtable webServiceImpls_;
- private String id;
- private WebServiceImpl webServiceImpl;
- private String[] bottomUpModuleTypesInclude;
- private String[] topDownModuleTypesInclude;
- private String[] bottomUpModuleTypesExclude;
- private String[] topDownModuleTypesExclude;
-
-
-
-
- public ServiceType(IConfigurationElement elem_, Hashtable webServiceImpls_)
- {
- super();
- this.elem_ = elem_;
- this.webServiceImpls_ = webServiceImpls_;
- }
-
- public String[] getBottomUpModuleTypesExclude()
- {
- if (bottomUpModuleTypesExclude==null)
- {
- String attr = elem_.getAttribute("buModuleTypesExclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- bottomUpModuleTypesExclude = new String[size];
- for (int i = 0; i < bottomUpModuleTypesExclude.length; i++)
- bottomUpModuleTypesExclude[i] = st.nextToken();
- }
- }
- return bottomUpModuleTypesExclude;
- }
-
- public void setBottomUpModuleTypesExclude(String[] bottomUpModuleTypesExclude)
- {
- this.bottomUpModuleTypesExclude = bottomUpModuleTypesExclude;
- }
-
- public String[] getBottomUpModuleTypesInclude()
- {
- if (bottomUpModuleTypesInclude==null)
- {
- String attr = elem_.getAttribute("buModuleTypesInclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- bottomUpModuleTypesInclude = new String[size];
- for (int i = 0; i < bottomUpModuleTypesInclude.length; i++)
- bottomUpModuleTypesInclude[i] = st.nextToken();
- }
- }
- return bottomUpModuleTypesInclude;
- }
-
- public void setBottomUpModuleTypesInclude(String[] bottomUpModuleTypesInclude)
- {
- this.bottomUpModuleTypesInclude = bottomUpModuleTypesInclude;
- }
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public String[] getTopDownModuleTypesExclude()
- {
- if (topDownModuleTypesExclude==null)
- {
- String attr = elem_.getAttribute("tdModuleTypesExclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- topDownModuleTypesExclude = new String[size];
- for (int i = 0; i < topDownModuleTypesExclude.length; i++)
- topDownModuleTypesExclude[i] = st.nextToken();
- }
- }
- return topDownModuleTypesExclude;
- }
-
- public void setTopDownModuleTypesExclude(String[] topDownModuleTypesExclude)
- {
- this.topDownModuleTypesExclude = topDownModuleTypesExclude;
- }
-
- public String[] getTopDownModuleTypesInclude()
- {
- if (topDownModuleTypesInclude==null)
- {
- String attr = elem_.getAttribute("tdModuleTypesInclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- topDownModuleTypesInclude = new String[size];
- for (int i = 0; i < topDownModuleTypesInclude.length; i++)
- topDownModuleTypesInclude[i] = st.nextToken();
- }
- }
- return topDownModuleTypesInclude;
- }
-
- public void setTopDownModuleTypesInclude(String[] topDownModuleTypesInclude)
- {
- this.topDownModuleTypesInclude = topDownModuleTypesInclude;
- }
-
- public WebServiceImpl getWebServiceImpl()
- {
- if (webServiceImpl == null)
- {
- String wsimplId = elem_.getAttribute("implId");
- webServiceImpl = (WebServiceImpl)webServiceImpls_.get(wsimplId);
- }
- return webServiceImpl;
- }
-
- public void setWebServiceImpl1(WebServiceImpl webServiceImpl)
- {
- this.webServiceImpl = webServiceImpl;
- }
-
- public boolean supportsScenario(int scenario)
- {
- switch(scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- String[] bus = getBottomUpModuleTypesInclude();
- if (bus!=null && bus.length>0)
- {
- return true;
- }
- break;
- case WebServiceScenario.TOPDOWN:
- String[] tds = getTopDownModuleTypesInclude();
- if (tds!=null && tds.length>0)
- {
- return true;
- }
- break;
- default:
-
- }
-
- return false;
- }
-
- public String[] getModuleTypesInclude(int scenario)
- {
- switch(scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- return getBottomUpModuleTypesInclude();
- case WebServiceScenario.TOPDOWN:
- return getTopDownModuleTypesInclude();
- default:
- }
-
- return null;
- }
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java
deleted file mode 100644
index d187b3a6a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.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.jst.ws.internal.consumption.ui.wsrt;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class WebServiceClientImpl {
-
- private IConfigurationElement elem_;
- private String id;
- private String label;
-
- public WebServiceClientImpl(IConfigurationElement elem_)
- {
- super();
- this.elem_ = elem_;
- }
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
- public String getLabel()
- {
- if (label==null)
- {
- label = elem_.getAttribute("label");
- }
- return label;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java
deleted file mode 100644
index b5630e9dc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java
+++ /dev/null
@@ -1,100 +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.ui.wsrt;
-
-import java.util.StringTokenizer;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class WebServiceImpl {
-
- private IConfigurationElement elem_;
- private String id;
- private String label;
- private String[] resourceTypeMetadata;
- private String[] extensionMetadata;
- private String objectSelectionWidget;
-
- public WebServiceImpl(IConfigurationElement elem_)
- {
- super();
- this.elem_ = elem_;
- }
-
- public String[] getExtensionMetadata()
- {
- if (extensionMetadata==null)
- {
- String attr = elem_.getAttribute("extensionMetadata");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- extensionMetadata = new String[size];
- for (int i = 0; i < extensionMetadata.length; i++)
- extensionMetadata[i] = st.nextToken();
- }
- }
- return extensionMetadata;
- }
-
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
- public String getLabel()
- {
- if (label==null)
- {
- label = elem_.getAttribute("label");
- }
- return label;
- }
-
-
- public String[] getResourceTypeMetadata()
- {
- if (resourceTypeMetadata==null)
- {
- String attr = elem_.getAttribute("resourceTypeMetadata");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- resourceTypeMetadata = new String[size];
- for (int i = 0; i < resourceTypeMetadata.length; i++)
- resourceTypeMetadata[i] = st.nextToken();
- }
- }
- return resourceTypeMetadata;
- }
-
- public String getObjectSelectionWidget()
- {
- if (objectSelectionWidget==null)
- {
- objectSelectionWidget = elem_.getAttribute("objectSelectionWidget");
- }
- return objectSelectionWidget;
- }
-
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java
deleted file mode 100644
index acb0acc1b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java
+++ /dev/null
@@ -1,216 +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.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-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.ws.internal.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionRegistry
-{
-
- private static WebServiceRuntimeExtensionRegistry instance_;
-
- HashMap webServiceTypes_;
-
- ArrayList webServiceTypesList_;
-
- ArrayList webServiceClientTypesList_;
-
- Hashtable webServiceImpls_;
-
- Hashtable webServiceClientImpls_;
-
- Hashtable serviceTypes_;
-
- Hashtable clientTypes_;
-
- Hashtable webServiceRuntimes_;
-
- /**
- * Returns a singleton instance of this class.
- *
- * @return A singleton WebServiceRuntimeExtensionRegistry object.
- */
- public static WebServiceRuntimeExtensionRegistry getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceRuntimeExtensionRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- private void load()
- {
- // Can't get rid of webServiceTypes in M4
- webServiceTypes_ = new HashMap();
- webServiceTypesList_ = new ArrayList();
- webServiceClientTypesList_ = new ArrayList();
- webServiceImpls_ = new Hashtable();
- webServiceClientImpls_ = new Hashtable();
- serviceTypes_ = new Hashtable();
- clientTypes_ = new Hashtable();
- webServiceRuntimes_ = new Hashtable();
-
- IExtensionRegistry reg = Platform.getExtensionRegistry();
-
- //Load WebServiceImpls
- IConfigurationElement[] wsImplExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "wsImpl");
-
- for(int idx=0; idx<wsImplExts.length; idx++)
- {
- IConfigurationElement elem = wsImplExts[idx];
-
- if (elem.getName().equals("webServiceImpl"))
- {
- WebServiceImpl wsimpl = new WebServiceImpl(elem);
- webServiceImpls_.put(elem.getAttribute("id"), wsimpl);
- }
- }
-
- //Load WebServiceClientImpls
- IConfigurationElement[] wsClientImplExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "wsClientImpl");
-
- for(int idx=0; idx<wsClientImplExts.length; idx++)
- {
- IConfigurationElement elem = wsClientImplExts[idx];
-
- if (elem.getName().equals("webServiceClientImpl"))
- {
- WebServiceClientImpl wsClientImpl = new WebServiceClientImpl(elem);
- webServiceClientImpls_.put(elem.getAttribute("id"), wsClientImpl);
- }
- }
-
- //Load ServiceTypes
- IConfigurationElement[] serviceTypeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "serviceType");
-
- for(int idx=0; idx<serviceTypeExts.length; idx++)
- {
- IConfigurationElement elem = serviceTypeExts[idx];
-
- if (elem.getName().equals("serviceType"))
- {
- ServiceType st = new ServiceType(elem,webServiceImpls_);
- serviceTypes_.put(elem.getAttribute("id"), st);
- }
- }
-
- //Load ClientTypes
- IConfigurationElement[] clientTypeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "clientType");
-
- for(int idx=0; idx<clientTypeExts.length; idx++)
- {
- IConfigurationElement elem = clientTypeExts[idx];
-
- if (elem.getName().equals("clientType"))
- {
- ClientType ct = new ClientType(elem,webServiceClientImpls_);
- clientTypes_.put(elem.getAttribute("id"), ct);
- }
- }
-
- //Load WebSerivceRuntimes
- IConfigurationElement[] wsrtExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "webServiceRuntime");
-
- for(int idx=0; idx<wsrtExts.length; idx++)
- {
- IConfigurationElement elem = wsrtExts[idx];
-
- if (elem.getName().equals("webServiceRuntime"))
- {
- WebServiceRuntimeInfo wsrtInfo = new WebServiceRuntimeInfo(elem, serviceTypes_, clientTypes_);
- webServiceRuntimes_.put(elem.getAttribute("id"), wsrtInfo);
-
- //Update the type lists
- updateWebServiceTypeList(wsrtInfo);
- updateWebServiceClientTypeList(wsrtInfo);
-
- }
- }
- }
-
- private void updateWebServiceTypeList(WebServiceRuntimeInfo wsrtInfo)
- {
- ServiceType[] sts = wsrtInfo.getServiceTypes();
- if (sts != null)
- {
- for (int j = 0; j < sts.length; j++)
- {
- String implId = sts[j].getWebServiceImpl().getId();
- String[] bus = sts[j].getBottomUpModuleTypesInclude();
- String[] tds = sts[j].getTopDownModuleTypesInclude();
- if (bus != null)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.BOTTOMUP));
- entrybuff.append("/");
- entrybuff.append(implId);
- String entry = entrybuff.toString();
- if (!webServiceTypesList_.contains(entry))
- {
- webServiceTypesList_.add(entry);
- }
- }
- if (tds != null)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
- entrybuff.append("/");
- entrybuff.append(implId);
- String entry = entrybuff.toString();
- if (!webServiceTypesList_.contains(entry))
- {
- webServiceTypesList_.add(entry);
- }
- }
- }
- }
- }
-
- private void updateWebServiceClientTypeList(WebServiceRuntimeInfo wsrtInfo)
- {
- ClientType[] cts = wsrtInfo.getClientTypes();
- if (cts != null)
- {
- for (int j = 0; j < cts.length; j++)
- {
- String implId = cts[j].getWebServiceClientImpl().getId();
- String[] mods = cts[j].getModuleTypesInclude();
- if (mods != null)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.CLIENT));
- entrybuff.append("/");
- entrybuff.append(implId);
- String entry = entrybuff.toString();
- if (!webServiceClientTypesList_.contains(entry))
- {
- webServiceClientTypesList_.add(entry);
- }
- }
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java
deleted file mode 100644
index 7cb5e5315..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java
+++ /dev/null
@@ -1,197 +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.ui.wsrt;
-
-import java.util.ArrayList;
-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.ws.internal.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionRegistry2
-{
-
- private static WebServiceRuntimeExtensionRegistry2 instance_;
-
-
- Hashtable webServiceImpls_;
-
- Hashtable webServiceClientImpls_;
-
- Hashtable runtimes_;
-
- Hashtable serviceRuntimes_;
-
- Hashtable clientRuntimes_;
-
- ArrayList webServiceTypesList_;
-
- ArrayList webServiceClientTypesList_;
-
-
- /**
- * Returns a singleton instance of this class.
- *
- * @return A singleton WebServiceRuntimeExtensionRegistry2 object.
- */
- public static WebServiceRuntimeExtensionRegistry2 getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceRuntimeExtensionRegistry2();
- instance_.load();
- }
- return instance_;
- }
-
- private void load()
- {
- webServiceImpls_ = new Hashtable();
- webServiceClientImpls_ = new Hashtable();
- runtimes_ = new Hashtable();
- serviceRuntimes_ = new Hashtable();
- clientRuntimes_ = new Hashtable();
- webServiceTypesList_ = new ArrayList();
- webServiceClientTypesList_ = new ArrayList();
-
-
- IExtensionRegistry reg = Platform.getExtensionRegistry();
-
- //Load WebServiceImpls
- IConfigurationElement[] wsImplExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "wsImpl");
-
- for(int idx=0; idx<wsImplExts.length; idx++)
- {
- IConfigurationElement elem = wsImplExts[idx];
- System.out.println("element name = "+elem.getName());
- if (elem.getName().equals("webServiceImpl"))
- {
- WebServiceImpl wsimpl = new WebServiceImpl(elem);
- System.out.println(elem.getAttribute("id"));
- webServiceImpls_.put(elem.getAttribute("id"), wsimpl);
- }
- }
-
- //Load WebServiceClientImpls
- IConfigurationElement[] wsClientImplExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "wsClientImpl");
-
- for(int idx=0; idx<wsClientImplExts.length; idx++)
- {
- IConfigurationElement elem = wsClientImplExts[idx];
-
- if (elem.getName().equals("webServiceClientImpl"))
- {
- WebServiceClientImpl wsClientImpl = new WebServiceClientImpl(elem);
- webServiceClientImpls_.put(elem.getAttribute("id"), wsClientImpl);
- }
- }
-
- //Load runtimes
- IConfigurationElement[] runtimeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "runtimes");
-
- for(int idx=0; idx<runtimeExts.length; idx++)
- {
- IConfigurationElement elem = runtimeExts[idx];
-
- if (elem.getName().equals("runtime"))
- {
- RuntimeDescriptor rd = new RuntimeDescriptor(elem);
- runtimes_.put(elem.getAttribute("id"), rd);
- }
- }
-
- //Load serviceRuntimes
- IConfigurationElement[] serviceRuntimeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "serviceRuntimes");
-
- for(int idx=0; idx<serviceRuntimeExts.length; idx++)
- {
- IConfigurationElement elem = serviceRuntimeExts[idx];
-
- if (elem.getName().equals("serviceRuntime"))
- {
- ServiceRuntimeDescriptor rd = new ServiceRuntimeDescriptor(elem, webServiceImpls_, runtimes_);
- serviceRuntimes_.put(elem.getAttribute("id"), rd);
- updateWebServiceTypeList(rd);
- }
- }
-
- //Load serviceRuntimes
- IConfigurationElement[] clientRuntimeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "clientRuntimes");
-
- for(int idx=0; idx<clientRuntimeExts.length; idx++)
- {
- IConfigurationElement elem = clientRuntimeExts[idx];
-
- if (elem.getName().equals("clientRuntime"))
- {
- ClientRuntimeDescriptor rd = new ClientRuntimeDescriptor(elem, webServiceClientImpls_, runtimes_);
- clientRuntimes_.put(elem.getAttribute("id"), rd);
- updateWebServiceClientTypeList(rd);
-
- }
- }
- }
-
- private void updateWebServiceTypeList(ServiceRuntimeDescriptor descriptor)
- {
- String serviceImplId = descriptor.getServiceImplementationType().getId();
- boolean bottomUp = descriptor.getBottomUp();
- boolean topDown = descriptor.getTopDown();
- if (bottomUp)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.BOTTOMUP));
- entrybuff.append("/");
- entrybuff.append(serviceImplId);
- String entry = entrybuff.toString();
- if (!webServiceTypesList_.contains(entry))
- {
- webServiceTypesList_.add(entry);
- }
- }
-
- if (topDown)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
- entrybuff.append("/");
- entrybuff.append(serviceImplId);
- String entry = entrybuff.toString();
- if (!webServiceTypesList_.contains(entry))
- {
- webServiceTypesList_.add(entry);
- }
- }
- }
-
- private void updateWebServiceClientTypeList(ClientRuntimeDescriptor descriptor)
- {
- String clientImplId = descriptor.getClientImplementationType().getId();
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.CLIENT));
- entrybuff.append("/");
- entrybuff.append(clientImplId);
- String entry = entrybuff.toString();
- if (!webServiceClientTypesList_.contains(entry))
- {
- webServiceClientTypesList_.add(entry);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java
deleted file mode 100644
index 3192c28a5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java
+++ /dev/null
@@ -1,967 +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.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.TypeSelectionFilter;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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.ui.ServerUICore;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionUtils
-{
- private static WebServiceRuntimeExtensionRegistry registry = WebServiceRuntimeExtensionRegistry.getInstance();
- private static SelectionListChoices serverToRuntimeToJ2EE_;
- private static Hashtable serverFactoryIdByLabel_;
- private static Hashtable runtimeIdByLabel_;
-
- public static IWebServiceRuntime getWebServiceRuntime( String runtimeId )
- {
- WebServiceRuntimeInfo wsrtInfo = getWebServiceRuntimeById(runtimeId);
- IWebServiceRuntime webserviceRuntime = null;
- if (wsrtInfo != null)
- {
- webserviceRuntime = wsrtInfo.getWebServiceRuntime();
- }
-
- return webserviceRuntime;
- }
-
- public static WebServiceImpl getWebServiceImplById(String id)
- {
- Object result = registry.webServiceImpls_.get(id);
- if (result!=null)
- {
- return (WebServiceImpl)result;
- }
- return null;
- }
-
- public static int getScenarioFromTypeId(String typeId)
- {
- return Integer.parseInt(typeId.substring(0,typeId.indexOf("/")));
- }
-
- public static String getImplIdFromTypeId(String typeId)
- {
- return typeId.substring(typeId.indexOf("/")+1);
- }
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static ServiceType getServiceType(String runtimeId, String typeId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
- if (wsrt!=null)
- {
- int scenario = getScenarioFromTypeId(typeId);
- String implId = getImplIdFromTypeId(typeId);
- //Return the first service type that supports the impl and scenario
- ServiceType[] sts = wsrt.getServiceTypes();
- if (sts != null)
- {
- for (int i = 0; i < sts.length; i++)
- {
- String thisImplId = sts[i].getWebServiceImpl().getId();
- if (implId.equals(thisImplId))
- {
- // Check if scenario is supported
- if (sts[i].supportsScenario(scenario))
- {
- return sts[i];
- }
- }
- }
- }
- }
-
- return null;
- }
-
- public static WebServiceRuntimeInfo getWebServiceRuntimeById(String id)
- {
- Object result = registry.webServiceRuntimes_.get(id);
- if (result!=null)
- {
- return (WebServiceRuntimeInfo)result;
- }
- return null;
- }
-
- public static WebServiceRuntimeInfo getWebServiceRuntimeByLabel(String label)
- {
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- if (wsr!=null) {
- if (label.equals(wsr.getLabel()))
- return wsr;
- }
- }
- return null;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static String[] getRuntimesByType(String typeId)
- {
- int scenario = getScenarioFromTypeId(typeId);
- String implId = getImplIdFromTypeId(typeId);
- ArrayList ids = new ArrayList();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- ServiceType[] sts = wsr.getServiceTypes();
- if (sts != null)
- {
- for (int i = 0; i < sts.length; i++)
- {
- String thisImplId = sts[i].getWebServiceImpl().getId();
- if (implId.equals(thisImplId))
- {
- // Check if scenario is supported
- if (sts[i].supportsScenario(scenario))
- {
- ids.add(wsr.getId());
- break;
- }
- }
- }
- }
- }
-
- if (ids.size() > 0)
- {
- String[] runtimeIds = (String[])ids.toArray(new String[0]);
- return runtimeIds;
- }
-
- return null;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static boolean isRuntimeSupportedForType(String typeId, String runtimeId)
- {
- String[] runtimeIds = getRuntimesByType(typeId);
- if (runtimeIds!=null)
- {
- for (int i=0; i < runtimeIds.length; i++)
- {
- if (runtimeIds[i].equals(runtimeId))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- public static String[] getServerFactoryIdsByType(String typeId)
- {
- String[] wsrts = getRuntimesByType(typeId);
- if (wsrts == null )
- {
- return null;
- }
-
- ArrayList ids = new ArrayList();
- for (int i=0; i<wsrts.length ;i++)
- {
- String[] fIds = getWebServiceRuntimeById(wsrts[i]).getServerFactoryIds();
- if (fIds != null)
- {
- for (int j=0; j<fIds.length; j++)
- {
- if (!ids.contains(fIds[j]))
- {
- ids.add(fIds[j]);
- }
- }
- }
- }
-
- if (ids.size() > 0)
- {
- String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
- return serverFactoryIds;
- }
-
- return null;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static boolean isServerSupportedForChosenType(String typeId, String serverFactoryId)
- {
- String[] fIds = getServerFactoryIdsByType(typeId);
- if (fIds == null)
- {
- return false;
- }
-
- for (int i=0;i<fIds.length;i++)
- {
- if (serverFactoryId.equals(fIds[i]))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static boolean isServerRuntimeTypeSupported(String serverFactoryId, String runtimeId, String typeId)
- {
- String[] rIds = getRuntimesByType(typeId);
- if (rIds == null)
- {
- return false;
- }
-
- for (int i = 0; i < rIds.length; i++)
- {
- if (runtimeId.equals(rIds[i]))
- {
- String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
- if (fIds != null)
- {
- for (int j = 0; j < fIds.length; j++)
- {
- if (serverFactoryId.equals(fIds[j]))
- {
- // Found it!
- return true;
- }
- }
- }
- }
- }
-
- return false;
- }
-
- public static boolean doesRuntimeSupportJ2EELevel(String j2eeVersionId, String runtimeId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
- if (wsrt==null)
- return false;
-
- String[] j2eeVersions = wsrt.getJ2eeLevels();
- if (j2eeVersions==null || j2eeVersions.length==0)
- return true;
-
- for(int i=0; i<j2eeVersions.length; i++)
- {
- if (j2eeVersions[i].equals(j2eeVersionId))
- {
- return true;
- }
- }
- return false;
- }
-
- public static boolean doesRuntimeSupportServerTarget(String serverTargetId, String runtimeId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
- if (wsrt==null)
- return false;
-
- String[] fIds = wsrt.getServerFactoryIds();
- for(int i=0;i<fIds.length;i++)
- {
- IServerType serverType = ServerCore.findServerType(fIds[i]);
- if (serverType == null)
- continue;
-
- String thisServerTargetId = serverType.getRuntimeType().getId();
- if (thisServerTargetId.equals(serverTargetId))
- return true;
- }
-
- return false;
- }
-
- /**
- * Returns a list of valid projects for the Web service type with an id of typeId.
- * In the case where the Web service type extension does not specify which project
- * natures are included, a array of all Web and EJB projects in the workspace will
- * be returned.
- * @param typeId
- * @return IProject[] an array of valid projects
- */
- public static IProject[] getAllProjects()
- {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- ArrayList validProjects = new ArrayList();
- for (int i = 0; i < projects.length; i++)
- {
- if (!projects[i].getName().equals("Servers") && !projects[i].getName().startsWith("."))
- {
- validProjects.add(projects[i]);
- }
- }
-
- return (IProject[])validProjects.toArray(new IProject[0]);
- // rsktodo
- /*
- IWebServiceType wst = getWebServiceTypeById(typeId);
- if (wst != null)
- {
- IConfigurationElement elem = wst.getConfigurationElement();
- String includedNatures = elem.getAttribute("includeNatures");
- String excludedNatures = elem.getAttribute("excludeNatures");
- if (includedNatures!=null && includedNatures.length()>0)
- {
- for (int i = 0; i < projects.length; i++)
- {
- if (include(projects[i], includedNatures) && exclude(projects[i], excludedNatures))
- validProjects.add(projects[i]);
- }
- return (IProject[])validProjects.toArray(new IProject[0]);
- }
- }
-
- //If wst was null or the extension didn't specify which project natures are
- // to be included, revert to the old behaviour
- for (int j = 0; j < projects.length; j++)
- {
- if (ResourceUtils.isWebProject(projects[j]) || ResourceUtils.isEJBProject(projects[j]))
- validProjects.add(projects[j]);
- }
- return (IProject[])validProjects.toArray(new IProject[0]);
- */
- // rsktodo
- }
-
- public static LabelsAndIds getServiceTypeLabels()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", registry );
-
- LabelsAndIds labelIds = new LabelsAndIds();
- Iterator iterator = registry.webServiceTypesList_.iterator();
- int size = registry.webServiceTypesList_.size();
- String[] labels = new String[size];
- String[] ids = new String[size];
- int index = 0;
-
- labelIds.setLabels_( labels );
- labelIds.setIds_( ids );
-
- while( iterator.hasNext() )
- {
- String wst = (String)iterator.next();
- int scenario = getScenarioFromTypeId(wst);
- String implId = getImplIdFromTypeId(wst);
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
- String impllabel = wsimpl.getLabel();
- ids[index] = wst;
- String scenLabel = "";
- switch(scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- scenLabel = msgUtils.getMessage(WebServiceScenario.BOTTOMUP_LABEL);
- break;
- case WebServiceScenario.TOPDOWN:
- scenLabel = msgUtils.getMessage(WebServiceScenario.TOPDOWN_LABEL);
- break;
- default:
- }
- labels[index] = msgUtils.getMessage( "COMBINED_TYPE_AND_RUNTIME_LABEL", new String[]{ scenLabel, impllabel } );
- index++;
- }
-
- return labelIds;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static String getDefaultRuntimeValueFor(String typeId)
- {
- String[] rIds = getRuntimesByType(typeId);
- if (rIds == null)
- {
- return null;
- }
-
- return rIds[0];
- }
-
-
- public static String getDefaultServerValueFor(String typeId)
- {
- String[] fIds = getServerFactoryIdsByType(typeId);
- if (fIds==null)
- return null;
-
- return fIds[0];
- }
-
- public static String[] getWebServiceTypeBySelection(IStructuredSelection selection)
- {
- TypeSelectionFilter tsf = new TypeSelectionFilter();
- String[] wst = tsf.getWebServiceTypeByInitialSelection(selection, registry.webServiceTypesList_);
- return wst == null ? null : wst;
- }
- /**
- * Returns true if an EJB project is needed to host a Web service
- * of the type identified by typeId. If multiple natureIds are specified in the
- * "includeNatures" attribute, only the first one is checked. If no natureIds are specified,
- * false is returned.
- *
- * @deprecated
- * Should be refactored in future
- */
-// public static boolean requiresEJBProject(String typeId)
-// {
-// IWebServiceType wst = getWebServiceTypeById(typeId);
-// if (wst != null)
-// {
-// IConfigurationElement elem = wst.getConfigurationElement();
-// String includedNatures = elem.getAttribute("includeNatures");
-// if (includedNatures==null || includedNatures.length()==0)
-// {
-// return false;
-// }
-// else
-// {
-// StringTokenizer st = new StringTokenizer(includedNatures);
-// if(st.hasMoreTokens())
-// {
-// String firstIncludedNature = st.nextToken();
-// if (firstIncludedNature.equals(IEJBNatureConstants.NATURE_ID))
-// return true;
-// }
-// }
-// }
-// return false;
-// }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static boolean requiresEJBProject(String runtimeId, String typeId)
- {
- ServiceType st = getServiceType(runtimeId, typeId);
- if (st!=null)
- {
- String[] includedNatures = st.getModuleTypesInclude(getScenarioFromTypeId(typeId));
- if (includedNatures!=null && includedNatures.length>0)
- {
- if (includedNatures[0].equals(IModuleConstants.JST_EJB_MODULE))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- public static boolean requiresEJBModuleFor(String serverFactoryId, String runtimeId, String typeId)
- {
- // rsktodo
- return false;
- }
-
- //Ported from the former WebServiceClientRegistry
-
- public static String getRuntimeLabelById(String runtimeId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
- if (wsrt == null)
- return null;
-
- return wsrt.getLabel();
- }
-
- public static String getServerLabelById(String serverFactoryId)
- {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType == null)
- return null;
-
- String serverLabel = ServerUICore.getLabelProvider().getText(serverType);
- return serverLabel;
- }
-
- public static String getServerInstanceLabelFromInstanceId( String instanceId )
- {
- IServer server = ServerCore.findServer( instanceId );
- return server.getName();
- }
-
- public static boolean doesRuntimeSupportServer(String runtimeId, String factoryId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
- if (wsrt != null)
- {
- String[] fids = wsrt.getServerFactoryIds();
- if (fids!=null)
- {
- for (int i=0; i<fids.length; i++)
- {
- if (fids[i].equals(factoryId))
- {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- public static String getFirstSupportedServer(String runtimeId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-
- if (wsrt != null)
- {
- String[] fids = wsrt.getServerFactoryIds();
- if (fids!=null && fids.length>0)
- {
- return fids[0];
- }
- }
-
- return null;
- }
-
-
- public static String[] getRuntimesByClientType(String clientImplId)
- {
- ArrayList ids = new ArrayList();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- ClientType[] cts = wsr.getClientTypes();
- if (cts != null)
- {
- for (int i = 0; i < cts.length; i++)
- {
- String wsClientImplId = cts[i].getWebServiceClientImpl().getId();
- if (wsClientImplId.equals(clientImplId))
- {
- ids.add(wsr.getId());
- break;
- }
- }
- }
- }
-
- if (ids.size() > 0)
- {
- String[] runtimeIds = (String[])ids.toArray(new String[0]);
- return runtimeIds;
- }
-
- return null;
- }
-
-
-
- public static boolean webServiceClientRuntimeTypeExists(String serverFactoryId, String runtimeId, String clientTypeId)
- {
- String[] rIds = getRuntimesByClientType(clientTypeId);
- if (rIds == null)
- {
- return false;
- }
-
- for (int i = 0; i < rIds.length; i++)
- {
- if (runtimeId.equals(rIds[i]))
- {
- String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
- if (fIds != null)
- {
- for (int j = 0; j < fIds.length; j++)
- {
- if (serverFactoryId.equals(fIds[j]))
- {
- // Found it!
- return true;
- }
- }
- }
- }
- }
-
- return false;
- }
-
- public static String[] getAllClientRuntimes()
- {
- ArrayList ids = new ArrayList();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- ClientType[] cts = wsr.getClientTypes();
- if (cts!=null && cts.length>0)
- {
- //this runtime supports the client scenario
- ids.add(wsr.getId());
- }
- }
-
- if (ids.size() > 0)
- {
- String[] runtimeIds = (String[])ids.toArray(new String[0]);
- return runtimeIds;
- }
-
- return null;
- }
-
-
- public static String[] getAllClientServerFactoryIds()
- {
- String[] rIds = getAllClientRuntimes();
- if (rIds==null)
- return null;
-
- ArrayList ids = new ArrayList();
- for (int i=0; i<rIds.length ;i++)
- {
- String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
- if (fIds != null)
- {
- for (int j=0; j<fIds.length; j++)
- {
- if (!ids.contains(fIds[j]))
- {
- ids.add(fIds[j]);
- }
- }
- }
- }
-
- if (ids.size() > 0)
- {
- String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
- return serverFactoryIds;
- }
-
- return null;
- }
-
-
-
- public static String[] getClientProjectTypes(String clientImplId, String runtimeId)
- {
- String[] rIds = getRuntimesByClientType(clientImplId);
- if (rIds == null)
- {
- return null;
- }
-
- for (int i = 0; i < rIds.length; i++)
- {
- if (runtimeId.equals(rIds[i]))
- {
- ClientType[] cts = getWebServiceRuntimeById(rIds[i]).getClientTypes();
- if (cts != null)
- {
- for (int j = 0; j < cts.length; j++)
- {
- String thisClientImplId = cts[j].getWebServiceClientImpl().getId();
- if (clientImplId.equals(thisClientImplId))
- {
- // Found the one!
- String[] projectTypes = cts[j].getModuleTypesInclude();
- return projectTypes;
- }
- }
- }
- }
- }
-
- return null;
- }
-
- public static boolean doesRuntimeSupportComponentType(String clientImplId, String runtimeId, String componentTypeId)
- {
- String[] compTypeIds = getClientProjectTypes(clientImplId, runtimeId);
- if (compTypeIds!=null)
- {
- for (int i=0; i<compTypeIds.length; i++)
- {
- if (compTypeIds[i].equals(componentTypeId))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- public static LabelsAndIds getClientTypeLabels()
- {
-
- LabelsAndIds labelIds = new LabelsAndIds();
- String[] idsArray = new String[0];
- String[] labelsArray = new String[0];
- labelIds.setIds_(idsArray);
- labelIds.setLabels_(labelsArray);
-
- String[] rIds = getAllClientRuntimes();
- if (rIds == null)
- {
- return labelIds;
- }
-
- ArrayList ids = new ArrayList();
- ArrayList labels = new ArrayList();
-
- for (int i=0; i < rIds.length; i++)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(rIds[i]);
- ClientType[] cts = wsrt.getClientTypes();
- if (cts != null)
- {
- for (int j = 0; j < cts.length; j++)
- {
- ClientType ct = cts[j];
- // String id = ct.getWebServiceClientTypeId();
- String id = ct.getWebServiceClientImpl().getId();
- if (!ids.contains(id))
- {
- ids.add(id);
- labels.add(ct.getWebServiceClientImpl().getLabel());
- }
- }
- }
-
- }
-
- if (ids.size() > 0)
- {
- idsArray = (String[]) ids.toArray(new String[0]);
- labelsArray = (String[]) labels.toArray(new String[0]);
- labelIds.setIds_(idsArray);
- labelIds.setLabels_(labelsArray);
- }
-
- return labelIds;
-
- }
-
- //Utilities used by the ServerRuntimePreferencePage
-
- public static SelectionListChoices getServerToRuntimeToJ2EE()
- {
- if (serverToRuntimeToJ2EE_!=null)
- {
- return serverToRuntimeToJ2EE_;
- }
-
- //String[] servers = getStringArrayIntersection(getAllServerFactoryIds(), WebServiceClientTypeRegistry.getInstance().getAllClientServerFactoryIds());
- String[] servers = getAllServerFactoryIds();
- SelectionList serversList = new SelectionList(servers, 0);
- Vector choices = new Vector();
- for (int i=0; i<servers.length; i++)
- {
- choices.add(getRuntimeChoices(servers[i]));
- }
- serverToRuntimeToJ2EE_ = new SelectionListChoices(serversList, choices);
- return serverToRuntimeToJ2EE_;
-
- }
-
- private static SelectionListChoices getRuntimeChoices(String serverFactoryId)
- {
-
- String[] runtimes = getRuntimeIDsByServerFactoryID(serverFactoryId);
- SelectionList runtimesList = new SelectionList(runtimes, 0);
- Vector choices = new Vector();
- for (int i=0; i<runtimes.length; i++)
- {
- choices.add(getJ2EEChoices(runtimes[i]));
- }
- return new SelectionListChoices(runtimesList, choices);
- }
-
- private static SelectionListChoices getJ2EEChoices(String runtimeId)
- {
- //String[] serviceJ2EEVersions = getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
- //String[] clientJ2EEVersions = WebServiceClientTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
- //String[] j2eeVersions = getStringArrayIntersection(serviceJ2EEVersions, clientJ2EEVersions);
- WebServiceRuntimeInfo wsr = getWebServiceRuntimeById(runtimeId);
- if (wsr==null)
- {
- return null;
- }
-
- String[] j2eeVersions = wsr.getJ2eeLevels();
- SelectionList j2eeVersionsList = new SelectionList(j2eeVersions, 0);
- return new SelectionListChoices(j2eeVersionsList, null);
- }
-
- private static String[] getAllServerFactoryIds()
- {
- ArrayList ids = new ArrayList();
- if (serverFactoryIdByLabel_ == null)
- {
- serverFactoryIdByLabel_ = new Hashtable();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo) iter.next();
- String[] sfids = wsr.getServerFactoryIds();
- for (int i = 0; i < sfids.length; i++)
- {
- if (!ids.contains(sfids[i]))
- {
- String label = getServerLabelById(sfids[i]);
- if (label != null)
- {
- ids.add(sfids[i]);
- serverFactoryIdByLabel_.put(label, sfids[i]);
- }
- }
- }
- }
- }
- else
- {
- Iterator fids = serverFactoryIdByLabel_.values().iterator();
- while (fids.hasNext())
- {
- String fid = (String)fids.next();
- ids.add(fid);
- }
- }
-
- if (ids.size() > 0)
- {
- String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
- return serverFactoryIds;
- }
-
- return null;
- }
-
- private static String[] getRuntimeIDsByServerFactoryID(String serverFactoryID)
- {
- ArrayList ids = new ArrayList();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- if (doesRuntimeSupportServer(wsr.getId(), serverFactoryID))
- {
- ids.add(wsr.getId());
- }
-
- }
-
- if (ids.size() > 0)
- {
- String[] runtimeIds = (String[])ids.toArray(new String[0]);
- return runtimeIds;
- }
-
- return null;
-
-
- }
-
- public static String getServerFactoryId(String label)
- {
- if (label==null || label.length()==0)
- return null;
-
- if (serverFactoryIdByLabel_ == null)
- {
- getAllServerFactoryIds();
- }
-
- if (serverFactoryIdByLabel_.containsKey(label))
- {
- return (String)serverFactoryIdByLabel_.get(label);
- }
- else
- {
- return null;
- }
- }
-
- public static String getRuntimeId(String label)
- {
-
- if (label==null || label.length()==0)
- return null;
-
- if (runtimeIdByLabel_ == null)
- {
- runtimeIdByLabel_ = new Hashtable();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- runtimeIdByLabel_.put(wsr.getLabel(), wsr.getId());
- }
- }
-
- return (String)runtimeIdByLabel_.get(label);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java
deleted file mode 100644
index 98dbdb049..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java
+++ /dev/null
@@ -1,1439 +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.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.server.core.FacetUtil;
-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.wizard.TypeSelectionFilter2;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices;
-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.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-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.ui.ServerUICore;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionUtils2
-{
- private static WebServiceRuntimeExtensionRegistry2 registry = WebServiceRuntimeExtensionRegistry2.getInstance();
-
- public static RuntimeDescriptor getRuntimeById(String id)
- {
- Object result = registry.runtimes_.get(id);
- if (result!=null)
- {
- return (RuntimeDescriptor)result;
- }
- return null;
- }
-
- public static String getRuntimeLabelById(String runtimeId)
- {
- RuntimeDescriptor desc = getRuntimeById(runtimeId);
- if (desc == null)
- return null;
-
- return desc.getLabel();
- }
-
- public static RuntimeDescriptor getRuntimeByLabel(String label)
- {
- Iterator iter = registry.runtimes_.values().iterator();
- while (iter.hasNext())
- {
- RuntimeDescriptor descriptor = (RuntimeDescriptor)iter.next();
- if (descriptor!=null) {
- if (label.equals(descriptor.getLabel()))
- return descriptor;
- }
- }
- return null;
- }
-
- public static String getServerLabelById(String serverFactoryId)
- {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType == null)
- return null;
-
- String serverLabel = ServerUICore.getLabelProvider().getText(serverType);
- return serverLabel;
- }
-
- public static String getServerInstanceLabelFromInstanceId( String instanceId )
- {
- IServer server = ServerCore.findServer( instanceId );
- return server.getName();
- }
-
- private static String[] getServerFactoryIdsByFacetRuntimes(Set facetRuntimes)
- {
-
- ArrayList supportedServerFactoryIds = new ArrayList();
- String[] serverTypeIds = getAllServerFactoryIdsWithRuntimes();
- Iterator itr = facetRuntimes.iterator();
- while(itr.hasNext())
- {
- IRuntime fRuntime = (IRuntime)itr.next();
- org.eclipse.wst.server.core.IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
- for (int i=0; i<serverTypeIds.length; i++)
- {
- IServerType serverType = ServerCore.findServerType(serverTypeIds[i]);
- String runtimeTypeId = serverType.getRuntimeType().getId();
- if (runtimeTypeId.equals(sRuntime.getRuntimeType().getId()))
- {
- supportedServerFactoryIds.add(serverTypeIds[i]);
- }
- }
- }
-
- return (String[])supportedServerFactoryIds.toArray(new String[0]);
-
- //Temporarily return all factory ids with runtimes
- //return getAllServerFactoryIdsWithRuntimes();
- }
-
- //Service-side utilities
- public static WebServiceImpl getWebServiceImplById(String id)
- {
- Object result = registry.webServiceImpls_.get(id);
- if (result!=null)
- {
- return (WebServiceImpl)result;
- }
- return null;
- }
-
- public static ServiceRuntimeDescriptor getServiceRuntimeDescriptorById(String id)
- {
- Object result = registry.serviceRuntimes_.get(id);
- if (result!=null)
- {
- return (ServiceRuntimeDescriptor)result;
- }
- return null;
- }
-
- public static IWebServiceRuntime getServiceRuntime( String serviceRuntimeId )
- {
- ServiceRuntimeDescriptor descriptor = getServiceRuntimeDescriptorById(serviceRuntimeId);
- IWebServiceRuntime webserviceRuntime = null;
- if (descriptor != null)
- {
- webserviceRuntime = descriptor.getWebServiceRuntime();
- }
-
- return webserviceRuntime;
- }
-
- public static String getServiceRuntimeId(TypeRuntimeServer trs, String projectName, String templateId)
- {
- //Find the first client runtime that supports the implementation type, runtime, server, and project
- String[] descs = getServiceRuntimesByServiceType(trs.getTypeId());
- for (int i=0; i<descs.length; i++)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(descs[i]);
- if (desc.getRuntime().getId().equals(trs.getRuntimeId()))
- {
- boolean supportsServer = doesServiceRuntimeSupportServer(desc.getId(), trs.getServerId());
- if (!supportsServer)
- {
- continue;
- }
-
- IProject project = ProjectUtilities.getProject(projectName);
- if (project.exists())
- {
- if (doesServiceRuntimeSupportProject(desc.getId(), projectName))
- {
- return desc.getId();
- }
- }
- else
- {
- //Check if template is supported
- if (doesServiceRuntimeSupportTemplate(desc.getId(), templateId))
- {
- return desc.getId();
- }
- }
- }
- }
-
- return "";
-
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static int getScenarioFromTypeId(String typeId)
- {
- return Integer.parseInt(typeId.substring(0,typeId.indexOf("/")));
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static String getWebServiceImplIdFromTypeId(String typeId)
- {
- return typeId.substring(typeId.indexOf("/")+1);
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- *
- * @returns String[] containing the ids of all runtimes that
- * support this type.
- */
- public static String[] getRuntimesByServiceType(String typeId)
- {
- int scenario = getScenarioFromTypeId(typeId);
- String implId = getWebServiceImplIdFromTypeId(typeId);
- ArrayList ids = new ArrayList();
- Iterator iter = registry.serviceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
- //Check if this serviceRuntime supports the implementation type
- if (desc.getServiceImplementationType().getId().equals(implId))
- {
- switch (scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- if (desc.getBottomUp())
- {
- String runtimeId = desc.getRuntime().getId();
- if (!ids.contains(runtimeId))
- {
- ids.add(runtimeId);
- }
- }
- break;
- case WebServiceScenario.TOPDOWN:
- if (desc.getTopDown())
- {
- String runtimeId = desc.getRuntime().getId();
- if (!ids.contains(runtimeId))
- {
- ids.add(runtimeId);
- }
- }
- break;
- default:
- }
- }
- }
-
- return (String[])ids.toArray(new String[]{});
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- *
- * @returns String[] containing the ids of all service runtimes that
- * support this type.
- */
- public static String[] getServiceRuntimesByServiceType(String typeId)
- {
- int scenario = getScenarioFromTypeId(typeId);
- String implId = getWebServiceImplIdFromTypeId(typeId);
- ArrayList ids = new ArrayList();
- Iterator iter = registry.serviceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
- //Check if this serviceRuntime supports the implementation type
- if (desc.getServiceImplementationType().getId().equals(implId))
- {
- switch (scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- if (desc.getBottomUp())
- {
- String serviceRuntimeId = desc.getId();
- ids.add(serviceRuntimeId);
- }
- break;
- case WebServiceScenario.TOPDOWN:
- if (desc.getTopDown())
- {
- String serviceRuntimeId = desc.getId();
- ids.add(serviceRuntimeId);
- }
- break;
- default:
- }
- }
- }
-
- return (String[])ids.toArray(new String[]{});
- }
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- * @param runtimeId id of a Web service runtime (RuntimeDescriptor)
- */
- public static boolean isRuntimeSupportedForServiceType(String typeId, String runtimeId)
- {
- String[] serviceRuntimeIds = getServiceRuntimesByServiceType(typeId);
- if (serviceRuntimeIds!=null)
- {
- for (int i=0; i < serviceRuntimeIds.length; i++)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(serviceRuntimeIds[i]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- public static String[] getServerFactoryIdsByServiceType(String typeId)
- {
- ArrayList serverFactoryIds = new ArrayList();
- String[] srts = getServiceRuntimesByServiceType(typeId);
- if (srts != null)
- {
- for (int i = 0; i < srts.length; i++)
- {
- //Get the runtimes that work for the facets required for this service runtime
- String[] fIds = getServerFactoryIdsByServiceRuntime(srts[i]);
- for (int j=0; j<fIds.length; j++)
- {
- if (!serverFactoryIds.contains(fIds[j]))
- {
- serverFactoryIds.add(fIds[j]);
- }
- }
- }
- }
-
- return (String[])serverFactoryIds.toArray(new String[]{});
-
- //Temporarily return all server type ids.
- //return getAllServerFactoryIdsWithRuntimes();
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static boolean isServerSupportedForChosenServiceType(String typeId, String serverFactoryId)
- {
- String[] fIds = getServerFactoryIdsByServiceType(typeId);
- if (fIds == null)
- {
- return false;
- }
-
- for (int i=0;i<fIds.length;i++)
- {
- if (serverFactoryId.equals(fIds[i]))
- {
- return true;
- }
- }
-
- return false;
- }
-
- public static String[] getServerFactoryIdsByServiceRuntime(String serviceRuntimeId)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(serviceRuntimeId);
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-
- //Temporarily return all server types
- //return getAllServerFactoryIdsWithRuntimes();
- return getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- }
-
-
-
-
- public static boolean doesServiceRuntimeSupportServer(String serviceRuntimeId, String serverFactoryId)
- {
- String[] serverIds = getServerFactoryIdsByServiceRuntime(serviceRuntimeId);
- for (int i=0; i<serverIds.length; i++)
- {
- if (serverIds[i].equals(serverFactoryId))
- {
- return true;
- }
- }
-
- return false;
- }
-
-
- public static LabelsAndIds getServiceTypeLabels()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", registry );
-
- LabelsAndIds labelIds = new LabelsAndIds();
- Iterator iterator = registry.webServiceTypesList_.iterator();
- int size = registry.webServiceTypesList_.size();
- String[] labels = new String[size];
- String[] ids = new String[size];
- int index = 0;
-
- labelIds.setLabels_( labels );
- labelIds.setIds_( ids );
-
- while( iterator.hasNext() )
- {
- String wst = (String)iterator.next();
- int scenario = getScenarioFromTypeId(wst);
- String implId = getWebServiceImplIdFromTypeId(wst);
- WebServiceImpl wsimpl = getWebServiceImplById(implId);
- String impllabel = wsimpl.getLabel();
- ids[index] = wst;
- String scenLabel = "";
- switch(scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- scenLabel = msgUtils.getMessage(WebServiceScenario.BOTTOMUP_LABEL);
- break;
- case WebServiceScenario.TOPDOWN:
- scenLabel = msgUtils.getMessage(WebServiceScenario.TOPDOWN_LABEL);
- break;
- default:
- }
- labels[index] = msgUtils.getMessage( "COMBINED_TYPE_AND_RUNTIME_LABEL", new String[]{ scenLabel, impllabel } );
- index++;
- }
-
- return labelIds;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static String getDefaultRuntimeValueFor(String typeId)
- {
- String[] srIds = getServiceRuntimesByServiceType(typeId);
- if (srIds == null)
- {
- return null;
- }
-
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(srIds[0]);
- return desc.getRuntime().getId();
- }
-
- public static String getDefaultServerValueFor(String typeId)
- {
- String[] fIds = getServerFactoryIdsByServiceType(typeId);
- if (fIds==null)
- return null;
-
- return fIds[0];
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- * @param runtimeId is the id of a RuntimeDescriptor
- * @param serverFactoryId server factory id
- */
- public static boolean isServerRuntimeTypeSupported(String serverFactoryId, String runtimeId, String typeId)
- {
- //Ensure there is at least one service runtime that supports the given type
- String[] serviceRuntimes = getServiceRuntimesByServiceType(typeId);
- if (serviceRuntimes!=null && serviceRuntimes.length>0)
- {
- //Ensure that at least one of these server runtimes supports the given server
- for (int i=0; i<serviceRuntimes.length; i++)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(serviceRuntimes[i]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- //Matches the type and the runtime. Check if it matches the server
- Set runtimes = getRuntimes(desc.getRequiredFacetVersions());
- String[] fIds = getServerFactoryIdsByFacetRuntimes(runtimes);
- for (int j=0; j<fIds.length; j++)
- {
- if (fIds[j].equals(serverFactoryId))
- {
- return true;
- }
- }
- }
- }
- }
-
- //didn't find a match. return false.
- return false;
- }
-
- public static String[] getWebServiceTypeBySelection(IStructuredSelection selection)
- {
- TypeSelectionFilter2 tsf = new TypeSelectionFilter2();
- String[] wst = tsf.getWebServiceTypeByInitialSelection(selection, registry.webServiceTypesList_);
- return wst == null ? null : wst;
- }
-
- /*
- * @param runtimeId : id of a RuntimeDescriptor
- * @param factoryId : id of a server type
- */
- public static boolean doesRuntimeSupportServerForServiceSide(String runtimeId, String factoryId)
- {
- //Get all the ServiceRuntimeDescriptors that point to this runtimeId
- Iterator iter = registry.serviceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
- //check if this service runtime points to runtimeId
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
- String[] fIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- for (int j=0; j<fIds.length; j++)
- {
- if (fIds[j].equals(factoryId))
- {
- return true;
- }
- }
- }
- }
-
- //No service runtime matched. Return false.
- return false;
- }
-
- /*
- * @param runtimeId: id of a RuntimeDescriptor
- * @return: server factory id
- */
- public static String getFirstSupportedServerForServiceSide(String runtimeId)
- {
- //Get all the ServiceRuntimeDescriptors that point to this runtimeId
- Iterator iter = registry.serviceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
- //check if this service runtime points to runtimeId
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
- String[] factoryIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- if (factoryIds!=null && factoryIds.length >0)
- {
- return factoryIds[0];
- }
- }
- }
-
- //didn't get a single suitable server type id, return null.
- return null;
- }
-
- public static String[] getProjectsForServiceTypeAndRuntime(String typeId, String runtimeId)
- {
- String[] descs = getServiceRuntimesByServiceType(typeId);
- IProject[] projects = FacetUtils.getAllProjects();
- ArrayList validProjects = new ArrayList();
-
- for (int i=0; i<projects.length;i++)
- {
- //check if this projects suits any of the service runtimes
- for (int j=0; j<descs.length; j++)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(descs[j]);
- RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(projects[i]);
- if (fproject != null)
- {
- Set facetVersions = fproject.getProjectFacets();
- FacetMatcher fm = FacetUtils.match(rfvs, facetVersions);
- if (fm.isMatch())
- {
- validProjects.add(projects[i].getName());
- break;
- }
- }
- else
- {
- //TODO Handle the plain-old Java projects
- }
- } catch (CoreException ce)
- {
-
- }
- }
- }
-
- return (String[])validProjects.toArray(new String[0]);
-
- }
-
- public static boolean doesServiceRuntimeSupportProject(String serviceRuntimeId, String projectName)
- {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project==null || !project.exists())
- return false;
-
- ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId);
- RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
-
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(project);
- if (fproject != null)
- {
- Set facetVersions = fproject.getProjectFacets();
- FacetMatcher fm = FacetUtils.match(rfvs, facetVersions);
- if (fm.isMatch())
- {
- return true;
- }
- }
- else
- {
- //TODO Handle the plain-old Java projects
- }
- } catch (CoreException ce)
- {
-
- }
-
- return false;
- }
-
- /*
- * Returns a list of valid faceted project template ids
- * @param typeId id of the form "0/implId" on the service side.
- * @param runtimeId id of a RuntimeDescriptor
- *
- * @return String[] array of IFacetedProjectTemplate ids
- */
- public static String[] getServiceProjectTemplates(String typeId, String runtimeId)
- {
- String[] srIds = getServiceRuntimesByServiceType(typeId);
- if (srIds == null)
- {
- return null;
- }
-
- ArrayList templateIdList = new ArrayList();
- for (int i = 0; i < srIds.length; i++)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(srIds[i]);
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- //Get the templates for this client runtime
- Set templateIds = FacetUtils.getTemplates(desc.getRequiredFacetVersions());
-
- //Add the template ids to the list if they have not already been added
- Iterator itr = templateIds.iterator();
- while (itr.hasNext())
- {
- IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
- if (!templateIdList.contains(template.getId()))
- {
- templateIdList.add(template.getId());
- }
- }
- }
-
- }
-
- return (String[])templateIdList.toArray(new String[]{});
- }
-
- public static boolean doesServiceRuntimeSupportTemplate(String serviceRuntimeId, String templateId)
- {
- ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(serviceRuntimeId);
- //Get the templates for this client runtime
- Set templates = FacetUtils.getTemplates(desc.getRequiredFacetVersions());
- IFacetedProjectTemplate checkingTemplate = ProjectFacetsManager.getTemplate(templateId);
- return templates.contains(checkingTemplate);
- }
-
- //Client-side utilities
- public static WebServiceClientImpl getWebServiceClientImplById(String id)
- {
- Object result = registry.webServiceClientImpls_.get(id);
- if (result!=null)
- {
- return (WebServiceClientImpl)result;
- }
- return null;
- }
-
- public static ClientRuntimeDescriptor getClientRuntimeDescriptorById(String id)
- {
- Object result = registry.clientRuntimes_.get(id);
- if (result!=null)
- {
- return (ClientRuntimeDescriptor)result;
- }
- return null;
- }
-
- public static IWebServiceRuntime getClientRuntime( String clientRuntimeId )
- {
- ClientRuntimeDescriptor descriptor = getClientRuntimeDescriptorById(clientRuntimeId);
- IWebServiceRuntime webserviceRuntime = null;
- if (descriptor != null)
- {
- webserviceRuntime = descriptor.getWebServiceRuntime();
- }
-
- return webserviceRuntime;
- }
-
- public static String getClientRuntimeId(TypeRuntimeServer trs, String projectName, String templateId)
- {
- //Find the first client runtime that supports the implementation type, runtime, server, and project
- String[] descs = getClientRuntimesByType(trs.getTypeId());
- for (int i=0; i<descs.length; i++)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(descs[i]);
- if (desc.getRuntime().getId().equals(trs.getRuntimeId()))
- {
- boolean supportsServer = doesClientRuntimeSupportServer(desc.getId(), trs.getServerId());
- if (!supportsServer)
- {
- continue;
- }
-
- IProject project = ProjectUtilities.getProject(projectName);
- if (project.exists())
- {
- if (doesClientRuntimeSupportProject(desc.getId(), projectName))
- {
- return desc.getId();
- }
- }
- else
- {
- //Check if template is supported
- if (doesClientRuntimeSupportTemplate(desc.getId(), templateId))
- {
- return desc.getId();
- }
- }
- }
- }
-
- return "";
-
- }
-
- /*
- * @return String[] array of ids of RuntimeDescriptors
- */
- public static String[] getAllRuntimesForClientSide()
- {
- ArrayList runtimeIds = new ArrayList();
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- runtimeIds.add(desc.getRuntime().getId());
- }
- return (String[])runtimeIds.toArray(new String[]{});
- }
-
- /*
- * @param clientImpld The id of a client implementation type
- *
- * @returns String[] containing the ids of all clientRuntimes that
- * support this client implementation type
- */
- public static String[] getClientRuntimesByType(String clientImplId)
- {
- ArrayList ids = new ArrayList();
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- //Check if this serviceRuntime supports the implementation type
- if (desc.getClientImplementationType().getId().equals(clientImplId))
- {
- ids.add(desc.getId());
- }
- }
-
- return (String[])ids.toArray(new String[]{});
- }
-
- /*
- * @param clientImplId id of a WebServiceClientImpl
- * @return String[] array of RuntimeDescriptor ids
- */
- public static String[] getRuntimesByClientType(String clientImplId)
- {
- ArrayList runtimeIds = new ArrayList();
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- //Check if this serviceRuntime supports the implementation type
- if (desc.getClientImplementationType().getId().equals(clientImplId))
- {
- runtimeIds.add(desc.getRuntime().getId());
- }
- }
-
- return (String[])runtimeIds.toArray(new String[]{});
- }
-
- /*
- * @param clientImplId The id of a client implementation type
- * @param runtimeId id of a runtime (RuntimeDescriptor)
- */
- public static boolean isRuntimeSupportedForClientType(String clientImplId, String runtimeId)
- {
- String[] clientRuntimeIds = getClientRuntimesByType(clientImplId);
- if (clientRuntimeIds!=null)
- {
- for (int i=0; i < clientRuntimeIds.length; i++)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimeIds[i]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- public static String[] getAllClientServerFactoryIds()
- {
- ArrayList serverFactoryIds = new ArrayList();
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- Set runtimes = getRuntimes(desc.getRequiredFacetVersions());
- IServerType[] allServerTypes = ServerCore.getServerTypes();
- //TODO iterate over all the server types and see if their runtime types have an
- //id that matches the runtime type of any of the runtimes.
- }
-
- //return (String[])serverFactoryIds.toArray(new String[]{});
- //Temporarily return all server types
- return getAllServerFactoryIdsWithRuntimes();
- }
-
- public static String[] getServerFactoryIdsByClientType(String clientImplId)
- {
- ArrayList serverFactoryIds = new ArrayList();
- String[] crts = getClientRuntimesByType(clientImplId);
- if (crts != null)
- {
- for (int i = 0; i < crts.length; i++)
- {
- //Get the runtimes that work for the facets required for this service runtime
- String[] fIds = getServerFactoryIdsByClientRuntime(crts[i]);
- for (int j=0; j<fIds.length; j++)
- {
- if (!serverFactoryIds.contains(fIds[j]))
- {
- serverFactoryIds.add(fIds[j]);
- }
- }
- }
- }
-
- return (String[])serverFactoryIds.toArray(new String[]{});
- }
-
- /*
- *
- */
- public static boolean isServerSupportedForChosenClientType(String clientImplId, String serverFactoryId)
- {
- String[] fIds = getServerFactoryIdsByClientType(clientImplId);
- if (fIds == null)
- {
- return false;
- }
-
- for (int i=0;i<fIds.length;i++)
- {
- if (serverFactoryId.equals(fIds[i]))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /*
- * @prarm clientRuntimeId : id of a ClientRuntimeDescriptor
- *
- */
- public static String[] getServerFactoryIdsByClientRuntime(String clientRuntimeId)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimeId);
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-
- String[] fIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- return fIds;
- }
-
- /*
- * @param clientRuntimeId id of a ClientRuntimeDescriptor
- */
- public static boolean doesClientRuntimeSupportServer(String clientRuntimeId, String serverFactoryId)
- {
- String[] serverIds = getServerFactoryIdsByClientRuntime(clientRuntimeId);
- for (int i=0; i<serverIds.length; i++)
- {
- if (serverIds[i].equals(serverFactoryId))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /*
- * @param runtimeId : id of a RuntimeDescriptor
- * @param factoryId : id of a server type
- */
- public static boolean doesRuntimeSupportServerForClientSide(String runtimeId, String factoryId)
- {
- //Get all the ClientRuntimeDescriptors that point to this runtimeId
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- //check if this client runtime points to runtimeId
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
- String[] fIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- for (int i=0; i<fIds.length; i++)
- {
- if (fIds[i].equals(factoryId))
- {
- return true;
- }
- }
- }
- }
-
- //No match.
- return false;
- }
-
- /*
- * @param runtimeId: id of a RuntimeDescriptor
- * @return: server factory id
- */
- public static String getFirstSupportedServerForClientSide(String runtimeId)
- {
- //Get all the ClientRuntimeDescriptors that point to this runtimeId
- Iterator iter = registry.clientRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)iter.next();
- //check if this service runtime points to runtimeId
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
- String[] factoryIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
- if (factoryIds!=null && factoryIds.length >0)
- {
- return factoryIds[0];
- }
- }
- }
-
- //No suitable servers found. Return null.
- return null;
-
- }
-
- /*
- * @param clientImplId is the id of a WebServiceClientImpl
- * @param runtimeId is the id of a RuntimeDescriptor
- * @param serverFactoryId server factory id
- */
- public static boolean isServerClientRuntimeTypeSupported(String serverFactoryId, String runtimeId, String clientImplId)
- {
- //Ensure there is at least one client runtime that supports the given type
- String[] clientRuntimes = getClientRuntimesByType(clientImplId);
- if (clientRuntimes!=null && clientRuntimes.length>0)
- {
- //Ensure that at least one of these server runtimes supports the given server
- for (int i=0; i<clientRuntimes.length; i++)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimes[i]);
- if (desc.getRuntime().getId().equals(runtimeId))
- {
- //Matched type and runtime. Check the server.
- String[] factoryIds = getServerFactoryIdsByClientRuntime(desc.getId());
- for (int j=0; j<factoryIds.length; j++)
- {
- if (factoryIds[j].equals(serverFactoryId))
- {
- return true;
- }
- }
- }
- }
- }
-
- //No match found. return false.
- return false;
- }
-
- /*
- * Returns a list of valid faceted project template ids
- * @param clientImplId id of a WebServiceClientImpl
- * @param runtimeId id of a RuntimeDescriptor
- *
- * @return String[] array of IFacetedProjectTemplate ids
- */
- public static String[] getClientProjectTemplates(String clientImplId, String runtimeId)
- {
- String[] crIds = getClientRuntimesByType(clientImplId);
- if (crIds == null)
- {
- return null;
- }
-
- ArrayList templateIdList = new ArrayList();
- for (int i = 0; i < crIds.length; i++)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(crIds[i]);
- String thisRuntimeId = desc.getRuntime().getId();
- if (thisRuntimeId.equals(runtimeId))
- {
- //Get the templates for this client runtime
- Set templateIds = FacetUtils.getTemplates(desc.getRequiredFacetVersions());
-
- //Add the template ids to the list if they have not already been added
- Iterator itr = templateIds.iterator();
- while (itr.hasNext())
- {
- IFacetedProjectTemplate template = (IFacetedProjectTemplate)itr.next();
- if (!templateIdList.contains(template.getId()))
- {
- templateIdList.add(template.getId());
- }
- }
- }
-
- }
-
- return (String[])templateIdList.toArray(new String[]{});
- }
-
- public static boolean doesClientTypeAndRuntimeSupportTemplate(String clientImplId, String runtimeId, String templateId)
- {
- String[] templateIds = getClientProjectTemplates(clientImplId, runtimeId);
- if (templateIds!=null)
- {
- for (int i=0; i<templateIds.length; i++)
- {
- if (templateIds[i].equals(templateId))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- public static boolean doesClientRuntimeSupportTemplate(String clientRuntimeId, String templateId)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimeId);
- //Get the templates for this client runtime
- Set templates = FacetUtils.getTemplates(desc.getRequiredFacetVersions());
- IFacetedProjectTemplate checkingTemplate = ProjectFacetsManager.getTemplate(templateId);
- return templates.contains(checkingTemplate);
- }
-
-
- public static LabelsAndIds getClientTypeLabels()
- {
-
- LabelsAndIds labelIds = new LabelsAndIds();
- String[] idsArray = new String[0];
- String[] labelsArray = new String[0];
- labelIds.setIds_(idsArray);
- labelIds.setLabels_(labelsArray);
-
- ArrayList ids = new ArrayList();
- ArrayList labels = new ArrayList();
-
- Iterator itr = registry.clientRuntimes_.values().iterator();
- while(itr.hasNext())
- {
- ClientRuntimeDescriptor desc = (ClientRuntimeDescriptor)itr.next();
- WebServiceClientImpl thisClientImpl = desc.getClientImplementationType();
- if (!ids.contains(thisClientImpl.getId()))
- {
- ids.add(thisClientImpl.getId());
- labels.add(thisClientImpl.getLabel());
- }
- }
-
- if (ids.size() > 0)
- {
- idsArray = (String[]) ids.toArray(new String[0]);
- labelsArray = (String[]) labels.toArray(new String[0]);
- labelIds.setIds_(idsArray);
- labelIds.setLabels_(labelsArray);
- }
-
- return labelIds;
-
- }
-
- public static String[] getAllServerFactoryIdsWithRuntimes()
- {
- ArrayList fids = new ArrayList();
- IServerType[] sts = ServerCore.getServerTypes();
- org.eclipse.wst.server.core.IRuntime[] rts = ServerCore.getRuntimes();
-
- for (int i=0; i<sts.length; i++)
- {
- IServerType st = sts[i];
- for (int j=0; j<rts.length; j++)
- {
- org.eclipse.wst.server.core.IRuntime rt = rts[j];
- // If the server type has the same runtime type as this runtime, add it to the list
- String serverTypeRuntimeTypeId = st.getRuntimeType().getId();
- String runtimeRuntimeTypeId = rt.getRuntimeType().getId();
- if (serverTypeRuntimeTypeId.equals(runtimeRuntimeTypeId))
- {
- if (!fids.contains(st.getId()))
- {
- fids.add(st.getId());
- }
- }
- }
- }
-
- return (String[])fids.toArray(new String[0]);
- }
-
- public static String[] getProjectsForClientTypeAndRuntime(String typeId, String runtimeId)
- {
- String[] descs = getClientRuntimesByType(typeId);
- IProject[] projects = FacetUtils.getAllProjects();
- ArrayList validProjects = new ArrayList();
-
- for (int i=0; i<projects.length;i++)
- {
- //check if this projects suits any of the client runtimes
- for (int j=0; j<descs.length; j++)
- {
- ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(descs[j]);
- RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(projects[i]);
- if (fproject != null)
- {
- Set facetVersions = fproject.getProjectFacets();
- FacetMatcher fm = FacetUtils.match(rfvs, facetVersions);
- if (fm.isMatch())
- {
- validProjects.add(projects[i].getName());
- break;
- }
- }
- else
- {
- //TODO Handle the plain-old Java projects
- }
- } catch (CoreException ce)
- {
-
- }
- }
- }
-
- return (String[])validProjects.toArray(new String[0]);
-
- }
-
- public static boolean doesClientRuntimeSupportProject(String clientRuntimeId, String projectName)
- {
- IProject project = ProjectUtilities.getProject(projectName);
- if (project==null || !project.exists())
- return false;
-
- ClientRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId);
- RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions();
-
- try
- {
- IFacetedProject fproject = ProjectFacetsManager.create(project);
- if (fproject != null)
- {
- Set facetVersions = fproject.getProjectFacets();
- FacetMatcher fm = FacetUtils.match(rfvs, facetVersions);
- if (fm.isMatch())
- {
- return true;
- }
- }
- else
- {
- //TODO Handle the plain-old Java projects
- }
- } catch (CoreException ce)
- {
-
- }
-
- return false;
- }
-
- //Utilities used by the ServerRuntimePreferencePage
-
- private static SelectionListChoices serverToRuntimeToJ2EE_;
- private static Hashtable serverFactoryIdByLabel_;
- private static Hashtable runtimeIdByLabel_;
-
- public static SelectionListChoices getServerToRuntimeToJ2EE()
- {
- if (serverToRuntimeToJ2EE_!=null)
- {
- return serverToRuntimeToJ2EE_;
- }
-
- //String[] servers = getStringArrayIntersection(getAllServerFactoryIds(), WebServiceClientTypeRegistry.getInstance().getAllClientServerFactoryIds());
- String[] servers = getAllServerFactoryIds();
- SelectionList serversList = new SelectionList(servers, 0);
- Vector choices = new Vector();
- for (int i=0; i<servers.length; i++)
- {
- choices.add(getRuntimeChoices(servers[i]));
- }
- serverToRuntimeToJ2EE_ = new SelectionListChoices(serversList, choices);
- return serverToRuntimeToJ2EE_;
-
- }
-
- private static SelectionListChoices getRuntimeChoices(String serverFactoryId)
- {
- //Return all the runtimes for now.
- Set runtimes = registry.runtimes_.keySet();
- Iterator itr = registry.runtimes_.keySet().iterator();
- String[] runtimeIds = new String[runtimes.size()];
- //TODO String[] runtimeIds = getRuntimeIDsByServerFactoryID(serverFactoryId);
- int i = 0;
- while (itr.hasNext())
- {
- String runtimeId = (String)itr.next();
- runtimeIds[i] = runtimeId;
- i++;
-
- }
-
- SelectionList runtimesList = new SelectionList(runtimeIds, 0);
- Vector choices = new Vector();
- for (int j=0; j<runtimeIds.length; j++)
- {
- choices.add(getJ2EEChoices(runtimeIds[j]));
- }
- return new SelectionListChoices(runtimesList, choices);
- }
-
- private static SelectionListChoices getJ2EEChoices(String runtimeId)
- {
- //J2EE levels will be removed from the Server Runtime preference page.
- //Return some hard coded values for now.
- String[] j2eeVersions = new String[]{"13", "14"};
- SelectionList j2eeVersionsList = new SelectionList(j2eeVersions, 0);
- return new SelectionListChoices(j2eeVersionsList, null);
- }
-
- private static String[] getAllServerFactoryIds()
- {
- //Return all server type ids for now.
- //TODO Only the servers that are appropriate for the Web service runtimes should be displayed.
- ArrayList ids = new ArrayList();
- if (serverFactoryIdByLabel_ == null)
- {
- serverFactoryIdByLabel_ = new Hashtable();
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (int i=0; i<serverTypes.length; i++)
- {
- String id = serverTypes[i].getId();
- String label = getServerLabelById(id);
- serverFactoryIdByLabel_.put(label, id);
- ids.add(id);
- }
- }
- else
- {
- Iterator fids = serverFactoryIdByLabel_.values().iterator();
- while (fids.hasNext())
- {
- String fid = (String)fids.next();
- ids.add(fid);
- }
- }
-
- if (ids.size() > 0)
- {
- String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
- return serverFactoryIds;
- }
-
- return null;
- }
-
- //TODO this needs to be implemented once facet runtime to server runtime bridge is available.
- /*
- private static String[] getRuntimeIDsByServerFactoryID(String serverFactoryID)
- {
- ArrayList ids = new ArrayList();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- if (doesRuntimeSupportServer(wsr.getId(), serverFactoryID))
- {
- ids.add(wsr.getId());
- }
-
- }
-
- if (ids.size() > 0)
- {
- String[] runtimeIds = (String[])ids.toArray(new String[0]);
- return runtimeIds;
- }
-
- return null;
-
-
- }
- */
-
- public static String getServerFactoryId(String label)
- {
- if (label==null || label.length()==0)
- return null;
-
- if (serverFactoryIdByLabel_ == null)
- {
- getAllServerFactoryIds();
- }
-
- if (serverFactoryIdByLabel_.containsKey(label))
- {
- return (String)serverFactoryIdByLabel_.get(label);
- }
- else
- {
- return null;
- }
- }
-
- public static String getRuntimeId(String label)
- {
-
- if (label==null || label.length()==0)
- return null;
-
- if (runtimeIdByLabel_ == null)
- {
- runtimeIdByLabel_ = new Hashtable();
- Iterator iter = registry.runtimes_.values().iterator();
- while (iter.hasNext())
- {
- RuntimeDescriptor desc = (RuntimeDescriptor)iter.next();
- runtimeIdByLabel_.put(desc.getLabel(), desc.getId());
- }
- }
-
- return (String)runtimeIdByLabel_.get(label);
- }
-
-
- private static Set getRuntimes(Set facets)
- {
- //Return all the runtimes in the dummy implementation
- //return RuntimeManager.getRuntimes();
- return RuntimeManager.getRuntimes(facets);
- }
-
- private static Set getRuntimes(RequiredFacetVersion[] requiredFacetVersions)
- {
- return FacetUtils.getRuntimes(requiredFacetVersions);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
deleted file mode 100644
index a69832c3d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
+++ /dev/null
@@ -1,208 +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.ui.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-
-
-public class WebServiceRuntimeInfo {
-
- private IConfigurationElement elem_;
- private Hashtable allServiceTypes_;
- private Hashtable allClientTypes_;
-
- private String id;
- private String label;
- private ServiceType[] serviceTypes;
- private ClientType[] clientTypes;
- private java.lang.String[] servletLevels;
- private java.lang.String[] j2eeLevels;
- private java.lang.String[] runtimeIds;
- private java.lang.String[] serverFactoryIds;
- private String className;
- private IWebServiceRuntime webServiceRuntime_;
-
- public WebServiceRuntimeInfo(IConfigurationElement elem_, Hashtable allServiceTypes_, Hashtable allClientTypes_)
- {
- super();
- this.elem_ = elem_;
- this.allServiceTypes_ = allServiceTypes_;
- this.allClientTypes_ = allClientTypes_;
- }
-
- public String getClassName()
- {
- if (className==null)
- {
- className=elem_.getAttribute("class");
- }
- return className;
- }
-
-
- public ClientType[] getClientTypes()
- {
- if (clientTypes==null)
- {
- String attr = elem_.getAttribute("clientTypes");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- clientTypes = new ClientType[size];
- for (int i = 0; i < clientTypes.length; i++)
- {
- String ctid = st.nextToken();
- clientTypes[i] = (ClientType)allClientTypes_.get(ctid);
- }
- }
- }
- return clientTypes;
- }
-
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
- public String getLabel()
- {
- if (label==null)
- {
- label = elem_.getAttribute("label");
- }
- return label;
- }
-
-
- public java.lang.String[] getJ2eeLevels()
- {
- if (j2eeLevels == null)
- {
- String attr = elem_.getAttribute("j2eeLevels");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- j2eeLevels = new String[size];
- for (int i = 0; i < j2eeLevels.length; i++)
- j2eeLevels[i] = st.nextToken();
- }
- }
-
- return j2eeLevels;
- }
-
-
- public java.lang.String[] getRuntimeIds()
- {
- if (runtimeIds == null)
- {
- String attr = elem_.getAttribute("runtimes");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- runtimeIds = new String[size];
- for (int i = 0; i < runtimeIds.length; i++)
- runtimeIds[i] = st.nextToken();
- }
- }
-
- return runtimeIds;
- }
-
-
- public java.lang.String[] getServerFactoryIds()
- {
- if (serverFactoryIds == null)
- {
- String attr = elem_.getAttribute("servers");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- serverFactoryIds = new String[size];
- for (int i = 0; i < serverFactoryIds.length; i++)
- serverFactoryIds[i] = st.nextToken();
- }
- }
- return serverFactoryIds;
- }
-
-
- public ServiceType[] getServiceTypes()
- {
- if (serviceTypes==null)
- {
- String attr = elem_.getAttribute("serviceTypes");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- serviceTypes = new ServiceType[size];
- for (int i = 0; i < serviceTypes.length; i++)
- {
- String ctid = st.nextToken();
- serviceTypes[i] = (ServiceType)allServiceTypes_.get(ctid);
- }
- }
- }
- return serviceTypes;
- }
-
-
- public java.lang.String[] getServletLevels()
- {
- if (servletLevels==null)
- {
- String attr = elem_.getAttribute("servletLevels");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- servletLevels = new String[size];
- for (int i = 0; i < servletLevels.length; i++)
- servletLevels[i] = st.nextToken();
- }
- }
- return servletLevels;
- }
-
- public IWebServiceRuntime getWebServiceRuntime()
- {
- if (webServiceRuntime_ == null)
- {
- try
- {
- webServiceRuntime_ = (IWebServiceRuntime)elem_.createExecutableExtension("class");
- }
- catch(CoreException ce)
- {
- ce.printStackTrace();
- }
- }
-
- return webServiceRuntime_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/.classpath b/bundles/org.eclipse.jst.ws.consumption/.classpath
deleted file mode 100644
index 7c69b4f1a..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"/>
- <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 0a24de61b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-webserviceutils.jar
-wsc.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption/.project b/bundles/org.eclipse.jst.ws.consumption/.project
deleted file mode 100644
index 2a89cfa56..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.project
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.consumption</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.wst.wsdl</project>
- </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/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
deleted file mode 100644
index 228c2500d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,61 +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.0
-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.consumption,
- org.eclipse.jst.ws.internal.consumption.codegen,
- org.eclipse.jst.ws.internal.consumption.codegen.bean,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors,
- org.eclipse.jst.ws.internal.consumption.command.common,
- org.eclipse.jst.ws.internal.consumption.common,
- org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel,
- org.eclipse.jst.ws.internal.consumption.datamodel.validate,
- org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel,
- org.eclipse.jst.ws.internal.consumption.fragments,
- org.eclipse.jst.ws.internal.consumption.plugin,
- org.eclipse.jst.ws.internal.consumption.sampleapp.codegen,
- org.eclipse.jst.ws.internal.consumption.sampleapp.command,
- org.eclipse.jst.ws.internal.consumption.sampleapp.common,
- org.eclipse.jst.ws.internal.consumption.wsfinder,
- org.eclipse.jst.ws.util
-Require-Bundle: org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.xsd,
- org.eclipse.debug.core,
- org.eclipse.jst.ws,
- org.eclipse.jdt.launching,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.jem.workbench,
- org.eclipse.jface,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.parser,
- org.eclipse.wst.server.core,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.internet.monitor.core,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.wsdl4j,
- org.eclipse.jem.util,
- org.eclipse.ui,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.server.core
-Eclipse-AutoStart: true
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 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html> \ No newline at end of file
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 c47ab5729..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-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
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 f484e2606..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.properties
+++ /dev/null
@@ -1,19 +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 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 e3da89c64..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension-point
- id="wsfinder"
- name="%XP_WSFINDER"/>
-
- <!-- The following extension point will be removed. -->
- <extension-point
- id="webServiceStartServerType"
- name="%XP_WEB_SERVICE_START_SERVER_TYPE"/>
-
- <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/consumption/plugin.properties b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties
deleted file mode 100644
index adccc08e0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties
+++ /dev/null
@@ -1,183 +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
-###############################################################################
-
-#
-# 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:
-MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES=IWAB0187W The Sample JSP client does not support Indexed properties.
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS=IWAB0237W The Sample JSP client does not support arrays:
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS=IWAB0124W The Sample JSP client does not support input parameters that are not beans:
-MSG_ERROR_JTS_CYCLIC_BEAN=IWAB0188E The Sample JSP client does not support beans containing attributes that reference the beans.
-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_JTS_JSP_GEN=Error in generating sample JSP
-
-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".
-
-FOLDER_FILTER_NAME=Folders
-FOLDER_FILTER_DESC=Folders.
-
-
-#
-# Common messages
-#
-
-
-MSG_ERROR_PROJECT_NOT_FOUND=IWAB0069E Web project was not found.
-MSG_ERROR_INSTANCE_NOT_FOUND=IWAB0070E Server was not found.
-
-PROGRESS_INFO_PUBLISH_WEB_PROJECT=IWAB0072I Publishing Web project.
-
-#
-# 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_WARN_NO_DB_DRIVER=IWAB0221W Unable to locate db2java.zip, please ensure db2java.zip is added to the server class path.
-
-MSG_ERROR_BAD_SERVER_CONFIG=IWAB0534E Unable to add EAR project to Server Configuration.
-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 > Installed Runtimes to install a non-stub runtime.
-
-
-
-#
-# EJB messages
-#
-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}.
-
-#
-# WebServiceMappingPage Messages
-#
-
-#
-# 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.
-TASK_LABEL_WEBSERVICE_BUILD_PROJECT=Build project.
-TASK_DESC_WEBSERVICE_BUILD_PROJECT=Building project.
-
-#
-# MISC
-#
-TASK_DESC_CREATE_WEB_PROJECT=Create Web Project
-TASK_LABEL_CREATE_WEB_PROJECT=Create Web Project
-MSG_ERROR_WEB_PROJECT_CREATE=IWAB0310E An error occurred during creation of the Web Project.
-MSG_ERROR_SERVER_VIEW_OPEN=IWAB0126E The server configuration editor is open for {0}. Close it and restart the wizard.
-
-#
-# Default Proxy project messages
-#
-
-
-#
-# 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.
-
-#
-# 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_WEB_COMPONENT=An error occured during creation of Web component {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_CREATE_EAR_COMPONENT=An error occured during creation of EAR 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}.
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 a260ac085..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
+++ /dev/null
@@ -1,235 +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;
-
-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[] BAD_SYMBOLS = {'-', ' '}; // symbols that can appear in the folder name but it is not allowed in a java bean name
- private static final char UNDERSCORE = '_'; // replace the above ones by underscore
- public String getSessionBeanId()
- {
- String name = getClientFolderPath();
- int index = name.lastIndexOf("/");
- index++;
- String newName = name.substring(index);
- for ( int i = 0; i < BAD_SYMBOLS.length; i++ ) {
- newName = newName.replace ( BAD_SYMBOLS[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 fac00ac9b..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, 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;
-
-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 c68cdadb0..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, 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;
-
-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 9a3d6537f..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, 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;
-
-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 a01a64112..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, 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 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 5a9ad690a..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, 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 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 d167c8951..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
+++ /dev/null
@@ -1,89 +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.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.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("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("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("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 53f249b34..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.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.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.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("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("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("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("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 680c07964..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, 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.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 d0fb8827f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java
+++ /dev/null
@@ -1,144 +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.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.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.MessageUtils;
-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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private MessageUtils msgUtils_;
-
- /*
- *Constructor
- **/
- public JavaMofAttributeVisitorAction(Element parentElement, String project, IEnvironment env)
- {
- super(parentElement,project, env);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * Create a type element from the JavaHelper
- * @param JavaParameter the mof element to be used to create the attribute
- **/
-
-
- //bean info code
-
-
- 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( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)pd.getPropertyType()).getJavaName() );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%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( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES") + getMethod.getName() );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%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( msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), e);
- try {
- env_.getStatusHandler().report(status);
- } catch (StatusException e1) {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("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 4f5c48a38..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
+++ /dev/null
@@ -1,436 +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.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.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.MessageUtils;
-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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private MessageUtils msgUtils_;
- protected IEnvironment env_;
- // protected BeanElement fBeanElement;
-
- 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;
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- 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;
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- 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;
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- 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', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
- Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("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( msgUtils_.getMessage("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( msgUtils_.getMessage("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( msgUtils_.getMessage("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( msgUtils_.getMessage("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( msgUtils_.getMessage("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( msgUtils_.getMessage("MSG_WARN_JTS_PROXY_METHODS_OMITTED") );
- return status;
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%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( msgUtils_.getMessage("MSG_ERROR_JTS_PROXY_HAS_NO_METHODS") );
- //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%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){
- //then we have no default constructor
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT") );
- //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT" ),null));
- return false;
- }
- }
- }
- return true;
-
- }
-
- /**
- * 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 85b388e1d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
+++ /dev/null
@@ -1,113 +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.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.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.MessageUtils;
-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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private MessageUtils msgUtils_;
-
-
- /*
- *Constructor
- **/
- public JavaMofFieldVisitorAction(Element parentElement, String project, IEnvironment env)
- {
- super(parentElement,project, env);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * Create a type element from the JavaHelper
- * @param JavaParameter the mof element to be used to create the attribute
- **/
-
-
- //bean info code
-
-
- 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( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)field.getJavaClass()).getJavaName() );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%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( msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), e);
- try {
- env_.getStatusHandler().report(status);
- }
- catch (StatusException e1)
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("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 d84066201..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
+++ /dev/null
@@ -1,224 +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.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.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.MessageUtils;
-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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private MessageUtils msgUtils_;
- 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);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- 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( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS") + fUnsupportedParameterName );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS" ) + fUnsupportedParameterName,null));
- fMethodsOmitted.addElement(method.getMethodElementSignature());
- return status;
- }
- if(!nullConstructor(method)){
- status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS") + fUnsupportedParameterName );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%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 7ed5d51ad..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
+++ /dev/null
@@ -1,85 +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.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.MessageUtils;
-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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private MessageUtils msgUtils_;
-
- /*
- *Constructor
- **/
- public JavaMofParameterVisitorAction(Element parentElement,String project, IEnvironment env)
- {
- super(parentElement,project, env);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * 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', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
- Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("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( msgUtils_.getMessage("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 0133f4e0e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
+++ /dev/null
@@ -1,120 +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.javamofvisitoractions;
-
-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.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.TypeFactory;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private MessageUtils msgUtils_;
-
- /*
- *Constructor
- **/
- public JavaMofTypeVisitorAction(Element parentElement,String project, IEnvironment env)
- {
- super(parentElement,project, env);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * 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', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
- Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("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( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)typeNavigator).getJavaName() );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%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{
- 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( msgUtils_.getMessage("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/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 29948826b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
+++ /dev/null
@@ -1,95 +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.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.wst.command.internal.env.core.common.MessageUtils;
-
-
-
-
-
-/**
-* 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;
- private MessageUtils msgUtils_;
-
- public VisitorActionImpl( Vector messages, Vector beansVisited)
- {
- this.messages = messages;
- this.beansVisited = beansVisited;
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
- }
-
- 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(msgUtils_.getMessage(key));
- }
-
- protected void addMessage ( String key, Object[] args )
- {
- getMessages().add(msgUtils_.getMessage(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 6d2d6a044..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, 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.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 2b571f830..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, 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.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 f693dfab0..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, 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.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 3e37c717a..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, 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.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 00a232585..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java
+++ /dev/null
@@ -1,113 +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.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.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private MessageUtils msgUtils_;
- private IEnvironment env_;
-
- /*
- * Constructor
- **/
- public JavaMofParameterVisitor(IEnvironment env)
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- 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', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
- Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("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( msgUtils_.getMessage("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( msgUtils_.getMessage("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 db1f25571..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, 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.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 c90a3781c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
+++ /dev/null
@@ -1,141 +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.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.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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_;
-private MessageUtils msgUtils_;
-
-public AbstractStartServer()
-{
- log_ = EnvironmentService.getEclipseLog();
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-}
-
-/**
- * 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,msgUtils_.getMessage("MSG_ERROR_SERVER"),e));
- }
-}
-
-protected void publishProject(IServer server) throws CoreException
-{
- monitor.subTask( msgUtils_.getMessage( "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( msgUtils_.getMessage( "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,msgUtils_.getMessage("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 076da3c8d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
+++ /dev/null
@@ -1,120 +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.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.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 MessageUtils msgUtils_;
-
- private String serverInstanceId;
- private String project;
- private String module;
-
- public AddModuleToServerCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- 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( msgUtils_.getMessage("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);
- 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( msgUtils_.getMessage("MSG_ERROR_ADD_MODULE", new String[]{module}) );
- env.getStatusHandler().reportError(status);
- return status;
- } finally
- {
- try
- {
- if (serverwc != null)
- {
- serverwc.save(true, null);
- }
- } catch (CoreException ce)
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_ADD_MODULE", new String[] { module }) );
- 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 f8f5af4ef..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
+++ /dev/null
@@ -1,90 +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.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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_;
-
- private MessageUtils msgUtils_;
-
- public AssociateModuleWithEARCommand(){
- msgUtils_ = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
- }
-
- 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( msgUtils_.getMessage("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 90c6ff9b3..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, 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.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 3b6e24320..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
+++ /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
- *******************************************************************************/
-
-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.wst.command.internal.env.core.common.MessageUtils;
-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_;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public CheckProjectOKCommand() {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
- }
-
- 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 = msgUtils_.getMessage("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 329a3e5d9..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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;
- }
-} \ No newline at end of file
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 3ec7683e8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
+++ /dev/null
@@ -1,330 +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.command.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-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.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.consumption.plugin.WebServiceConsumptionPlugin;
-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.common.uriresolver.internal.util.URIEncoder;
-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();
-
- try
- {
- ignoreList = new Vector();
- if (def == null)
- def = webServicesParser.getWSDLDefinition(wsdlURI);
- copyWSDL(env, wsdlURI, getBaseURI(destinationURI), getLocalname(destinationURI), def);
- return Status.OK_STATUS;
- }
- catch (Throwable t)
- {
- t.printStackTrace();
- IStatus status = StatusUtils.errorStatus( WebServiceConsumptionPlugin.getMessage("MSG_ERROR_COPY_WSDL", new String[]{wsdlURI, destinationURI}), t);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- 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
- {
- if (!needToCopy(uri)) {
- return;
- }
-
- 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
- {
- if (!needToCopy(uri)) {
- return;
- }
-
- // 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 uri) {
- String normalizedURI = normalize(uri);
- if (ignoreList.contains(normalizedURI))
- return false;
- ignoreList.add(normalizedURI);
- return true;
- }
-
- 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;
- }
- }
-
- 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/CreateEARProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java
deleted file mode 100644
index df296231d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java
+++ /dev/null
@@ -1,109 +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.command.common;
-
-import org.eclipse.core.commands.ExecutionException;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public class CreateEARProjectCommand extends AbstractDataModelOperation
-{
- private String earProjectName_;
- private String serverFactoryId_;
- private String j2eeVersion_;
-
- /**
- * Constructor
- */
- public CreateEARProjectCommand()
- {
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-
- try
- {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName_);
- if (project != null && !project.exists())
- {
- IDataModel info = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
- info.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME, project.getName());
-
- //Set the J2EE version
- if (j2eeVersion_ != null && j2eeVersion_.length()>0)
- {
- info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(j2eeVersion_));
- }
- else
- {
- info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
- }
-
- //Set the server target
- if (serverFactoryId_!=null && serverFactoryId_.length()>0)
- {
-// TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-// String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_, IServerTargetConstants.EAR_TYPE, finalJ2EEVersion);
-// info.setProperty(EARComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-// info.setProperty(EARComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
- }
-
- //Create the EAR
- IDataModelOperation operation = info.getDefaultOperation();
- operation.execute(new NullProgressMonitor(), null);
- }
- }
- catch (ExecutionException ite)
- {
- IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_CANNOT_CREATE_EAR_PROJECT", new String[] {earProjectName_}), ite);
- env.getStatusHandler().reportError(status);
- return status;
- }
- return Status.OK_STATUS;
- }
- /**
- * @param earProjectName_ The earProjectName_ to set.
- */
- public void setEarProjectName(String earProjectName)
- {
- this.earProjectName_ = earProjectName;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- serverFactoryId_ = serverFactoryId;
- }
-
- public void setJ2EEVersion(String j2eeVersion)
- {
- j2eeVersion_ = j2eeVersion;
- }
-}
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 da908bd78..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
+++ /dev/null
@@ -1,250 +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 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.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.consumption.common.FacetMatcher;
-import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.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.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
-{
-
- private String projectName;
- private String templateId;
- private RequiredFacetVersion[] requiredFacetVersions;
- //private FacetMatcher facetMatcher;
- private String serverFactoryId;
- private String serverInstanceId;
-
- private org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime;
-
- private MessageUtils msgUtils;
- private IEnvironment env;
- private IProgressMonitor monitor_;
-
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info)
- {
- monitor_ = monitor;
- this.env = getEnvironment();
- 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
- {
- IFacetedProject fproject = ProjectFacetsManager.create(projectName, null, monitor_);
-
- //Decide which facets to install based on the templateId and the selected server.
- Set facetsToAdd = getFacetsToAdd();
-
- //Set up the install actions.
- Set actions = FacetUtils.getInstallActions(facetsToAdd);
- /*
- IProjectFacetVersion webFacet24 = ProjectFacetsManager.getProjectFacet("jst.web").getVersion("2.4");
- IProjectFacetVersion javaFacet14 = ProjectFacetsManager.getProjectFacet("jst.java").getVersion("1.4");
- Set facetsToAdd = new HashSet();
- facetsToAdd.add(webFacet24);
- facetsToAdd.add(javaFacet14);
- actions = FacetUtils.getInstallActions(facetsToAdd);
- */
- fproject.modify(actions, monitor_);
-
- Set newFacetVersions = fproject.getProjectFacets();
- Set fixedFacets = new HashSet();
- for (Iterator iter = newFacetVersions.iterator(); iter.hasNext();) {
- IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
- fixedFacets.add(facetVersion.getProjectFacet());
- }
- fproject.setFixedProjectFacets(fixedFacets);
-
-
- //Set the runtime
- if (facetRuntime != null)
- {
- fproject.setRuntime(facetRuntime, monitor);
- }
-
-
- } catch (CoreException ce)
- {
- System.out.println("Exception occurred when creating a faceted project.");
- return StatusUtils.errorStatus(msgUtils.getMessage("MSG_ERROR_PROJECT_CREATION", new String[] { projectName }));
- }
- }
- else
- {
- //TODO Just add the facets you need.
- }
- return status;
- }
-
- private IStatus checkDataReady()
- {
-
- if (projectName == null || serverFactoryId == null)
- {
- return StatusUtils.errorStatus(msgUtils
- .getMessage("MSG_ERROR_PROJECT_CREATION", new String[] {projectName}));
- }
-
- return Status.OK_STATUS;
- }
-
- /*
- * @return Set Returns the Set of facets to add to the new project,
- * choosing the highest level of each facet that works on the selected server.
- */
- private Set getFacetsToAdd()
- {
- Set facets = new HashSet();
-
- //Set the facet runtime.
- setFacetRuntime();
- if (facetRuntime != null)
- {
- IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
- Set templateFacets = template.getFixedProjectFacets();
- Iterator templateFacetsItr = templateFacets.iterator();
- while (templateFacetsItr.hasNext())
- {
- IProjectFacet fixedFacet = (IProjectFacet)templateFacetsItr.next();
- //IProjectFacetVersion[] versions = FacetUtils.getOrderedVersions(fixedFacet);
- List versions = fixedFacet.getSortedVersions(false);
- Iterator versionsItr = versions.iterator();
- while(versionsItr.hasNext())
- //for (int i=0; i<versions.length; i++)
- {
- IProjectFacetVersion pfv = (IProjectFacetVersion)versionsItr.next();
- Set pfvs = new HashSet();
- pfvs.add(pfv);
-
- //Check against RequiredFacetVersions
- FacetMatcher fm = FacetUtils.match(requiredFacetVersions, pfvs);
- if (fm.isMatch())
- {
- //Check against Runtime
- if (FacetUtils.doesRuntimeSupportFacets(facetRuntime, pfvs))
- {
- //We have a match. Add this one to the master set.
- facets.add(pfv);
- break;
- }
- }
- }
- }
- }
- else
- {
- facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId);
- }
-
-
- return facets;
- }
-
- private void setFacetRuntime()
- {
-
- if (serverInstanceId != null && serverInstanceId.length()>0)
- {
- IServer server = ServerCore.findServer(serverInstanceId);
- IRuntime sRuntime = server.getRuntime();
- facetRuntime = FacetUtil.getRuntime(sRuntime);
- }
- else
- {
- 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.isStub() && sRuntime.getRuntimeType().getId().equals(runtimeTypeId))
- {
- facetRuntime = FacetUtil.getRuntime(sRuntime);
- }
- }
- }
- }
-
- /*
- public void setFacetMatcher(FacetMatcher facetMatcher)
- {
- this.facetMatcher = facetMatcher;
- }
- */
-
- 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 dbf1ee930..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
+++ /dev/null
@@ -1,81 +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.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.plugin.WebServiceConsumptionPlugin;
-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( WebServiceConsumptionPlugin.getMessage("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/CreateModuleCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
deleted file mode 100644
index a4e667bbf..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
+++ /dev/null
@@ -1,339 +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.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IAppClientComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CreateModuleCommand extends AbstractDataModelOperation
-{
-
- public final static int WEB = J2EEUtils.WEB;
- public final static int EJB = J2EEUtils.EJB;
- public final static int APPCLIENT = J2EEUtils.APPCLIENT;
- public final static int EAR = J2EEUtils.EAR;
-
- private String projectName;
- private String moduleName; // may be null for non-flexible project
- private int moduleType;;
- private String j2eeLevel;
- private String serverFactoryId;
- private String serverInstanceId_;
- private IEnvironment env;
- private IProgressMonitor monitor_;
-
- private MessageUtils msgUtils;
-
- public CreateModuleCommand(){
- msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- monitor_ = monitor;
- this.env = getEnvironment();
- IStatus status = Status.OK_STATUS;
-
- // check if data ready
- status = checkDataReady();
- if (status.getSeverity()==Status.ERROR){
- return status;
- }
-
- // check if flexible project exists
- IProject project = ProjectUtilities.getProject(projectName);
- if (project==null || !project.exists()){
- status = createFlexibleJavaProject();
- if (status.getSeverity()==Status.ERROR){
- return status;
- }
- }
-
- // check if project and/or component exists
- if (projectName!=null) {
- if (moduleName==null){
- if (project.exists())
- return status;
- }
- else {
- if (J2EEUtils.exists(projectName, moduleName))
- return status;
- }
- }
- else {
- return StatusUtils.errorStatus(msgUtils.getMessage("MSG_ERROR_COMPONENT_CREATION", new String[]{projectName, moduleName}) );
- }
-
- // create the component according to the component type specified
- int type = getModuleType();
- switch (type) {
- case WEB:
- status = createWebComponent();
- break;
- case EJB:
- status = createEJBComponent();
- break;
- case APPCLIENT:
- status = createAppClientComponent();
- break;
- case EAR:
- status = createEARComponent();
- break;
-
- default:
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_COMPONENT_CREATION", new String[]{moduleName}) );
- }
-
-
- return status;
- }
-
- private IStatus checkDataReady(){
-
- if (projectName==null || serverFactoryId==null){
- return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_COMPONENT_CREATION", new String[]{projectName, moduleName}) );
- }
-
- return Status.OK_STATUS;
- }
-
-
- /**
- * Create a Web component
- * @return
- */
- public IStatus createWebComponent(){
- IStatus status = Status.OK_STATUS;
- try
- {
- IDataModel projectInfo = DataModelFactory.createDataModel(new WebComponentCreationDataModelProvider());
-
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.PROJECT_NAME,projectName);
- if (moduleName!=null)
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
-
- // get the Web servlet level
- Integer servletLevel = J2EEUtils.getServletVersionForJ2EEVersion(j2eeLevel);
-
- if (j2eeLevel!=null)
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_VERSION, servletLevel);
- IDataModelOperation op = projectInfo.getDefaultOperation();
- op.execute(monitor_, null);
- }
- catch (Exception e)
- {
- status = StatusUtils.errorStatus( e );
- }
- return status;
- }
-
- /**
- * Create an EAR component
- * @return
- */
- public IStatus createEARComponent(){
- IStatus status = Status.OK_STATUS;
- try
- {
- IDataModel projectInfo = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
- projectInfo.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME,projectName);
- if (moduleName!=null)
- projectInfo.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
- if (j2eeLevel!=null)
- projectInfo.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, Integer.valueOf(j2eeLevel));
- IDataModelOperation op =projectInfo.getDefaultOperation();
- op.execute(monitor_, null);
- }
- catch (Exception e)
- {
- status = StatusUtils.errorStatus( e );
- }
- return status;
- }
-
- /**
- * Create an EJB Component
- * @return
- */
- public IStatus createEJBComponent(){
- IStatus status = Status.OK_STATUS;
-
- try
- {
- IDataModel projectInfo = DataModelFactory.createDataModel(new EjbComponentCreationDataModelProvider());
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.PROJECT_NAME,projectName);
- if (moduleName!=null)
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
-
- // get the EJB spec level
- Integer ejbLevel = J2EEUtils.getEJBVersionForJ2EEVersion(j2eeLevel);
-
- if (j2eeLevel!=null)
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_VERSION, ejbLevel);
-
- //Don't create an EAR. The ADD_TO_EAR property gets defaulted to TRUE for everything except Web projects.
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
-
- IDataModelOperation op = projectInfo.getDefaultOperation();
- op.execute( monitor_, null);
- }
- catch (Exception e)
- {
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_EJB_COMPONENT", new String[]{projectName}), e);
- }
- return status;
- }
-
- /**
- * Create an Application Client component
- * @return
- */
- public IStatus createAppClientComponent()
- {
- IStatus status = Status.OK_STATUS;
- try
- {
- IDataModel projectInfo = DataModelFactory.createDataModel(new AppClientComponentCreationDataModelProvider());
- projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.PROJECT_NAME,projectName);
- if (moduleName!=null)
- projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
- if (j2eeLevel!=null)
- projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_VERSION, Integer.valueOf(j2eeLevel));
-
- //Don't create an EAR. The ADD_TO_EAR property gets defaulted to TRUE for everything except Web projects.
- projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
-
- IDataModelOperation op = projectInfo.getDefaultOperation();
-
- op.execute( monitor_, null);
- }
- catch (Exception e)
- {
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_APPCIENT_PROJET", new String[]{projectName}), e);
- }
- return status;
- }
-
- /**
- * Creates Flexible Java Project structure
- * This project is required if it doesn't already exist in order to create the component
- * @return
- *
- * Note: This call may not be necessary once J2EE implements creating a flex project automatically
- * with the creation of components.
- */
- public IStatus createFlexibleJavaProject(){
- IStatus status = Status.OK_STATUS;
- try
- {
- IDataModel projectInfo = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
- projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.PROJECT_NAME,projectName);
-
- String runtimeTargetId = null;
- if( serverInstanceId_ == null )
- {
- // We don't have a server instance so we will get the first runtimeTarget from the factory ID.
- runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId, ServerUtils.getServerTargetModuleType(moduleType), j2eeLevel);
- }
- else
- {
- // We have a server instance so we will just get it's runtimeTargetId.
- IServer server = ServerCore.findServer( serverInstanceId_ );
- runtimeTargetId = server.getRuntime().getId();
- }
-
- projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.RUNTIME_TARGET_ID,runtimeTargetId);
- projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.ADD_SERVER_TARGET,Boolean.TRUE);
- IDataModelOperation op = projectInfo.getDefaultOperation();
- if (env!=null)
- op.execute( monitor_, null);
- else
- op.execute(new NullProgressMonitor(), null);
-
- }
- catch (Exception e)
- {
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_FLEX_PROJET", new String[]{projectName}), e);
- }
- return status;
- }
-
- public void setModuleName(String moduleName)
- {
- this.moduleName = moduleName;
- }
-
- public int getModuleType()
- {
- return moduleType;
- }
-
- public void setModuleType(int moduleType)
- {
- this.moduleType = moduleType;
- }
-
- public void setProjectName(String projectName)
- {
- this.projectName = projectName;
- }
-
- /**
- * Expecting 12,13,14 etc.
- * @param level
- */
- public void setJ2eeLevel(String level)
- {
- if (level !=null && level.indexOf(".")!=-1)
- j2eeLevel = J2EEUtils.getJ2EEIntVersionAsString(level);
- else
- j2eeLevel = level;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
-
- public void setServerInstanceId( String serverInstanceId )
- {
- serverInstanceId_ = serverInstanceId;
- }
-
-}
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 eb8dcd9bc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java
+++ /dev/null
@@ -1,140 +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.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.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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) {
- MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
- IStatus error = StatusUtils.errorStatus( msgUtils.getMessage("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) {
- MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
- IStatus error = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR", new Object[] {
- String.valueOf(port.getPort()), server.getName()}), ce);
- env.getStatusHandler().reportError(error);
- return error;
- }
- }
-
- else {
- MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
- IStatus info = StatusUtils.infoStatus( msgUtils.getMessage("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;
- }
-} \ No newline at end of file
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 8faeac27b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
+++ /dev/null
@@ -1,127 +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.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.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 serverInstanceId;
-
- private MessageUtils msgUtils;
-
- /**
- * Creates a server of the factory id
- * 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(){
- msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
-
- if (serverFactoryId==null){
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_SERVER") );
- return status;
- }
-
- IServerWorkingCopy serverWC = null;
- IServer server = null;
- try {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType!=null) {
-
- //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( msgUtils.getMessage("MSG_ERROR_STUB_ONLY",new String[]{serverFactoryId}) );
- return status;
- }
-
- if (env!=null)
- {
- serverWC = serverType.createServer(null, null, nonStubRuntime, monitor );
- }
- else
- {
- serverWC = serverType.createServer(null, null, nonStubRuntime, null);
- }
-
- if (serverWC != null) {
- if (env!=null)
- server = serverWC.saveAll(true, monitor );
- else
- server = serverWC.saveAll(true, null);
- }
- }
- } catch (CoreException ce) {
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_SERVER"), ce);
- return status;
- }
-
- // set serverInstanceId
- if (server!=null)
- serverInstanceId = server.getId();
- else {
- status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_SERVER") );
- }
-
- return status;
- }
-
- public void setServerFactoryid(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
-
- 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 6fb2660d0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
+++ /dev/null
@@ -1,69 +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.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.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 MessageUtils msgUtils_;
- private ValidationManager manager_;
- /**
- * CTOR;
- */
- public DisableBuildCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- ProgressUtils.report( monitor, msgUtils_.getMessage("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 a59a55818..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
+++ /dev/null
@@ -1,66 +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.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.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class DisableValidationCommand extends AbstractDataModelOperation
-{
-
- private MessageUtils msgUtils_;
- private ValidationManager manager_;
- private IProject serviceProject_;
-
- /**
- * CTOR;
- */
- public DisableValidationCommand() {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IStatus status = Status.OK_STATUS;
-
- ProgressUtils.report(monitor, msgUtils_.getMessage("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 9fd46d0a9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java
+++ /dev/null
@@ -1,206 +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.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.plugin.WebServiceConsumptionPlugin;
-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;
-
- public GetMonitorCommand()
- {
- monitorService = true;
- create = true;
- }
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
-
- endpoints = new Vector();
- if (monitorService && webServicesParser != null && wsdlURI != null && wsdlURI.length() > 0)
- {
- 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( WebServiceConsumptionPlugin.getMessage("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();
- 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( WebServiceConsumptionPlugin.getMessage("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;
- }
-} \ No newline at end of file
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 2a1041df3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
+++ /dev/null
@@ -1,118 +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.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.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-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.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-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 ResourceSet resourceSet;
- 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( WebServiceConsumptionPlugin.getMessage("%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 1fd9c93eb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
+++ /dev/null
@@ -1,148 +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.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.wst.command.internal.env.core.common.MessageUtils;
-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;
-
-/**
- * @author sengpl
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ManageServerStartUpCommand extends AbstractDataModelOperation
-{
-
- private MessageUtils msgUtils_;
-
- 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( ) {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment env = getEnvironment();
- IStatus status = Status.OK_STATUS;
- ProgressUtils.report(monitor, msgUtils_.getMessage("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/PublishProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java
deleted file mode 100644
index 3bc7047eb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.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.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.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-
-public class PublishProjectCommand extends AbstractDataModelOperation
-{
-
-private MessageUtils msgUtils_;
-
-private String project;
-private String serverTypeID;
-private IServer existingServer;
-
-
-/**
- * Default CTOR;
- */
-public PublishProjectCommand() {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
- IEnvironment env = getEnvironment();
-
- IStatus status = Status.OK_STATUS;
- try
- {
- ProgressUtils.report( monitor, msgUtils_.getMessage( "PROGRESS_INFO_PUBLISH_WEB_PROJECT" ) );
-
- if (project == null){
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND") );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IProject iProject = (IProject)ResourceUtils.findResource(project);
- IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(iProject), serverTypeID, existingServer, true, monitor);
- if (instance == null)
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND") );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IStatus returnedStatus = instance.publish(IServer.PUBLISH_INCREMENTAL, monitor);
- status = returnedStatus;
-
- //getStatusMonitor().reportStatus (instance.publish(getProgressMonitor()));
- env.getLog().log(ILog.OK, 5026, this, "execute", new String("project="+project+" successfully published"));
- //ILog.write(PublishProjectCommand.class,"execute",ILog.OK,"project="+project+" successfully published");
- return status;
- }
- catch (Exception e) {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_PUBLISH"), e);
- env.getStatusHandler().reportError(status);
- return status;
-
- }
-}
-
-
-public void setProject(String project)
-{
- this.project = project;
-}
-
-public void setServerTypeID(String serverTypeID)
-{
- this.serverTypeID = serverTypeID;
-}
-
-public void setExistingServer(IServer existingServer)
-{
- this.existingServer = existingServer;
-}
-
-
-
-}
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 76baa3ba8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
+++ /dev/null
@@ -1,59 +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.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.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class RestoreBuildStateCommand extends AbstractDataModelOperation
-{
-
- private MessageUtils msgUtils_;
- private ValidationManager manager_;
-
- /**
- * Default CTOR;
- */
- public RestoreBuildStateCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- ProgressUtils.report( monitor, msgUtils_.getMessage("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 97f1aacea..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.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.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.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class RestoreValidationStateCommand extends AbstractDataModelOperation
-{
- private MessageUtils msgUtils_;
- private ValidationManager manager_;
-
- private boolean runValidation_;
-
- /**
- * Default CTOR;
- */
- public RestoreValidationStateCommand( boolean runValidation )
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
- runValidation_ = runValidation;
- }
-
- /**
- * Execute the command
- */
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- ProgressUtils.report( monitor, msgUtils_.getMessage("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 09bafcc4e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
+++ /dev/null
@@ -1,162 +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.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.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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 MessageUtils msgUtils_;
-
-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_;
-
-// rm private Model model_;
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand( ) {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-}
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand(boolean creationScenario ) {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- 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, msgUtils_.getMessage("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( msgUtils_.getMessage("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( msgUtils_.getMessage("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( msgUtils_.getMessage("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/command/common/StartServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java
deleted file mode 100644
index d1fa3bde6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java
+++ /dev/null
@@ -1,262 +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 java.lang.reflect.InvocationTargetException;
-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.debug.core.ILaunchManager;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * (Re)Starts and publishes the server specifed by the serverInstanceId attribute.
- *
- *
- */
-public class StartServerCommand extends AbstractDataModelOperation
-{
- private MessageUtils msgUtils_;
- private ILog log;
- private boolean forcePublish_;
- private boolean doAsyncPublish_;
-
- private String serverInstanceId;
-
-
- public StartServerCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- log = EnvironmentService.getEclipseLog();
- forcePublish_ = false;
- doAsyncPublish_ = true;
- }
-
- public StartServerCommand( boolean forcePublish, boolean doAsyncPublish )
- {
- this();
-
- forcePublish_ = forcePublish;
- doAsyncPublish_ = doAsyncPublish;
- }
-
- 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( msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND") );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- int serverState = server.getServerState();
- int publishState = server.getServerPublishState();
-
- //Publish if required
- switch (publishState)
- {
- case IServer.PUBLISH_STATE_INCREMENTAL:
- if (server.canPublish().getSeverity() == IStatus.OK)
- {
- status = publish(server, IServer.PUBLISH_INCREMENTAL, monitor );
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- break;
- case IServer.PUBLISH_STATE_FULL:
- if (server.canPublish().getSeverity() == IStatus.OK)
- {
- status = publish(server, IServer.PUBLISH_FULL, monitor );
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- break;
-
- case IServer.PUBLISH_STATE_UNKNOWN:
- if (server.canPublish().getSeverity() == IStatus.OK)
- {
- status = publish(server, IServer.PUBLISH_INCREMENTAL, monitor );
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- break;
-
- //TODO: Reassess need for this, since Tomcat should know
- // whether it needs to be published or not (or publish should
- // simply always be driven by us.
- case IServer.PUBLISH_STATE_NONE:
- {
- if( forcePublish_ )
- {
- status = publish(server, IServer.PUBLISH_INCREMENTAL, monitor );
-
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- break;
- }
-
- default:
- }
-
-
- switch (serverState)
- {
- case IServer.STATE_STOPPED:
- if (server.canStart(ILaunchManager.RUN_MODE).getSeverity()==IStatus.OK)
- {
- status = start(server, monitor );
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- break;
- case IServer.STATE_STARTED:
- boolean shouldRestart = server.getServerRestartState();
- //TODO Ideally getServerRestartState() returning true should be a sufficient
- //condition for us to restart. However, getServerRestartState() seems to
- //sometimes pessimistically return true when it doesn't need to for Tomcat
- //servers. In order to curb the number of restarts, we will only
- //restart if a publish was required earlier in this execute method AND
- //getServerRestartState() returns true.
- //A publish is normally required when a module is added to the server.
-
- if (publishState != IServer.PUBLISH_STATE_NONE && shouldRestart && server.canRestart(ILaunchManager.RUN_MODE).getSeverity()==IStatus.OK)
- {
- status = restart(server, monitor );
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
-
- return status;
- }
-
- private IStatus publish(final IServer server, final int kind, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- final IStatus[] istatus = new IStatus[1];
- monitor.subTask(msgUtils_.getMessage("PROGRESS_INFO_PUBLISHING_SERVER"));
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
- {
- istatus[0] = server.publish(kind, shellMonitor);
- }
- };
-
- try
- {
- if( doAsyncPublish_ )
- {
- PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
- }
- else
- {
- runnable.run( monitor );
- }
-
- }
- catch(InvocationTargetException ite)
- {
- istatus[0] = new org.eclipse.core.runtime.Status( IStatus.ERROR, "id", 0, ite.getMessage(), ite );
- ite.printStackTrace();
- }
- catch(InterruptedException ie)
- {
- istatus[0] = new org.eclipse.core.runtime.Status( IStatus.ERROR, "id", 0, ie.getMessage(), ie );
- ie.printStackTrace();
- }
-
-
- if (istatus[0].getSeverity() != IStatus.OK)
- {
- status = istatus[0];
- return status;
- }
-
- log.log(ILog.INFO, 5051, this, "publishProject", "IServer=" + server + ", Publish command completed");
- return status;
- }
-
- private IStatus restart(IServer server, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- try
- {
- monitor.subTask(msgUtils_.getMessage("PROGRESS_INFO_STARTING_SERVER"));
- server.synchronousRestart(ILaunchManager.RUN_MODE, monitor);
- log.log(ILog.INFO, 5052, this, "execute", "IServer=" + server + ", Restart command completed");
- return status;
- } catch (CoreException e)
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SERVER"), e);
- return status;
- }
-
- }
-
- private IStatus start(IServer server, IProgressMonitor monitor )
- {
- IStatus status = Status.OK_STATUS;
- try
- {
- monitor.subTask(msgUtils_.getMessage("PROGRESS_INFO_STARTING_SERVER"));
- server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
- log.log(ILog.INFO, 5053, this, "execute", "IServer=" + server + ", Start command completed");
- return status;
- } catch (CoreException e)
- {
- status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SERVER"), e);
- return status;
- }
- }
-
- 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/FacetMatcher.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java
deleted file mode 100644
index 5512421d4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java
+++ /dev/null
@@ -1,51 +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 java.util.Set;
-
-public class FacetMatcher
-{
- private boolean match;
- 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;
- }
-
-
-
-
-
-}
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 b32f9abf4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
+++ /dev/null
@@ -1,399 +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 java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-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.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;
-
-public class FacetUtils
-{
-
- /**
- * Returns a list 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
- {
- //Check if it's a Java project
- IJavaProject javaProject = null;
- javaProject = JavaCore.create(projects[i]);
- if (javaProject != null)
- {
- //Add it to the list
- validProjects.add(projects[i]);
- }
- }
- }
- catch (CoreException ce)
- {
- }
- }
- return (IProject[])validProjects.toArray(new IProject[]{});
- }
-
- public static Set getTemplates(RequiredFacetVersion[] requiredFacetVersions)
- {
-
- //Get the templates that support the actions
- Set templates = new HashSet();
-
- for( Iterator itr = ProjectFacetsManager.getTemplates().iterator(); itr.hasNext(); )
- {
- final IFacetedProjectTemplate template = (IFacetedProjectTemplate) itr.next();
- String templateId = template.getId();
- if (templateId.indexOf("ear") == -1 && templateId.indexOf("wst.web") == -1) //Don't include the EARs!!
- {
- //TODO final Set initial = template.getInitialProjectFacets();
- Set initial = getInitialFacetVersionsFromTemplate(templateId);
- FacetMatcher fm = match(requiredFacetVersions, initial);
- if (fm.isMatch())
- {
- templates.add(template);
- }
- }
- }
-
- return templates;
-
- }
-
- 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;
- 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");
- }
- highestFacetVersion = facet.getLatestVersion();
- initial.add(highestFacetVersion);
- }
-
- return initial;
- }
-
- 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;
-
- }
-
- 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 "";
- }
-
- public static Set getInstallActions(Set projectFacetVersions)
- {
- HashSet actions = new HashSet();
-
- Iterator facets = projectFacetVersions.iterator();
-
- while(facets.hasNext())
- {
- IProjectFacetVersion fv = (IProjectFacetVersion)facets.next();
- Action action = new Action(Type.INSTALL, fv, null);
- actions.add(action);
- }
-
- return actions;
- }
-
- public static FacetMatcher match(RequiredFacetVersion[] requiredFacetVersions, Set projectFacetVersions)
- {
- FacetMatcher fm = new FacetMatcher();
- HashSet facetsToAdd = 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);
- }
-
- }
-
- //Check if the facetsToAdd can be added
- if (facetsToAdd.size() > 0)
- {
- Set actions = getInstallActions(facetsToAdd);
- if( ProjectFacetsManager.check( projectFacetVersions, actions ).getSeverity() == IStatus.OK )
- {
- //Facets can be added so there is a match
- fm.setMatch(true);
- fm.setFacetsThatMatched(facetsThatMatched);
- fm.setFacetsToAdd(facetsToAdd);
- }
- else
- {
- fm.setMatch(false);
- }
- }
- else
- {
- //Facets can be added so there is a match
- fm.setMatch(true);
- fm.setFacetsThatMatched(facetsThatMatched);
- fm.setFacetsToAdd(facetsToAdd);
- }
-
- return fm;
- }
-
- //Methods related to facet runtimes.
-
- 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]));
-
- }
-
- 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;
- }
-
- 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;
- }
-
- /*
- * @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 versionB
- */
- private 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;
- }
-
- public static boolean isJavaFacet(IProjectFacet pf)
- {
- if (pf.getId().equals("jst.java"))
- return true;
- else
- return false;
- }
-
-}
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 ead065dc7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
+++ /dev/null
@@ -1,93 +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.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.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link 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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * 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 WebServiceConsumptionPlugin.getMessage("%FOLDER_FILTER_NAME");
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WebServiceConsumptionPlugin.getMessage("%FOLDER_FILTER_DESC");
- }
-
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%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,
- WebServiceConsumptionPlugin.getMessage("%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/JavaResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
deleted file mode 100644
index fc44f9161..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
+++ /dev/null
@@ -1,169 +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.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.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link 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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * 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 WebServiceConsumptionPlugin.getMessage("%JAVA_FILTER_NAME");
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WebServiceConsumptionPlugin.getMessage("%JAVA_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.
- * @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,
- WebServiceConsumptionPlugin.getMessage("%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,
- WebServiceConsumptionPlugin.getMessage("%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,
- WebServiceConsumptionPlugin.getMessage("%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 e8da47621..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, 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;
-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 146b2f1c4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
+++ /dev/null
@@ -1,125 +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.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.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link 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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * 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 WebServiceConsumptionPlugin.getMessage("%PROPERTIES_FILTER_NAME");
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WebServiceConsumptionPlugin.getMessage("%PROPERTIES_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.
- * @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,
- WebServiceConsumptionPlugin.getMessage("%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,
- WebServiceConsumptionPlugin.getMessage("%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,
- WebServiceConsumptionPlugin.getMessage("%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 2e2e11a27..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.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.jst.ws.internal.consumption.common;
-
-
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class RequiredFacetVersion
-{
- private IProjectFacetVersion projectFacetVersion;
- private boolean allowNewer;
-
- 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;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java
deleted file mode 100644
index 91ef77815..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.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.jst.ws.internal.consumption.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.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * This command is intended to clean up data after either the
- * client or service wizards. Currently is just resets the
- * parser factory.
- *
- */
-public class ScenarioCleanupCommand extends AbstractDataModelOperation
-{
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- WSDLParserFactory.killParser();
-
- return Status.OK_STATUS;
- }
-
-
- public IStatus undo( IProgressMonitor monitor, IAdaptable adaptable )
- {
- // Even if the user cancels out of the wizard we want to
- // kill the parser.
- WSDLParserFactory.killParser();
-
- return Status.OK_STATUS;
- }
-}
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 7872f6d3f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
+++ /dev/null
@@ -1,120 +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.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.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link 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
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * 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 WebServiceConsumptionPlugin.getMessage("%WSDL_FILTER_NAME");
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WebServiceConsumptionPlugin.getMessage("%WSDL_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.
- * @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,
- WebServiceConsumptionPlugin.getMessage("%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,
- WebServiceConsumptionPlugin.getMessage("%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,
- WebServiceConsumptionPlugin.getMessage("%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 59b3831ce..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, 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 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 c07aa7287..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, 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.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 0c7ce9c62..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.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;
-
-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 + "java.util.List list" + getUniqueName() + "= java.util.Arrays.asList(" + name + ");" +StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String temp"+ getUniqueName() +" = list" + getUniqueName() + ".toString();" + 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 c3cc514bb..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, 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 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 fc9c4f01f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.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 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";
-
- /**
- * 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;
-
- }
-
- /**
- * 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 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 1ed79927a..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, 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.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 6a839891b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
+++ /dev/null
@@ -1,125 +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 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 + "java.util.Date " + 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 eceb2eb6e..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, 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 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 d7cfbf9c4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
+++ /dev/null
@@ -1,127 +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 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 + "java.util.GregorianCalendar" + 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 52e8d6032..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, 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 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/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 36f08a8b8..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, 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 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 4b5176766..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
+++ /dev/null
@@ -1,47 +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 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 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 e81948248..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
+++ /dev/null
@@ -1,140 +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 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 + typeName + 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 50cb4cfbe..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, 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 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 f1592f6aa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
+++ /dev/null
@@ -1,192 +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 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 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 f7a176058..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
+++ /dev/null
@@ -1,248 +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 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 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(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
- if (javaHelpers.isArray()||
- javaHelpers.getJavaName().equals(MAP_NAME)||
- javaHelpers.getJavaName().equals(VECTOR_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 boolean isRecognizedReturnType(JavaHelpers javaHelpers)
- {
- //arrays
- //Hashtable
- //Vectors
- 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 return false;
- }
-
- public static boolean isRecognizedReturnType(String type)
- {
- //arrays
- //Hashtable
- //Vectors
- 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 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();
-
- // 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 1e8647fd2..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, 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.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 e7ca18741..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, 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.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 723975828..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, 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.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 f0d010cbc..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, 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.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 2f501e067..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, 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.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 d80ffbb39..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, 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.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 78e2ac4af..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, 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.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 08f6883f8..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, 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.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 3302d8968..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, 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.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 64611e868..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, 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.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 a9e89d3bc..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, 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.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 65cab80e0..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 0b09cf2a8..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 6a3f5cf25..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 a3da3d86d..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 7cd1b4c2f..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 5c1db7301..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 a0e9c21ec..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 af8268a89..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 ac20679c5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.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.plugin;
-
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-/**
-* 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
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * 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_;
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public static String getMessage ( String key )
- {
- MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", instance_ );
-
- if( key.startsWith("%"))
- {
- key = key.substring( 1, key.length() );
- }
-
- return msgUtils.getMessage(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.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 e485e04f3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
+++ /dev/null
@@ -1,73 +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.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.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 83719d761..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, 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.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 9cca6548f..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, 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.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 9e9232b70..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, 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.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 f6d45c3df..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
+++ /dev/null
@@ -1,291 +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.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;
-
- /**
- * 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 (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;
- }
-
-
-
- //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
- 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("")){
- 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 a8f4cb17e..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, 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.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 3a8973402..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, 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.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 45ff5f9e2..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, 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.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 34e7a4da0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
+++ /dev/null
@@ -1,89 +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.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;
- 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();
- if(attributeElementType.getSetterMethod() == null) return Status.OK_STATUS;
- 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 586bba91a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
+++ /dev/null
@@ -1,139 +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.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\"%>");
- 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 b6d38ab37..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, 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.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 724285e06..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, 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.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 f78cd599d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
+++ /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
- *******************************************************************************/
-
-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";
- fbuffer.append(dataType.stringConversion(type.getName(),nodeName,getTypeOwnerId()));
-
- putResidentVector(nodeName);
- }
-
- else {
- //must be complex
- String typeName = typeElement.getName();
- fTypeIdName = idName(typeName);
-
- 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);
- }
- 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 83fe42bca..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, 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.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 d456f896e..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, 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 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 a75d2b699..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
+++ /dev/null
@@ -1,229 +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.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.MessageUtils;
-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 MessageUtils msgUtils;
- private String clientProject;
- private BooleanSelection[] methods;
- private String proxyBean;
- private JavaClass javaClass;
- private Model model;
- private Element parentElement;
-
- public JavaToModelCommand ()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- }
-
-
- 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', msgUtils.getMessage("LABEL_OK"), msgUtils.getMessage("DESCRIPTION_OK"));
- Choice CancelChoice = new Choice('C', msgUtils.getMessage("LABEL_CANCEL"), msgUtils.getMessage("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( msgUtils.getMessage("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( msgUtils.getMessage("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( msgUtils.getMessage("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 97b207ecd..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, 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.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 e93561e25..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, 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.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 5123e55e2..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 ba8519010..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
+++ /dev/null
@@ -1,64 +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 SoapElementHelper {
-/*
- * This class is being gutted for the moment,
- * until a means for including saaj.jar or an
- * equivalent keeper of the javax.xml.soap package
- * can be determined. The disabling of this class
- * will only cause problems if Sample JSPs are
- * generated for Web Service proxies that have
- * SOAPElements on their interfaces.
- *
- public static javax.xml.soap.SOAPElement createSOAPElementFromXMLString(String xmlString) throws SoapElementRuntimeException
- {
- throw new SoapElementRuntimeException("SoapElement is not supported by the sample on the current runtime. Please use WebSphere v5.1 or higher.");
- }
-
- 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 2335ef522..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.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/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 566b775e1..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.0
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.ui,
- org.eclipse.wst.command.env.ui
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 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html> \ No newline at end of file
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 4a8659f76..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
+++ /dev/null
@@ -1,74 +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.java">
- <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 SessionImpl"
- extensionMetadata=".java .class .SessionImpl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
- </webServiceImpl>
- </extension>
-
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
- <serviceType
- id="org.eclipse.jst.ws.serviceType.ejb"
- implId="org.eclipse.jst.ws.wsImpl.ejb"
- buModuleTypesInclude="jst.ejb"
- buModuleTypesExclude=""
- tdModuleTypesInclude="jst.ejb"
- tdModuleTypesExclude="">
- </serviceType>
-</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 cb0105380..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"/>
- <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 af1d5819e..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-ui.jar
-@dot
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 ef454e4c4..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.creation.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.consumption.ui</project>
- <project>org.eclipse.jst.ws.ui</project>
- </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/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 26426c591..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,44 +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.0
-Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.creation.ui,
- org.eclipse.jst.ws.internal.creation.ui.extension,
- org.eclipse.jst.ws.internal.creation.ui.plugin,
- org.eclipse.jst.ws.internal.creation.ui.preferences,
- org.eclipse.jst.ws.internal.creation.ui.server,
- org.eclipse.jst.ws.internal.creation.ui.widgets,
- org.eclipse.jst.ws.internal.creation.ui.widgets.binding,
- org.eclipse.jst.ws.internal.creation.ui.widgets.runtime,
- org.eclipse.jst.ws.internal.creation.ui.widgets.test
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.wst.server.core,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.wsdl4j,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.project.facet.core
-Eclipse-AutoStart: true
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 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html> \ No newline at end of file
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/export_ws_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif
deleted file mode 100644
index 74fcd7711..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.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/webservices_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif
deleted file mode 100644
index abd1f9c82..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif
+++ /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 c124705dc..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
+++ /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
-###############################################################################
-
-#
-# 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 Skeleton 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 99bdf0177..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
+++ /dev/null
@@ -1,245 +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.gif"
- 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">
- <wizard
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- icon="icons/export_ws.gif"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="wsexport">
- <description>
- %PLUGIN_EXPORT_WIZARD_DESC_WS
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/export_ws_wiz.gif"
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
- id="wsexport">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/export_ws_wiz.gif"
- 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"
- 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"
- 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"
- 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">
- <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.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">
- <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.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">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- 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.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
- <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">
- <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">
- <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">
- <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">
- <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">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- 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.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- <action
- label="%ACTION_PUBLISH_WSDL"
- 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.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>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties
deleted file mode 100644
index 6a4c47a05..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties
+++ /dev/null
@@ -1,25 +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
-###############################################################################
-
-#
-# WSDL Test Errors
-#
-MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST=IWAB0361E An error occurred. Unable to launch WSDL test facility.
-
-
-#
-# 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/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 5ed4a2808..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
+++ /dev/null
@@ -1,107 +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.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceAssembleCommand extends AbstractDataModelOperation
-{
- private IWebService webService_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private String j2eeLevel_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- System.out.println( "In Pre service assemble command." );
-
- // Check if EAR module is req'd, ie. !=null
- if (earProject_==null)
- return Status.OK_STATUS;
-
-
- //Create the service EAR module
- CreateModuleCommand command = new CreateModuleCommand();
- command.setProjectName(earProject_);
- command.setModuleName(ear_);
- command.setModuleType(CreateModuleCommand.EAR);
- command.setServerFactoryId(webService_.getWebServiceInfo().getServerFactoryId());
- command.setServerInstanceId( webService_.getWebServiceInfo().getServerInstanceId() );
- command.setJ2eeLevel(j2eeLevel_);
- command.setEnvironment( environment );
- IStatus status = command.execute( monitor, null );
- 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);
- }
-
- 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;
- }
-
-
- public void setJ2eeLevel( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-}
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 e0adbe6e7..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.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.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;
-
-public class PreServiceDeployCommand extends AbstractDataModelOperation
-{
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- System.out.println( "In Pre service deploy command." );
-
- return Status.OK_STATUS;
- }
-}
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 d612cccd6..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
+++ /dev/null
@@ -1,314 +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 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.j2ee.internal.J2EEVersionConstants;
-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.command.common.CreateModuleCommand;
-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.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-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 IWebService webService_;
- private String j2eeLevel_;
- private ResourceContext resourceContext_;
-
- private boolean run_;
- private boolean client_;
- private boolean test_;
- private boolean publish_;
-
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- 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();
-
- System.out.println( "In Pre service develop command." );
-
- wsInfo.setServerFactoryId( typeRuntimeServer_.getServerId() );
- wsInfo.setServerInstanceId( typeRuntimeServer_.getServerInstanceId());
- wsInfo.setState( WebServiceState.UNKNOWN_LITERAL );
- wsInfo.setWebServiceRuntimeId( typeRuntimeServer_.getRuntimeId() );
-
- 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];
- wsInfo.setWsdlURL(wsdlURL);
- }
-
- context_ = new SimpleContext(true, true, true, true, run_, client_, test_, publish_,
- scenario,
- resourceContext_.isOverwriteFilesEnabled(),
- resourceContext_.isCreateFoldersEnabled(),
- resourceContext_.isCheckoutFilesEnabled());
-
- IStatus status = Status.OK_STATUS;
-
- // Create the service module if needed.
- IProject project = ProjectUtilities.getProject(project_);
- if (!project.exists())
- {
- RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRequiredFacetVersions();
- Set facetVersions = FacetUtils.getInitialFacetVersionsFromTemplate(moduleType_);
- FacetMatcher fm = FacetUtils.match(rfv, facetVersions);
- if (fm.isMatch())
- {
- CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
- command.setProjectName(project_);
- command.setTemplateId(moduleType_);
- command.setRequiredFacetVersions(rfv);
- command.setServerFactoryId(typeRuntimeServer_.getServerId());
- command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- //command.setFacetMatcher(fm);
- status = command.execute( monitor, adaptable );
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError( status );
- }
- }
- }
- else
- {
- //TODO add the necessary facets
- }
-
- //Create the service module
- //rsk todo -- pick the correct module type based on the Web service type, it's hard coded to WEB for now.
-/*
- int intModuleType = convertModuleType(moduleType_);
-
-
- CreateModuleCommand command = new CreateModuleCommand();
- command.setProjectName(project_);
- command.setModuleName(module_);
- command.setModuleType(intModuleType);
- command.setServerFactoryId(typeRuntimeServer_.getServerId());
- command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- command.setJ2eeLevel(j2eeLevel_);
- command.setEnvironment(environment);
- IStatus status = command.execute( monitor, null);
-*/
- return status;
- }
-
- private String getJ2EELevelFromExistingProject()
- {
- IProject project = ProjectUtilities.getProject(project_);
- if (project != null && project.exists())
- {
- //If the project has the "jst.web", "jst.ejb", or "jst.appclient" facet, deduce a J2EE version.
- int j2eeLevelInt = J2EEUtils.getJ2EEVersion(project);
- if (j2eeLevelInt != -1)
- {
- return String.valueOf(j2eeLevelInt);
- }
- }
-
- //TODO Figure out the J2EE version from the facets to add to a project.
- return String.valueOf(J2EEVersionConstants.J2EE_1_4_ID); //for now, just return something
- }
-
- private int convertModuleType(String type)
- {
- if (type.equals(IModuleConstants.JST_WEB_MODULE))
- {
- return CreateModuleCommand.WEB;
- }
- else if (type.equals(IModuleConstants.JST_EJB_MODULE))
- {
- return CreateModuleCommand.EJB;
- }
- else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
- {
- return CreateModuleCommand.APPCLIENT;
- }
- else if (type.equals(IModuleConstants.JST_EAR_MODULE))
- {
- return CreateModuleCommand.EAR;
- }
- else
- {
- return -1;
- }
- }
-
- 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 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;
- }
-
-
-}
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 04b3f236f..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
+++ /dev/null
@@ -1,107 +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.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.IWebService;
-
-public class PreServiceInstallCommand extends AbstractDataModelOperation
-{
- private IWebService webService_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- System.out.println( "In Pre service install command." );
-
- if (webService_.getWebServiceInfo().getServerInstanceId()==null)
- {
- CreateServerCommand createServerCommand = new CreateServerCommand();
- createServerCommand.setServerFactoryid(webService_.getWebServiceInfo().getServerFactoryId());
- createServerCommand.setEnvironment( environment );
- IStatus createServerStatus = createServerCommand.execute( monitor, null);
- if (createServerStatus.getSeverity()==Status.OK)
- {
- webService_.getWebServiceInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
- }
- 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;
- }
-
- 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;
- }
-
-}
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 b0f876d10..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
+++ /dev/null
@@ -1,50 +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.command.common.StartServerCommand;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class PreServiceRunCommand extends AbstractDataModelOperation
-{
- private IWebService webService_;
-
- public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
- {
- IEnvironment environment = getEnvironment();
-
- System.out.println( "In Pre service run command." );
-
- StartServerCommand command = new StartServerCommand();
- command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
- command.setEnvironment( environment );
- IStatus status = command.execute( monitor, null );
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- return status;
-
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-
-}
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 e2b3e0a3d..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
+++ /dev/null
@@ -1,111 +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.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, "J2eeLevel", PreServiceAssembleCommand.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, "WebService", 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 4c6869bdb..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
+++ /dev/null
@@ -1,114 +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.creation.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-
-
-/**
-* 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
-{
- // 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.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 the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public static String getMessage ( String key )
- {
- MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.creation.ui.plugin", instance_ );
-
- if( key.startsWith("%"))
- {
- key = key.substring( 1, key.length() );
- }
-
- return msgUtils.getMessage(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);
- }
-
- /**
- * 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.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 d0ab4aa0a..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,136 +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.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, null);
-
- Composite page = utils.createComposite( parent, 1 );
-
- serverWidget_ = new ServerWizardWidget( false );
- serverWidget_.addControls( page, new Listener()
- {
- public void handleEvent( Event evt ){}
- } );
- initializeValues();
- 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 );
- serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxy()) );
- serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorer()) );
- serverWidget_.setStartService( new Boolean(context.getStartWebService()) );
- serverWidget_.setTestService( new Boolean(context.getTestWebService()) );
- serverWidget_.setMonitorService(new Boolean(context.getMonitorWebService()));
- 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_.setGenerateProxy( new Boolean(context.getGenerateProxyDefault()) );
- serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorerDefault()) );
- serverWidget_.setStartService( new Boolean(context.getStartWebServiceDefault()) );
- serverWidget_.setTestService( new Boolean(context.getTestWebServiceDefault()) );
- serverWidget_.setMonitorService(new Boolean(context.getMonitorWebServiceDefault()));
- 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.setStartWebService( serverWidget_.getStartService().booleanValue() );
- context.setTestWebService( serverWidget_.getTestService().booleanValue() );
- context.setMonitorWebService(serverWidget_.getMonitorService().booleanValue());
- }
-
- 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 e2d2872c2..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
+++ /dev/null
@@ -1,57 +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.server.StartServerWidget;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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_;
- private MessageUtils msgUtils_;
-
- public StartServerWidgetContributor( IServer server )
- {
- server_ = server;
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.ui.plugin", this );
- }
-
- public String getDescription()
- {
- return msgUtils_.getMessage( "PAGE_DESC_WS_START_SERVER" );
- }
-
- public String getName()
- {
- return "";
- }
-
- public String getTitle()
- {
- return msgUtils_.getMessage( "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 8f7d44300..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
+++ /dev/null
@@ -1,57 +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.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.IWebService;
-
-public class StartServerWidgetFactory implements INamedWidgetContributorFactory
-{
- private IWebService webservice_;
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- IServer server = null;
-
- if( webservice_ != null )
- {
- server = ServerCore.findServer(webservice_.getWebServiceInfo().getServerInstanceId() );
- }
-
- 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 );
- }
-
- public void setWebService( IWebService webservice )
- {
- webservice_ = webservice;
- }
-}
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 75502535b..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
+++ /dev/null
@@ -1,303 +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.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PreferencesSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-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.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
-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.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class ServerWizardWidget extends SimpleWidgetDataContributor
-{
- private WebServiceClientTypeWidget clientWidget_;
- private PreferencesSelectionWidget preferencesWidget_;
- private Listener statusListener_;
- private TypeRuntimeServer ids_;
- private LabelsAndIds labelIds_;
- private boolean displayPreferences_;
-
- /*CONTEXT_ID PWPR0001 for the Project Page*/
- private String INFOPOP_PWPR_PAGE = "PWPR0001";
-
- /*CONTEXT_ID PWPR0005 for the Generate Proxy check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY = "PWPR0005";
- private Button generateProxy_;
-
- /*CONTEXT_ID PWPR0010 for the Web Service Type combo box of the Project Page*/
- private String INFOPOP_PWPR_COMBO_TYPE = "PWPR0010";
- private Combo webserviceType_;
-
- /*CONTEXT_ID PWPR0011 for the Wizard Scenario Service group of the Project Page*/
- private String INFOPOP_PWPR_GROUP_SCENARIO_SERVICE = "PWPR0011";
- private Button startService_;
-
- /*CONTEXT_ID PWPR0009 for the Start Web Project check box check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_START_WEB_PROJECT = "PWPR0009";
-
- /*CONTEXT_ID PWPR0013 for the test service checkbox of the project page*/
- private String INFOPOP_PWPR_CHECKBOX_TEST_SERVICE = "PWPR0013";
- private Button testService_;
-
- /*CONTEXT_ID PWPR0014 for the monitor service checkbox of the projec page*/
- private String INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE = "PWPR0014";
- private Button monitorService;
-
- /*CONTEXT_ID PWPR0012 for the Launch UDDI check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_LAUNCH_WS = "PWPR0012";
- private Button launchUddi_;
-
- public ServerWizardWidget( boolean displayPreferences )
- {
- displayPreferences_ = displayPreferences;
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- String createPluginId = "org.eclipse.jst.ws.creation.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- UIUtils utils = new UIUtils( msgUtils, createPluginId );
-
- statusListener_ = statusListener;
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PWPR_PAGE );
-
- Composite serverComposite = utils.createComposite( parent, 1 );
-
- Group serviceGroup = utils.createGroup( serverComposite, "GROUP_SCENARIO_SERVICE",
- "TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE",
- INFOPOP_PWPR_GROUP_SCENARIO_SERVICE,
- 2, 10, 10);
-
-
- // Create webservice combo box.
- webserviceType_ = utils.createCombo( serviceGroup, "LABEL_WEBSERVICETYPE",
- "TOOLTIP_PWPR_COMBO_TYPE",
- INFOPOP_PWPR_COMBO_TYPE,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- webserviceType_.addListener( SWT.Modify, statusListener );
-
- Composite buttonsGroup = utils.createComposite( serviceGroup, 1 );
- GridData buttonGrid = new GridData();
- buttonGrid.horizontalSpan = 2;
- buttonsGroup.setLayoutData( buttonGrid );
-
- // Create start service check box.
- startService_ = utils.createCheckbox( buttonsGroup, "BUTTON_START_WEB_PROJECT",
- "TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT",
- INFOPOP_PWPR_CHECKBOX_START_WEB_PROJECT );
- startService_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleStartPressed();
- }
- });
-
- launchUddi_ = utils.createCheckbox( buttonsGroup, "BUTTON_WS_PUBLISH",
- "TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS",
- INFOPOP_PWPR_CHECKBOX_LAUNCH_WS );
-
- Composite proxyComposite = utils.createComposite( serverComposite, 1, 5, 0 );
-
- // Create generate proxy check box.
- generateProxy_ = utils.createCheckbox( proxyComposite, "BUTTON_GENERATE_PROXY",
- "TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY",
- INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY );
- generateProxy_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- clientWidget_.enableWidget( generateProxy_.getSelection() );
- }
- });
-
- // Create client selection widget.
- clientWidget_ = new WebServiceClientTypeWidget();
- clientWidget_.addControls( serverComposite, statusListener );
-
- Composite testGroup = utils.createComposite(serverComposite,1);
-
- // Create test service check box.
- testService_ = utils.createCheckbox( testGroup, "CHECKBOX_TEST_WEBSERVICE",
- "TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE",
- INFOPOP_PWPR_CHECKBOX_TEST_SERVICE );
-
- monitorService = utils.createCheckbox( testGroup, "CHECKBOX_MONITOR_WEBSERVICE",
- "TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE",
- INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE );
-
- if( displayPreferences_ )
- {
- // Create the preferences widgets.
- preferencesWidget_ = new PreferencesSelectionWidget();
- preferencesWidget_.addControls( serverComposite, statusListener );
- }
-
- return this;
- }
-
- private void handleStartPressed()
- {
- boolean enabled = startService_.getSelection();
-
- testService_.setEnabled( enabled );
- monitorService.setEnabled(enabled);
- launchUddi_.setEnabled( enabled );
- generateProxy_.setEnabled( enabled );
- clientWidget_.enableWidget( getGenerateProxy().booleanValue() );
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- clientWidget_.setTypeRuntimeServer( ids );
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientWidget_.getTypeRuntimeServer();
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
- {
- LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils2.getServiceTypeLabels();
- //rskreg
- int selection = 0;
- String[] serviceIds = labelIds.getIds_();
- String selectedId = ids.getTypeId();
-
- webserviceType_.removeListener( SWT.Modify, statusListener_ );
- 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 );
- webserviceType_.addListener( SWT.Modify, statusListener_ );
- ids_ = ids;
- labelIds_ = labelIds;
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- int selectionIndex = webserviceType_.getSelectionIndex();
-
- ids_.setTypeId( labelIds_.getIds_()[selectionIndex] );
-
- return ids_;
- }
-
- public Boolean getStartService()
- {
- return new Boolean( startService_.getSelection() );
- }
-
- public void setStartService( Boolean value )
- {
- startService_.setSelection( value.booleanValue() );
- }
-
- public Boolean getTestService()
- {
- return new Boolean( testService_.getSelection() && startService_.getSelection() );
- }
-
- public void setTestService( Boolean value )
- {
- testService_.setSelection( value.booleanValue() );
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean(monitorService.getSelection() && startService_.getSelection());
- }
-
- public void setMonitorService(Boolean value)
- {
- monitorService.setSelection(value.booleanValue());
- }
-
- public Boolean getPublishService()
- {
- return new Boolean( launchUddi_.getSelection() && startService_.getSelection() );
- }
-
- public void setPublishService( Boolean value )
- {
- launchUddi_.setSelection( value.booleanValue() );
- }
-
- public Boolean getGenerateProxy()
- {
- return new Boolean( generateProxy_.getSelection() && startService_.getSelection() );
- }
-
- public void setGenerateProxy( Boolean value )
- {