diff options
Diffstat (limited to 'bundles/org.eclipse.jst.ws.creation.ui')
45 files changed, 0 insertions, 6200 deletions
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.creation.ui/.classpath deleted file mode 100644 index 196d49a46..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore deleted file mode 100644 index 8e6edef01..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -bin -build.xml -temp.folder -wss-ui.jar -@dot -src.zip -javaCompiler...args diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.project b/bundles/org.eclipse.jst.ws.creation.ui/.project deleted file mode 100644 index b9c8bfcaf..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jst.ws.creation.ui</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - </natures> -</projectDescription> diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8bab1893c..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,57 +0,0 @@ -#Sat Jun 02 17:07:06 EDT 2007 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=ignore -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 5971ac072..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Mon Jan 30 10:41:04 EST 2006 -compilers.p.deprecated=1 -compilers.p.no-required-att=0 -compilers.p.not-externalized-att=1 -compilers.p.unknown-attribute=0 -compilers.p.unknown-class=0 -compilers.p.unknown-element=1 -compilers.p.unknown-resource=0 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.use-project=true -eclipse.preferences.version=1 diff --git a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF deleted file mode 100644 index b91f7be04..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF +++ /dev/null @@ -1,49 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %PLUGIN_NAME -Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true -Bundle-Version: 1.0.307.qualifier -Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin -Bundle-Vendor: %PLUGIN_PROVIDER -Bundle-Localization: plugin -Export-Package: org.eclipse.jst.ws.internal.creation.ui;x-internal:=true, - org.eclipse.jst.ws.internal.creation.ui.ant;x-internal:=true, - org.eclipse.jst.ws.internal.creation.ui.extension;x-internal:=true, - org.eclipse.jst.ws.internal.creation.ui.plugin;x-internal:=true, - org.eclipse.jst.ws.internal.creation.ui.preferences;x-internal:=true, - org.eclipse.jst.ws.internal.creation.ui.server;x-internal:=true, - org.eclipse.jst.ws.internal.creation.ui.widgets;x-internal:=true, - org.eclipse.jst.ws.internal.creation.ui.widgets.binding;x-internal:=true, - org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;x-internal:=true, - org.eclipse.jst.ws.internal.creation.ui.widgets.test;x-internal:=true -Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)", - org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)", - org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)", - org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)", - org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)", - org.eclipse.wst.ws.explorer;bundle-version="[1.0.101,1.1.0)", - org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)", - org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)", - org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)", - org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)", - org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)", - org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", - org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)", - org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)", - org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)", - org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)", - org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)", - org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)", - org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)", - org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)", - javax.wsdl;bundle-version="[1.4.0,1.5.0)", - org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)", - org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)", - org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)", - org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)", - org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)" -Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/bundles/org.eclipse.jst.ws.creation.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ui/about.html deleted file mode 100644 index 2199df3f0..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/about.html +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>June, 2008</P> - -<H3>License</H3> - -<P>The Eclipse Foundation makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from the Eclipse Foundation, the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at -<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P> - -</BODY> -</HTML> diff --git a/bundles/org.eclipse.jst.ws.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ui/build.properties deleted file mode 100644 index e1dec33b5..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -bin.includes = .,\ - icons/,\ - plugin.properties,\ - plugin.xml,\ - META-INF/,\ - about.html diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif Binary files differdeleted file mode 100644 index ca44ef839..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 2d737f07a..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif +++ /dev/null diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png Binary files differdeleted file mode 100644 index 3d6bcabe1..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png +++ /dev/null diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png Binary files differdeleted file mode 100644 index 45f876a63..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png +++ /dev/null diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg Binary files differdeleted file mode 100644 index 5d3793332..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg +++ /dev/null diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg Binary files differdeleted file mode 100644 index bd58bc06d..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg +++ /dev/null diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg Binary files differdeleted file mode 100644 index 38ff6a6f9..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg +++ /dev/null diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg Binary files differdeleted file mode 100644 index 58fcdba85..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg +++ /dev/null diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg Binary files differdeleted file mode 100644 index 5c912f705..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg +++ /dev/null diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg Binary files differdeleted file mode 100644 index ab5695991..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg +++ /dev/null diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties deleted file mode 100644 index d6e85f0aa..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties +++ /dev/null @@ -1,62 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2006 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -# -# Messages in plugin.xml. -# -PLUGIN_NAME=Web Services Creation Graphical User Interface -PLUGIN_PROVIDER=Eclipse.org - -PLUGIN_NEW_CATEGORY_NAME_WS=Web Services -PLUGIN_NEW_WIZARD_NAME_WS_SERVICE=Web Service -PLUGIN_EXPORT_WIZARD_NAME_WS=Web Service -PLUGIN_NEW_WIZARD_DESC_WS_SERVICE=Create a new XML web service. -PLUGIN_EXPORT_WIZARD_DESC_WS=A wizard for exporting a web service. - -# -# Web Services Preferance Pages -# -# Dialogs -CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG=Hide &Create Web service Dialog -CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG=Hide Generate Java Bean S&keleton Dialog -CHECKBOX_SHOW_GENERATE_WSDL_FILES_DIALOG=Hide Generate WSDL Files Dialog -CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG=Hide Publish &WSDL Dialog - -PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults - - -# -# Preferences Tooltips -# -#Action Dialogs -TOOLTIP_PPAD_CHECKBOX_DEPLOY=Hides the dialog for deploying a Web service action -TOOLTIP_PPAD_CHECKBOX_SKELETON=Hides the dialog for generating Java bean Skeleton action -TOOLTIP_PPAD_CHECKBOX_WSDL=Hides the dialog for generating WSDL files action -TOOLTIP_PPAD_CHECKBOX_PUBLISH=Hides the dialog for publishing the WSDL action - -# -# Pop-up actions -# -ACTION_DEPLOY_WEBSERVICE=Create Web service -ACTION_GENERATE_JAVA_SKELETON=Generate Java bean skeleton -ACTION_PUBLISH_WSDL=Publish WSDL file - -# -# Wizards. -# -WIZARD_TITLE_WSS=Web Service - - -# -# Pop-up actions -# -ACTION_DEPLOY_WEBSERVICE=Create Web service - diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml deleted file mode 100644 index 9271f77ce..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml +++ /dev/null @@ -1,396 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> - -<plugin> - - <!-- Wizards --> - - <extension - point="org.eclipse.ui.newWizards"> - <category - name="%PLUGIN_NEW_CATEGORY_NAME_WS" - id="org.eclipse.jst.ws.ui.new"> - </category> - <wizard - name="%PLUGIN_NEW_WIZARD_NAME_WS_SERVICE" - icon="icons/full/ctool16/new_webserv_wiz.gif" - category="org.eclipse.jst.ws.ui.new" - class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - <description> - %PLUGIN_NEW_WIZARD_DESC_WS_SERVICE - </description> - </wizard> - </extension> - - <extension - point="org.eclipse.wst.command.env.dynamicWizard"> - <dynamicWizard - iconbanner="icons/full/wizban/webservices_wiz.png" - title="%WIZARD_TITLE_WSS" - class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ServerWidgetBinding" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - </dynamicWizard> - </extension> - - <extension - point="org.eclipse.ui.exportWizards"> - <category - id="org.eclipse.jst.ws.creation.ui.wsexport.category" - name="%PLUGIN_NEW_CATEGORY_NAME_WS"/> - </extension> - - <extension - point="org.eclipse.ui.exportWizards"> - <wizard - name="%PLUGIN_EXPORT_WIZARD_NAME_WS" - icon="icons/export_ws.gif" - category="org.eclipse.jst.ws.creation.ui.wsexport.category" - class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard" - id="org.eclipse.jst.ws.consumption.ui.wsexport"> - <description> - %PLUGIN_EXPORT_WIZARD_DESC_WS - </description> - </wizard> - </extension> - - <extension - point="org.eclipse.wst.command.env.dynamicWizard"> - <dynamicWizard - iconbanner="icons/full/wizban/export_ws_wiz.png" - name="%PLUGIN_EXPORT_WIZARD_NAME_WS" - class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding" - id="org.eclipse.jst.ws.consumption.ui.wsexport"> - </dynamicWizard> - </extension> - - <extension - point="org.eclipse.wst.command.env.dynamicWizard"> - <dynamicWizard - iconbanner="icons/full/wizban/export_ws_wiz.png" - name="%PLUGIN_EXPORT_WIZARD_NAME_WS" - class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding" - id="org.eclipse.jst.ws.creation.ui.wizard.publish"> - </dynamicWizard> - </extension> - - <!-- "Don't Show Me" Preferences --> - - <extension - point="org.eclipse.wst.command.env.actionDialogPreferenceType"> - - <actionDialogPreferenceType - name="%CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG" - tooltip="%TOOLTIP_PPAD_CHECKBOX_DEPLOY" - infopop="org.eclipse.jst.ws.creation.ui.PPAD0006" - category="org.eclipse.jst.wss.popup.category" - objectids="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.ejb org.eclipse.jst.ws.creation.ui.wizard.serverwizard.ejb3 org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.file org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.compunit org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.service.bean org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.bean.link" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java"> - </actionDialogPreferenceType> - - <actionDialogPreferenceType - name="%CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG" - tooltip="%TOOLTIP_PPAD_CHECKBOX_SKELETON" - infopop="org.eclipse.jst.ws.creation.ui.PPAD0008" - category="org.eclipse.jst.wss.popup.category" - objectids="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsdl org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.service org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.wsdlres org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.serviceref org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsil" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton"> - </actionDialogPreferenceType> - - <actionDialogPreferenceType - name="%CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG" - tooltip="%TOOLTIP_PPAD_CHECKBOX_PUBLISH" - infopop="org.eclipse.jst.ws.creation.ui.PPAD0009" - category="org.eclipse.jst.wss.popup.category" - objectids="org.eclipse.jst.ws.creation.ui.wizard.publish.file org.eclipse.jst.ws.creation.ui.wizard.publish.service org.eclipse.jst.ws.creation.ui.wizard.publish.wsdlres org.eclipse.jst.ws.creation.ui.wizard.publish.serviceref" - id="org.eclipse.jst.ws.creation.ui.wizard.publish"> - </actionDialogPreferenceType> - - </extension> - - <!-- Popups --> - - <extension - point="org.eclipse.ui.popupMenus"> - - <objectContribution - objectClass="org.eclipse.core.resources.IFile" - nameFilter="*.java" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.file"> - <action - label="%ACTION_DEPLOY_WEBSERVICE" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.jdt.internal.core.CompilationUnit" - nameFilter="*.java" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.compunit"> - <action - label="%ACTION_DEPLOY_WEBSERVICE" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.core.resources.IFile" - nameFilter="*.wsdl" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsdl"> - <action - label="%ACTION_GENERATE_JAVA_SKELETON" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.wst.wsdl.Service" - nameFilter="*" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.service"> - <action - label="%ACTION_GENERATE_JAVA_SKELETON" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="additions" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl" - nameFilter="*" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.wsdlres"> - <action - label="%ACTION_GENERATE_JAVA_SKELETON" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="additions" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef" - nameFilter="*" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.serviceref"> - <action - label="%ACTION_GENERATE_JAVA_SKELETON" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="additions" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean" - nameFilter="*" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.service.bean"> - <action - label="%ACTION_DEPLOY_WEBSERVICE" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="additions" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.jst.j2ee.webservice.wsdd.BeanLink" - nameFilter="*" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.bean.link"> - <action - label="%ACTION_DEPLOY_WEBSERVICE" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="additions" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.core.resources.IFile" - nameFilter="*.wsil" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsil"> - <action - label="%ACTION_GENERATE_JAVA_SKELETON" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions" - id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.core.resources.IFile" - nameFilter="*.wsdl" - id="org.eclipse.jst.ws.creation.ui.wizard.publish.file"> - <action - label="%ACTION_PUBLISH_WSDL" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions" - id="org.eclipse.jst.ws.creation.ui.wizard.publish"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.wst.wsdl.Service" - nameFilter="*" - id="org.eclipse.jst.ws.creation.ui.wizard.publish.service"> - <action - label="%ACTION_PUBLISH_WSDL" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="additions" - id="org.eclipse.jst.ws.creation.ui.wizard.publish"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl" - nameFilter="*" - id="org.eclipse.jst.ws.creation.ui.wizard.publish.wsdlres"> - <action - label="%ACTION_PUBLISH_WSDL" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="additions" - id="org.eclipse.jst.ws.creation.ui.wizard.publish"> - </action> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef" - nameFilter="*" - id="org.eclipse.jst.ws.creation.ui.wizard.publish.serviceref"> - <action - label="%ACTION_PUBLISH_WSDL" - class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard" - menubarPath="additions" - id="org.eclipse.jst.ws.creation.ui.wizard.publish"> - </action> - </objectContribution> - - </extension> - - <!-- Preference Pages --> - - <extension point="org.eclipse.ui.preferencePages"> - <page - name="%PREFERENCE_CATEGORY_SCENARIO_DEFAULTS" - category="org.eclipse.wst.ws.internal.ui.preferences.name" - class="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage" - id="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage"> - </page> - </extension> - - <extension point="org.eclipse.wst.command.env.ui.widgetRegistry"> - <widgetFactory - id="StartServiceServer" - insertBeforeCommandId="org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand" - class="org.eclipse.jst.ws.internal.creation.ui.server.StartServerWidgetFactory"/> - </extension> - - <extension point="org.eclipse.wst.command.env.antScenario"> - <antScenario - class="org.eclipse.jst.ws.internal.creation.ui.ant.AntServiceRootCommandFragment" - scenarioType="service"/> - </extension> - - <extension - point="org.eclipse.wst.command.env.antDataMapping"> - <map - key="InitialSelection" - operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand" - property="InitialSelection" - required="true" - transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/> - <map - key="InitialSelection" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand" - property="ObjectSelection" - required="true" - transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/> - <map - key="Project" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand" - property="Project" - transform="org.eclipse.jst.ws.internal.common.StringToIProjectTransformer"/> - <map - key="ComponentName" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand" - property="ComponentName"/> - <map - key="Service.RuntimeId" - operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand" - property="ServiceTypeRuntimeServer" - transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/> - <map - key="Service.ServerId" - operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand" - property="ServiceTypeRuntimeServer" - transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/> - <map - key="Service.TypeId" - operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand" - property="ServiceTypeRuntimeServer" - transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/> - <map - key="GenerateProxy" - operation="org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand" - property="GenerateProxy"/> - <map - key="Service.RuntimeId" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand" - property="ServiceTypeRuntimeServer" - transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/> - <map - key="Service.ServerId" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand" - property="ServiceTypeRuntimeServer" - transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/> - <map - key="Service.TypeId" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand" - property="ServiceTypeRuntimeServer" - transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/> - - <map - key="ServiceProjectName" - operation="org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand" - property="ServiceProjectName"/> - - <map - key="ServiceProjectName" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand" - property="ServiceProjectName"/> - - <map - key="ServiceComponentName" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand" - property="ServiceComponentName"/> - - <map - key="ServiceEarProjectName" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand" - property="ServiceEarProjectName"/> - - <map - key="ServiceEarComponentName" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand" - property="ServiceEarComponentName"/> - <map - key="Service.RuntimeId" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment" - property="ServiceTypeRuntimeServer" - transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/> - <map - key="Service.ServerId" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment" - property="ServiceTypeRuntimeServer" - transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/> - <map - key="Service.TypeId" - operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment" - property="ServiceTypeRuntimeServer" - transform="org.eclipse.jst.ws.internal.common.String2TypeRuntimeServerModifier"/> - </extension> -</plugin> diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties deleted file mode 100644 index eb7d98c79..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUI.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2004, 2005 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -# -# Wizard pages -# -PAGE_TITLE_OBJECT_SELECTION=Object Selection Page -PAGE_DESC_OBJECT_SELECTION=Object Selection Page - - - diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java deleted file mode 100644 index eb19e8bc6..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/CreationUIMessages.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui; - -import org.eclipse.osgi.util.NLS; - -public final class CreationUIMessages extends NLS { - - private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.creation.ui.CreationUI";//$NON-NLS-1$ - - private CreationUIMessages() { - // Do not instantiate - } - - public static String PAGE_TITLE_OBJECT_SELECTION; - public static String PAGE_DESC_OBJECT_SELECTION; - - static { - NLS.initializeMessages(BUNDLE_NAME, CreationUIMessages.class); - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java deleted file mode 100644 index 58aa105b5..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java +++ /dev/null @@ -1,161 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - * 20060530 144358 kathy@ca.ibm.com - Kathy Chan - * 20060530 144350 kathy@ca.ibm.com - Kathy Chan - * 20060823 154938 pmoogk@ca.ibm.com - Peter Moogk - * 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk - * 20061011 159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line - * 20070501 178129 makandre@ca.ibm.com - Andrew Mak, workspace reports "crash detected" after running WS ant task (cmdline) - * 20080729 241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden - * 20080925 242312 ericdp@ca.ibm.com - Eric D. Peters, Cannot create BUJB WS from Bean in Java project using ANT tasks - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.ant; - -import org.eclipse.jst.ws.internal.consumption.ui.command.AntDefaultingOperation; -import org.eclipse.jst.ws.internal.consumption.ui.command.AntRestoringCommand; -import org.eclipse.jst.ws.internal.consumption.ui.command.AntWorkspaceSaveCommand; -import org.eclipse.jst.ws.internal.consumption.ui.command.ListOptionsCommand; -import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment; -import org.eclipse.jst.ws.internal.consumption.ui.common.ScenarioCleanupCommand; -import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand; -import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand; -import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment; -import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand; -import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; - -/** - * - * Command fragment for generating web service top down or bottom up using Ant task. - * Run headless Eclipse or within workspace using Run as Ant Build. This fragment eliminates any UI specific - * commands and data mappings between commands and widgets. Widget to command mappings are - * replaced by Ant property file to command mappings which are enabled by a antDataMapping extension - * point in the org.eclipse.wst.command.env plugin. - * - * @author joan - * - */ - -public class AntServiceRootCommandFragment extends SequenceFragment -{ - - public AntServiceRootCommandFragment() - { - add( new SimpleFragment( new ScenarioCleanupCommand(), "" )); - add( new SimpleFragment(new ListOptionsCommand(), "")); - add (new SimpleFragment(new AntDefaultingOperation(), "")); - add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), "")); - add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" )); - add( new ObjectSelectionFragment() ); - add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), "")); - add( new SimpleFragment( new ServerExtensionDefaultingCommand(), "")); - add( new ServiceRootFragment() ); - add( new SimpleFragment( new ServerExtensionOutputCommand(), "" )); - add(new FinishFragment()); - add( new SimpleFragment( new AntRestoringCommand(), "" )); - add( new SimpleFragment( new ScenarioCleanupCommand(), "" )); - add( new SimpleFragment( new AntWorkspaceSaveCommand(), "")); - } - - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialComponentName", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "WebServicesParser", ServerExtensionDefaultingCommand.class ); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerExtensionDefaultingCommand.class, "InitialProject", null); - - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class); - - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidgetOutputCommand.class); - - // Map ServerWizardWidgetOutputCommand. - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ObjectSelectionFragment.class, "TypeRuntimeServer", null); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class); - - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployService", ServerExtensionDefaultingCommand.class); - - //Map AntDefaultingFragment - dataRegistry.addMapping(AntDefaultingOperation.class, "ServiceIdsFixed", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(AntDefaultingOperation.class, "ClientIdsFixed", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(AntDefaultingOperation.class, "StartService", PreServiceDevelopCommand.class); - dataRegistry.addMapping(AntDefaultingOperation.class, "InstallService", PreServiceDevelopCommand.class); - dataRegistry.addMapping(AntDefaultingOperation.class, "DeployService", PreServiceDevelopCommand.class); - - // Map ServerRuntimeSelectionWidgetDefaultingCommand - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class); - - - // Map ServerExtensionDefaultingCommand - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerExtensionDefaultingCommand.class, "InitialProject", null); - - // Setup the PreServiceDevelopCommand. - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class); - - dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null); - dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class ); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.class ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null ); - - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DevelopService", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "AssembleService", PreServiceDevelopCommand.class); - - - - dataRegistry.addMapping( ObjectSelectionOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() ); - dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class ); - - // Map ServerExtensionOutputCommand for ServerStart() - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null); - - dataRegistry.addMapping(AntDefaultingOperation.class, "RendererValidation", AntRestoringCommand.class); - - } - -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java deleted file mode 100644 index afd743a70..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java +++ /dev/null @@ -1,164 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner - * 20060330 128827 kathy@ca.ibm.com - Kathy Chan - * 20060524 141925 kathy@ca.ibm.com - Kathy Chan - * 20060529 141422 kathy@ca.ibm.com - Kathy Chan - * 20070509 182274 kathy@ca.ibm.com - Kathy Chan - * 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews - * 20071220 213640 kathy@ca.ibm.com - Kathy Chan - * 20080325 222473 makandre@ca.ibm.com - Andrew Mak, Create EAR version based on the version of modules to be added - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.creation.ui.extension; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentMergeContext; -import org.eclipse.wst.ws.internal.wsrt.IContext; -import org.eclipse.wst.ws.internal.wsrt.IWebService; -import org.eclipse.wst.ws.internal.wsrt.IMerger; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; - -public class PreServiceAssembleCommand extends AbstractDataModelOperation -{ - private IWebService webService_; - private String project_; - private String module_; - private String earProject_; - private String ear_; - private IContext context_; - private IProject initialProject_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment environment = getEnvironment(); - IStatus status = Status.OK_STATUS; - - // For top down scenarios, merge the content of the skeleton files with the previous version stored. - // The Web service extensions triggers the storing of the content of the old skeleton file by - // calling WebServiceInfo.setImplURLs() before the new skeleton is generated in the extension's - // develop() method. - - if (context_.getScenario().getValue() == WebServiceScenario.TOPDOWN) { - PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext(); - IMerger merger = webService_.getWebServiceInfo().getMerger(); - if (mergeContext.isSkeletonMergeEnabled() && merger != null) { - status = merger.merge(monitor, getEnvironment().getStatusHandler()); - if (status.getSeverity() == Status.ERROR) { - environment.getStatusHandler().reportError(status); - return status; - } - } - } - - if (context_.getAssemble()) { - - // Check if EAR module is req'd, ie. !=null - if (earProject_==null) - return Status.OK_STATUS; - - - - //Create the service EAR module - - CreateFacetedProjectCommand command = new CreateFacetedProjectCommand(); - command.setProjectName(earProject_); - command.setTemplateId(IJ2EEModuleConstants.JST_EAR_TEMPLATE); - - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(project_); - command.setRequiredFacetVersions(FacetUtils.getRequiredEARFacetVersions(project)); - - command.setServerFactoryId(webService_.getWebServiceInfo().getServerFactoryId()); - command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId()); - status = command.execute( monitor, adaptable ); - if (status.getSeverity() == Status.ERROR) - { - environment.getStatusHandler().reportError( status ); - return status; - } - - //Associate the service module and service EAR - AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand(); - associateCommand.setProject(project_); - associateCommand.setModule(module_); - associateCommand.setEARProject(earProject_); - associateCommand.setEar(ear_); - associateCommand.setEnvironment( environment ); - status = associateCommand.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - environment.getStatusHandler().reportError(status); - } - - //make sure the ear file has been created. - - if(initialProject_ != null && FacetUtils.isJavaProject(initialProject_)) { - IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject_); - J2EEUtils.addJavaProjectAsUtilityJar(initialProject_, earProject, monitor); - } - - } - return status; - } - - public void setInitialProject(IProject initialProject) - { - initialProject_ = initialProject; - } - - public IProject getInitialProject() - { - return initialProject_; - } - - public void setProject( String project ) - { - project_ = project; - } - - public void setModule( String module ) - { - module_ = module; - } - - public void setEarProject( String earProject ) - { - earProject_ = earProject; - } - - public void setEar( String ear ) - { - ear_ = ear; - } - - public void setWebService( IWebService webService ) - { - webService_ = webService; - } - - public void setContext (IContext context) { - context_ = context; - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java deleted file mode 100644 index 4e557598c..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.creation.ui.extension; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.wsrt.IContext; - -public class PreServiceDeployCommand extends AbstractDataModelOperation -{ - private IContext context_; - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - if (context_.getDeploy()) - { - //If and when there are framework specific deploy things to be done, - //do them here. - } - - return Status.OK_STATUS; - } - - public void setContext(IContext context) - { - context_=context; - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java deleted file mode 100644 index 1c6dd34e7..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java +++ /dev/null @@ -1,358 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - * 20060516 126965 kathy@ca.ibm.com - Kathy Chan - * 20060529 141422 kathy@ca.ibm.com - Kathy Chan - * 20070123 167487 makandre@ca.ibm.com - Andrew Mak - * 20070403 173654 kathy@ca.ibm.com - Kathy Chan - * 20070509 182274 kathy@ca.ibm.com - Kathy Chan - * 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews - * 20071220 213640 kathy@ca.ibm.com - Kathy Chan - * 20080326 221364 kathy@ca.ibm.com - Kathy Chan - * 20080724 241275 pmoogk@ca.ibm.com - Peter Moogk, Validate WSDL before doing major Web service processing. - * 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.creation.ui.extension; - -import java.io.IOException; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion; -import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.TimedWSDLSelectionConditionCommand; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.ILog; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.common.HTTPUtility; -import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.wsrt.IContext; -import org.eclipse.wst.ws.internal.wsrt.IMerger; -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 IProject initialProject_; - - private IWebService webService_; - private String j2eeLevel_; - private ResourceContext resourceContext_; - - private boolean develop_; - private boolean assemble_; - private boolean deploy_; - private boolean install_; - private boolean run_; - private boolean client_; - private boolean test_; - private boolean publish_; - - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IStatus status = Status.OK_STATUS; - if (develop_) { - IEnvironment environment = getEnvironment(); - - // Split up the project and module - int index = module_.indexOf("/"); - if (index!=-1){ - project_ = module_.substring(0,index); - module_ = module_.substring(index+1); - } - - if (ear_!=null && ear_.length()>0) - { - int earIndex = ear_.indexOf("/"); - if (earIndex!=-1) { - earProject_ = ear_.substring(0,earIndex); - ear_ = ear_.substring(earIndex+1); - } - } - - - IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils2.getServiceRuntime( serviceRuntimeId_ ); - WebServiceInfo wsInfo = new WebServiceInfo(); - - wsInfo.setServerFactoryId( typeRuntimeServer_.getServerId() ); - wsInfo.setServerInstanceId( typeRuntimeServer_.getServerInstanceId()); - wsInfo.setState( WebServiceState.UNKNOWN_LITERAL ); - wsInfo.setWebServiceRuntimeId( typeRuntimeServer_.getRuntimeId() ); - - environment.getLog().log(ILog.INFO, "ws_framework", 5107, this, "PreServiceDevelopCommand", "serviceRuntimeId_ = "+ serviceRuntimeId_); - ServiceRuntimeDescriptor serviceRuntimeDescriptor = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_); - IMerger merger = serviceRuntimeDescriptor.getServiceImplementationType().getMergerClass(); - wsInfo.setMerger(merger); - - webService_ = wsrt.getWebService( wsInfo ); - - //Set up the IContext - WebServiceScenario scenario = null; - int scenarioInt = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeRuntimeServer_.getTypeId()); - if (scenarioInt == WebServiceScenario.BOTTOMUP) - { - scenario = WebServiceScenario.BOTTOMUP_LITERAL; - String impl = (String)(selection_.getSelection())[0]; - wsInfo.setImplURL(impl); - } - else if (scenarioInt == WebServiceScenario.TOPDOWN) - { - scenario = WebServiceScenario.TOPDOWN_LITERAL; - String wsdlURL = (String)(selection_.getSelection())[0]; - - // check for redirection in the wsdl - HTTPUtility httpUtil = new HTTPUtility(); - String newWsdlURL = httpUtil.handleRedirect(wsdlURL); - - wsInfo.setWsdlURL( newWsdlURL ); - - // Validate the url before proceeding. - TimedWSDLSelectionConditionCommand timedCmd = new TimedWSDLSelectionConditionCommand(); - WebServicesParser parser = WSDLParserFactory.getWSDLParser(); - - timedCmd.setWebServicesParser( parser ); - timedCmd.setWebServiceURI( newWsdlURL ); - timedCmd.execute( null, null ); - - WebServiceEntity entity = parser.getWebServiceEntityByURI( newWsdlURL ); - - if( entity == null || entity.getType() != WebServiceEntity.TYPE_WSDL ) - { - // This isn't a wsdl file - status = StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL ); - environment.getStatusHandler().reportError( status ); - return status; - } - } - - context_ = new SimpleContext(develop_, assemble_, deploy_, install_, run_, client_, test_, publish_, - scenario, - resourceContext_.isOverwriteFilesEnabled(), - resourceContext_.isCreateFoldersEnabled(), - resourceContext_.isCheckoutFilesEnabled()); - - // Create the service module if needed. - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(project_); - RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRequiredFacetVersions(); - if (!project.exists()) - { - boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, moduleType_); - if (matches) - { - CreateFacetedProjectCommand command = new CreateFacetedProjectCommand(); - command.setProjectName(project_); - command.setTemplateId(moduleType_); - command.setRequiredFacetVersions(rfv); - command.setServerFactoryId(typeRuntimeServer_.getServerId()); - command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId()); - command.setEarProjectName(earProject_); - status = command.execute( monitor, adaptable ); - if (status.getSeverity() == Status.ERROR) - { - environment.getStatusHandler().reportError( status ); - return status; - } - } - } else { - // add facets required by Web service runtime - if (rfv.length != 0) { - status = FacetUtils.addRequiredFacetsToProject(project, rfv, monitor); - if (status.getSeverity() == Status.ERROR) - { - environment.getStatusHandler().reportError( status ); - return status; - } - } - } - - - if(initialProject_ != null && FacetUtils.isJavaProject(initialProject_)){ - J2EEUtils.addJavaProjectAsUtilityJar(initialProject_, project, monitor); - try{ - String uri = initialProject_.getName() + ".jar"; - J2EEUtils.addJAROrModuleDependency(project, uri); - } catch (CoreException ce){ - String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()}); - IStatus errorStatus = StatusUtils.errorStatus(errorMessage); - environment.getStatusHandler().reportError(errorStatus); - } catch (IOException ioe){ - String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()}); - IStatus errorStatus = StatusUtils.errorStatus(errorMessage); - environment.getStatusHandler().reportError(errorStatus); - } - } - } - return status; - - } - - public void setServiceTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer ) - { - typeRuntimeServer_ = typeRuntimeServer; - } - - public void setServiceRuntimeId(String id) - { - serviceRuntimeId_ = id; - } - - public void setServiceJ2EEVersion( String j2eeLevel ) - { - j2eeLevel_ = j2eeLevel; - } - - public String getJ2eeLevel() - { - return j2eeLevel_; - } - - public IWebService getWebService() - { - return webService_; - } - - public IContext getContext() - { - return context_; - } - - public void setResourceContext( ResourceContext resourceContext ) - { - resourceContext_ = resourceContext; - } - - public ISelection getSelection() - { - return selection_; - } - - public void setSelection( ISelection selection ) - { - selection_ = selection; - } - - public String getProject() - { - return project_; - } - - public String getModule() - { - return module_; - } - - public void setModule( String module ) - { - module_ = module; - } - - public void setModuleType(String type) - { - moduleType_ = type; - } - - public String getEarProject() - { - return earProject_; - } - - public String getEar() - { - return ear_; - } - - public void setEar( String ear ) - { - ear_ = ear; - } - - public void setInstallService(boolean installService) - { - install_ = installService; - } - - public void setDevelopService(boolean developService) { - develop_ = developService; - } - - public void setAssembleService(boolean assembleService) { - assemble_ = assembleService; - } - - public void setDeployService(boolean deployService) { - deploy_ = deployService; - } - - public void setStartService(boolean startService) - { - run_ = startService; - } - - public void setTestService(boolean testService) - { - test_ = testService; - } - - public void setPublishService(boolean publishService) - { - publish_ = publishService; - } - - public void setGenerateProxy(boolean genProxy) - { - client_ = genProxy; - } - - public void setInitialProject(IProject initialProject) - { - initialProject_ = initialProject; - } - - public IProject getInitialProject() - { - return initialProject_; - } - -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java deleted file mode 100644 index d75896df9..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java +++ /dev/null @@ -1,146 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20070815 199626 kathy@ca.ibm.com - Kathy Chan - * 20071130 203826 kathy@ca.ibm.com - Kathy Chan - * 20080425 220985 - Trung, Server is recreated when prev publish failed - * 20080429 220985 trungha@ca.ibm.com - Trung Ha - * 20080520 233065 makandre@ca.ibm.com - Andrew Mak, Server not found error in Web service generation - *******************************************************************************/ - -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.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.ws.internal.wsrt.IContext; -import org.eclipse.wst.ws.internal.wsrt.IWebService; - -public class PreServiceInstallCommand extends AbstractDataModelOperation -{ - private IWebService webService_; - private String project_; - private String module_; - private String earProject_; - private String ear_; - private IContext context_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - if (context_.getInstall()) - { - IEnvironment environment = getEnvironment(); - - if (webService_.getWebServiceInfo().getServerInstanceId()==null) - { - // Attempt to find a server instance in the workspace matching - // the server id of the webService_ - // If we can find one, we don't need to create a new server. - IServer[] allServers = ServerCore.getServers(); - if (allServers != null && allServers.length > 0) { - for (int i = 0; i < allServers.length; i++) { - IServer oneServer = allServers[i]; - if (oneServer.getServerType().getId().equals( - webService_.getWebServiceInfo().getServerFactoryId())) { - - webService_.getWebServiceInfo().setServerInstanceId(oneServer.getId()); - webService_.getWebServiceInfo().setServerCreated(true); - } - } - } - // Cannot find an appropriate server, so we will create one - if (webService_.getWebServiceInfo().getServerInstanceId() == null) { - CreateServerCommand createServerCommand = new CreateServerCommand(); - createServerCommand.setServerFactoryid(webService_ - .getWebServiceInfo().getServerFactoryId()); - createServerCommand.setServerRuntimeId(webService_ - .getWebServiceInfo().getServerRuntimeId()); - createServerCommand.setEnvironment(environment); - IStatus createServerStatus = createServerCommand.execute( - monitor, null); - if (createServerStatus.getSeverity() == Status.OK) { - webService_.getWebServiceInfo().setServerInstanceId( - createServerCommand.getServerInstanceId()); - webService_.getWebServiceInfo().setServerCreated(true); - } else { - if (createServerStatus.getSeverity() == Status.ERROR) { - environment.getStatusHandler().reportError( - createServerStatus); - } - return createServerStatus; - } - } - } - - - - AddModuleToServerCommand command = new AddModuleToServerCommand(); - command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId()); - if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0) - { - command.setProject(earProject_); - command.setModule(ear_); - } - else - { - command.setProject(project_); - command.setModule(module_); - } - - command.setEnvironment( environment ); - IStatus status = command.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - environment.getStatusHandler().reportError(status); - } - return status; - } - return Status.OK_STATUS; - } - - public void setProject( String project ) - { - project_ = project; - } - - public void setModule( String module ) - { - module_ = module; - } - - public void setEarProject( String earProject ) - { - earProject_ = earProject; - } - - public void setEar( String ear ) - { - ear_ = ear; - } - - public void setWebService( IWebService webService ) - { - webService_ = webService; - } - - public void setContext(IContext context) - { - context_=context; - } - -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java deleted file mode 100644 index b758bca54..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.creation.ui.extension; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.wsrt.IContext; -import org.eclipse.wst.ws.internal.wsrt.IWebService; - -public class PreServiceRunCommand extends AbstractDataModelOperation -{ - private IWebService webService_; - private IContext context_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IStatus status = Status.OK_STATUS; - if (context_.getRun()) - { - IEnvironment environment = getEnvironment(); - - StartServerCommand command = new StartServerCommand(); - command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId()); - command.setEnvironment( environment ); - status = command.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - environment.getStatusHandler().reportError(status); - } - } - - return status; - } - - public void setWebService( IWebService webService ) - { - webService_ = webService; - } - - public void setContext (IContext context) - { - context_ = context; - } - -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java deleted file mode 100644 index d6e853a9d..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java +++ /dev/null @@ -1,122 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - * 20060331 128827 kathy@ca.ibm.com - Kathy Chan - * 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.creation.ui.extension; - -import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand; -import org.eclipse.wst.ws.internal.extensions.AssembleServiceFragment; -import org.eclipse.wst.ws.internal.extensions.DeployServiceFragment; -import org.eclipse.wst.ws.internal.extensions.DevelopServiceFragment; -import org.eclipse.wst.ws.internal.extensions.InstallServiceFragment; -import org.eclipse.wst.ws.internal.extensions.RunServiceFragment; - -public class ServiceRootFragment extends SequenceFragment -{ - public ServiceRootFragment() - { - add( new SimpleFragment( new PreServiceDevelopCommand(), "" ) ); - add( new DevelopServiceFragment() ); - add( new SimpleFragment( new PreServiceAssembleCommand(), "" ) ); - add( new AssembleServiceFragment() ); - add( new SimpleFragment( new PreServiceDeployCommand(), "" ) ); - add( new DeployServiceFragment() ); - add( new SimpleFragment( new PreServiceInstallCommand(), "" ) ); - add( new InstallServiceFragment() ); - add( new SimpleFragment( new PreServiceRunCommand(), - "org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand" ) ); - add( new RunServiceFragment() ); - } - - public void registerDataMappings(DataMappingRegistry registry) - { - //Mappings from framework to extension fragments - registry.addMapping( PreServiceDevelopCommand.class, "WebService", DevelopServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Environment", DevelopServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Context", DevelopServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Selection", DevelopServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Project", DevelopServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Module", DevelopServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DevelopServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Ear", DevelopServiceFragment.class ); - - // Map the PreServiceDevelopCommand into the dataObject and the PreClientDevelopCommand. - registry.addMapping( PreServiceDevelopCommand.class, "WebService", DataObjectCommand.class, "DataObject", null ); - registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreClientDevelopCommand.class, "DataObject", null ); - - registry.addMapping( PreServiceDevelopCommand.class, "WebService", AssembleServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Environment", AssembleServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Context", AssembleServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Selection", AssembleServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Project", AssembleServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Module", AssembleServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "EarProject", AssembleServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Ear", AssembleServiceFragment.class ); - - registry.addMapping( PreServiceDevelopCommand.class, "WebService", DeployServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Environment", DeployServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Context", DeployServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Selection", DeployServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Project", DeployServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Module", DeployServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DeployServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Ear", DeployServiceFragment.class ); - - registry.addMapping( PreServiceDevelopCommand.class, "WebService", InstallServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Environment", InstallServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Context", InstallServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Selection", InstallServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Project", InstallServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Module", InstallServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "EarProject", InstallServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Ear", InstallServiceFragment.class ); - - registry.addMapping( PreServiceDevelopCommand.class, "WebService", RunServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Environment", RunServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Context", RunServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Selection", RunServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Project", RunServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Module", RunServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "EarProject", RunServiceFragment.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Ear", RunServiceFragment.class ); - - //Mappings from framework to framework commands - registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "InitialProject", PreServiceAssembleCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceAssembleCommand.class ); - - registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceDeployCommand.class ); - - registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceInstallCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceInstallCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceInstallCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceInstallCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceInstallCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceInstallCommand.class ); - - registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceRunCommand.class ); - registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceRunCommand.class ); - - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java deleted file mode 100644 index 47b8a0b83..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu - * 20060504 138118 joan@ca.ibm.com - Joan Haggarty - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.plugin; - -import java.net.URL; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Plugin; -import org.eclipse.jface.resource.ImageDescriptor; - - -/** -* This is the plugin class for the Web Services Creation UI plugin. -* <p> -* The Web Services Creation UI plugin's sole function is to add -* user interface of the Web Services Creation Wizard, contained in -* the org.eclipse.jst.ws.ui plugin. -*/ -public class WebServiceCreationUIPlugin extends Plugin -{ - - /** - * The identifier of the descriptor of this plugin in plugin.xml. - */ - public static final String ID = "org.eclipse.jst.ws.creation.ui"; - - /** - * The reference to the singleton instance of this plugin. - */ - private static WebServiceCreationUIPlugin instance_; - - /** - * Constructs a runtime plugin object for this plugin. - * The "plugin" element in plugin.xml should include the attribute - * class = "org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin". - * @param descriptor The descriptor of this plugin. - */ - public WebServiceCreationUIPlugin () - { - super(); - instance_ = this; - } - - /** - * Returns the singleton instance of this plugin. Equivalent to calling - * (WebServiceCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.creation.ui"); - * @return The WebServiceCreationUIPlugin singleton. - */ - public static WebServiceCreationUIPlugin getInstance () - { - return instance_; - } - - /** - * Returns an image descriptor for the named resource - * as relative to the plugin install location. - * @return An image descriptor, possibly null. - */ - public static ImageDescriptor getImageDescriptor ( String name ) - { - try - { - URL imageURL = FileLocator.find(instance_.getBundle(), new Path("$nl$/"+name), null); - return ImageDescriptor.createFromURL(imageURL); - } - catch (Exception e) - { - return null; - } - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java deleted file mode 100644 index 34e09f1ab..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java +++ /dev/null @@ -1,155 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060417 136391 joan@ca.ibm.com - Joan Haggarty - * 20060529 141422 kathy@ca.ibm.com - Kathy Chan - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.preferences; - -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; - - - -/** - * - */ -public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage -{ - private ServerWizardWidget serverWidget_ = null; - - public void init(IWorkbench workbench) { } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ - - protected Control createContents(Composite parent) - { - UIUtils utils = new UIUtils(null); - - Composite page = utils.createComposite( parent, 1 ); - - serverWidget_ = new ServerWizardWidget( false, true ); - serverWidget_.addControls( page, new Listener() - { - public void handleEvent( Event evt ){} - } ); - initializeValues(); - serverWidget_.disableNonPreferenceWidgets(); - applyDialogFont(page); - return page; - } - - private void initializeValues() - { - ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext(); - - // Set values from context. - TypeRuntimeServer serverIds = new TypeRuntimeServer(); - TypeRuntimeServer clientIds = new TypeRuntimeServer(); - - serverIds.setTypeId( context.getWebServiceType() ); - clientIds.setTypeId( context.getClientWebServiceType() ); - - serverWidget_.setServiceTypeRuntimeServer( serverIds ); - serverWidget_.setClientTypeRuntimeServer( clientIds ); - //jvh serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxy()) ); - serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorer()) ); - serverWidget_.setInstallService( new Boolean(context.getInstallWebService()) ); - serverWidget_.setInstallClient( new Boolean(context.getInstallClient()) ); - serverWidget_.setStartService( new Boolean(context.getStartWebService()) ); - serverWidget_.setTestService( new Boolean(context.getTestWebService()) ); - serverWidget_.setTestClient( new Boolean(context.getTestWebService()) ); - serverWidget_.setMonitorService(new Boolean(context.getMonitorWebService())); - serverWidget_.setServiceGeneration(context.getGenerateWebService()); //jvh - serverWidget_.setClientGeneration(context.getGenerateClient()); //jvh - serverWidget_.internalize(); - } - - /** - * Does anything necessary because the default button has been pressed. - */ - protected void performDefaults() - { - super.performDefaults(); - setToDefaults(); - } - - private void setToDefaults() - { - ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext(); - - // Set values from context. - TypeRuntimeServer serverIds = new TypeRuntimeServer(); - TypeRuntimeServer clientIds = new TypeRuntimeServer(); - - serverIds.setTypeId( context.getWebServiceTypeDefault() ); - clientIds.setTypeId( context.getClientWebServiceTypeDefault() ); - - serverWidget_.setServiceTypeRuntimeServer( serverIds ); - serverWidget_.setClientTypeRuntimeServer( clientIds ); - serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorerDefault()) ); - serverWidget_.setInstallService( new Boolean(context.getInstallWebServiceDefault()) ); - serverWidget_.setInstallClient( new Boolean(context.getInstallClientDefault()) ); - serverWidget_.setStartService( new Boolean(context.getStartWebServiceDefault()) ); - serverWidget_.setTestService( new Boolean(context.getTestWebServiceDefault()) ); - serverWidget_.setTestClient( new Boolean(context.getTestWebServiceDefault()) ); - serverWidget_.setMonitorService(new Boolean(context.getMonitorWebServiceDefault())); - serverWidget_.setServiceGeneration(context.getGenerateWebServiceDefault()); //jvh - serverWidget_.setClientGeneration(context.getGenerateClientDefault()); //jvh - serverWidget_.internalize(); - } - - /** - * Do anything necessary because the OK button has been pressed. - * @return whether it is okay to close the preference page - */ - public boolean performOk() - { - storeValues(); - return true; - } - - private void storeValues() - { - ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext(); - - TypeRuntimeServer serverIds = serverWidget_.getServiceTypeRuntimeServer(); - TypeRuntimeServer clientIds = serverWidget_.getClientTypeRuntimeServer(); - - context.setWebServiceType( serverIds.getTypeId() ); - context.setClientWebServiceType( clientIds.getTypeId() ); - context.setGenerateProxy( serverWidget_.getGenerateProxy().booleanValue() ); - context.setLaunchWebServiceExplorer( serverWidget_.getPublishService().booleanValue() ); - context.setInstallWebService( serverWidget_.getInstallService().booleanValue() ); - context.setInstallClient( serverWidget_.getInstallClient().booleanValue() ); - context.setStartWebService( serverWidget_.getStartService().booleanValue() ); - context.setTestWebService( serverWidget_.getTestService().booleanValue() ); - context.setMonitorWebService(serverWidget_.getMonitorService().booleanValue()); - context.setGenerateWebService(serverWidget_.getServiceGeneration()); - context.setGenerateClient(serverWidget_.getClientGeneration()); - } - - protected void performApply() - { - performOk(); - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java deleted file mode 100644 index fc96c1c97..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.creation.ui.server; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.server.StartServerWidget; -import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.server.core.IServer; - -public class StartServerWidgetContributor implements INamedWidgetContributor -{ - private IServer server_; - - public StartServerWidgetContributor( IServer server ) - { - server_ = server; - } - - public String getDescription() - { - return ConsumptionUIMessages.PAGE_DESC_WS_START_SERVER; - } - - public String getName() - { - return ""; - } - - public String getTitle() - { - return ConsumptionUIMessages.PAGE_TITLE_WS_START_SERVER; - } - - public WidgetContributorFactory getWidgetContributorFactory() - { - return new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new StartServerWidget( server_ ); - } - }; - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java deleted file mode 100644 index 98717b1a5..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060529 141422 kathy@ca.ibm.com - Kathy Chan - * 20070328 173345 pmoogk@ca.ibm.com - Peter Moogk, Peek next page problem - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.creation.ui.server; - -import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.ws.internal.wsrt.IContext; -import org.eclipse.wst.ws.internal.wsrt.IWebService; - -public class StartServerWidgetFactory implements INamedWidgetContributorFactory -{ - private IWebService webservice_; - private IContext context_; - - public INamedWidgetContributor getFirstNamedWidget() - { - IServer server = null; - - if( webservice_ != null && context_.getRun()) - { - String instanceId = webservice_.getWebServiceInfo().getServerInstanceId(); - - if( instanceId != null && instanceId.length() > 0 ) - { - server = ServerCore.findServer( instanceId ); - } - } - - if( server != null && server.getServerState() != IServer.STATE_STARTED ) - { - return new StartServerWidgetContributor( server ); - } - - return null; - } - - public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) - { - return null; - } - - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", StartServerWidgetFactory.class ); - dataRegistry.addMapping( PreServiceDevelopCommand.class, "Context", StartServerWidgetFactory.class ); - } - - public void setWebService( IWebService webservice ) - { - webservice_ = webservice; - } - public void setContext ( IContext context ) - { - context_ = context; - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java deleted file mode 100644 index fcc1d3bfb..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java +++ /dev/null @@ -1,1703 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060407 135415 rsinha@ca.ibm.com - Rupam Kuehner - * 20060407 135443 joan@ca.ibm.com - Joan Haggarty - * 20060410 135442 kathy@ca.ibm.com - Kathy Chan - * 20060410 135441 joan@ca.ibm.com - Joan Haggarty - * 20060410 135562 joan@ca.ibm.com - Joan Haggarty - * 20060411 136167 kathy@ca.ibm.com - Kathy Chan - * 20060417 136390/136391/136159 joan@ca.ibm.com - Joan Haggarty - * 20060413 135581 rsinha@ca.ibm.com - Rupam Kuehner - * 20060420 136158 rsinha@ca.ibm.com - Rupam Kuehner - * 20060420 136705 rsinha@ca.ibm.com - Rupam Kuehner - * 20060420 136182 kathy@ca.ibm.com - Kathy Chan - * 20060420 137820 rsinha@ca.ibm.com - Rupam Kuehner - * 20060420 135912 joan@ca.ibm.com - Joan Haggarty - * 20060421 136761 rsinha@ca.ibm.com - Rupam Kuehner - * 20060424 138052 kathy@ca.ibm.com - Kathy Chan - * 20060425 137831 rsinha@ca.ibm.com - Rupam Kuehner - * 20060426 138519 joan@ca.ibm.com - Joan Haggarty - * 20060427 138058 joan@ca.ibm.com - Joan Haggarty - * 20060504 138035 joan@ca.ibm.com - Joan Haggarty - * 20060524 142276 joan@ca.ibm.com - Joan Haggarty - * 20060529 141422 kathy@ca.ibm.com - Kathy Chan - * 20060605 145081 joan@ca.ibm.com - Joan Haggarty - * 20060607 144826 joan@ca.ibm.com - Joan Haggarty - * 20060607 144049 joan@ca.ibm.com - Joan Haggarty - * 20060614 146270 joan@ca.ibm.com - Joan Haggarty - * 20060616 147317 joan@ca.ibm.com - Joan Haggarty - * 20060717 150577 makandre@ca.ibm.com - Andrew Mak - * 20060726 150865 sengpl@ca.ibm.com - Seng Phung-Lu - * 20060803 152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow - * 20060817 140017 makandre@ca.ibm.com - Andrew Mak, longer project or server/runtime strings do not resize wizard - * 20060825 135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page - * 20060829 155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize - * 20060830 155114 pmoogk@ca.ibm.com - Peter Moogk, Updated patch for this defect. - * 20060831 155441 makandre@ca.ibm.com - Andrew Mak, Small tweak for this bug - * 20061003 159142 kathy@ca.ibm.com - Kathy Chan - * 20061212 164177 makandre@ca.ibm.com - Andrew Mak, Incorrect validation error complaining about runtime not supporting a project type - * 20061212 159911 makandre@ca.ibm.com - Andrew Mak, changing service definition resets some configuration fields - * 20070205 172687 makandre@ca.ibm.com - Andrew Mak, NPE in Scencario Defaults preferences page - * 20071130 203826 kathy@ca.ibm.com - Kathy Chan - * 20080205 170141 kathy@ca.ibm.com - Kathy Chan - * 20080215 216337 pmoogk@ca.ibm.com - Peter Moogk - * 20080301 221034 kathy@ca.ibm.com - Kathy Chan - * 20080312 147442 trungha@ca.ibm.com - Trung Ha - * 20080318 213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client) - * 20080326 198439 kathy@ca.ibm.com - Kathy Chan - * 20080402 198439 kathy@ca.ibm.com - Kathy Chan - * 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews - * 20080417 227599 kathy@ca.ibm.com - Kathy Chan - * 20080613 236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference - * 20090926 248448 mahutch@ca.ibm.com - Mark Hutchinson, Should not resize WS Wizard for long WSDL file names - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets; - - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.window.Window; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.common.DefaultingUtils; -import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.IObjectSelectionLaunchable; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ProjectSelectionDialog; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.IObjectSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionRegistry; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.Timer; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin; -import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.data.LabelsAndIds; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.SWT; -import org.eclipse.swt.accessibility.Accessible; -import org.eclipse.swt.accessibility.AccessibleAdapter; -import org.eclipse.swt.accessibility.AccessibleControlAdapter; -import org.eclipse.swt.accessibility.AccessibleControlEvent; -import org.eclipse.swt.accessibility.AccessibleEvent; -import org.eclipse.swt.events.ControlEvent; -import org.eclipse.swt.events.ControlListener; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Scale; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.forms.HyperlinkGroup; -import org.eclipse.ui.forms.HyperlinkSettings; -import org.eclipse.ui.forms.events.HyperlinkEvent; -import org.eclipse.ui.forms.events.IHyperlinkListener; -import org.eclipse.ui.forms.widgets.Hyperlink; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; - -public class ServerWizardWidget extends SimpleWidgetDataContributor implements Runnable, IPackable { - - //INFOPOPS - /* CONTEXT_ID WSWSCEN0001 for the Scenario Page */ - private String INFOPOP_WSWSCEN_PAGE = "WSWSCEN0001"; - /* CONTEXT_ID WSWSCEN0010 for the Web Service Type combo box of the Scenario Page */ - private String INFOPOP_WSWSCEN_COMBO_SERVICETYPE = "WSWSCEN0010"; - /* CONTEXT_ID WSWSCEN0014 for the monitor service checkbox of the Scenario page */ - private String INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE = "WSWSCEN0014"; - /* CONTEXT_ID WSWSCEN0012 for the Launch UDDI check box of the Scenario Page */ - private String INFOPOP_WSWSCEN_CHECKBOX_LAUNCH_WS = "WSWSCEN0012"; - /* CONTEXT_ID WSWSCEN0020 for the Service Implemenation text field of the Scenario Page */ - private String INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL = "WSWSCEN0020"; - /* CONTEXT_ID WSWSCEN0021 for theService Slider of the Scenario Page */ - private String INFOPOP_WSWSCEN_SCALE_SERVICE = "WSWSCEN0021"; - /* CONTEXT_ID WSWSCEN0022 for the Server hyperlink of the Scenario Page */ - private String INFOPOP_WSWSCEN_HYPERLINK_SERVER = "WSWSCEN0022"; - /* CONTEXT_ID WSWSCEN0023 for the Runtime hyperlink of the Scenario Page */ - private String INFOPOP_WSWSCEN_HYPERLINK_RUNTIME = "WSWSCEN0023"; - /* CONTEXT_ID WSWSCEN0024 for theProjects hyperlink of the Scenario Page */ - private String INFOPOP_WSWSCEN_HYPERLINK_PROJECTS = "WSWSCEN0024"; - /* CONTEXT_ID WSWSCEN0030 for the Overwrite Files checkbox of the Scenario Page */ - private String INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE = "WSWSCEN0030"; - - private ScaleSelectionListener scaleSelectionListener = new ScaleSelectionListener(); - private Listener statusListener_; - private ModifyListener objectModifyListener_ ; - private int validationState_; - boolean validObjectSelection_ = true; - - private ImageRegistry imageReg_; - - private TypeRuntimeServer ids_; - private LabelsAndIds labelIds_; - private String serviceProjectName_; - private IProject initialProject_; - private String serviceEarProjectName_; - private String serviceComponentType_; - private WebServicesParser parser_; - private boolean needEar_; - - private boolean developService_; - private boolean assembleService_; - private boolean deployService_; - - private IStructuredSelection objectSelection_; - private Boolean testService_; - private Boolean startService_; - private Boolean installService_; - - private boolean displayPreferences_; - private boolean preferencesPage_; - - private Composite groupComposite_; - private Composite hCompService_; - private WebServiceClientTypeWidget clientWidget_; - private Label serviceLabel_; - private Combo webserviceType_; - private Text serviceImpl_; - private Scale serviceScale_; - private Label topologySpot_; - private Button browseButton_; - private Button publishButton_; - private Button monitorButton_; - private Button overwriteButton_; - private ServiceImplSelectionDialog browseDialog_; - private ProjectSelectionDialog projectDialog_; - private Hyperlink hLinkServiceRuntime_; - private Hyperlink hLinkServiceServer_; - private Hyperlink hLinkServiceProject_; - private Hyperlink hLinkServiceEAR_; - - private Object objectSelectionWidget_; //may be IObjectSelectionLaunchable or IObjectSelectionWidget - - private ResourceContext resourceContext_; - - private Timer timer_ = null; - - private UIUtils utils_ = new UIUtils("org.eclipse.jst.ws.creation.ui"); - - private boolean forceRefreshRuntime = false; - - private String GRAPHIC_SERVICE_0="icons/service_test.jpg"; //$NON-NLS-N$ - private String GRAPHIC_SERVICE_1="icons/service_run.jpg"; //$NON-NLS-N$ - private String GRAPHIC_SERVICE_2="icons/service_install.jpg"; //$NON-NLS-N$ - private String GRAPHIC_SERVICE_3="icons/service_deploy.jpg"; //$NON-NLS-N$ - private String GRAPHIC_SERVICE_4="icons/service_assemble.jpg"; //$NON-NLS-N$ - private String GRAPHIC_SERVICE_5="icons/service_develop.jpg"; //$NON-NLS-N$ - - private String ICON_SCALE_BG_0="icons/scale0_bground.jpg"; //$NON-NLS-N$ - private String ICON_SCALE_BG_1="icons/scale1_bground.jpg"; //$NON-NLS-N$ - private String ICON_SCALE_BG_2="icons/scale2_bground.jpg"; //$NON-NLS-N$ - private String ICON_SCALE_BG_3="icons/scale3_bground.jpg"; //$NON-NLS-N$ - private String ICON_SCALE_BG_4="icons/scale4_bground.jpg"; //$NON-NLS-N$ - private String ICON_SCALE_BG_5="icons/scale5_bground.jpg"; //$NON-NLS-N$ - private String ICON_SCALE_BG_6="icons/scale6_bground.jpg"; //$NON-NLS-N$ - - private String SERVICE_RUNTIME_PREFIX = ConsumptionUIMessages.LABEL_RUNTIMES_LIST ; - private String SERVICE_SERVER_PREFIX = ConsumptionUIMessages.LABEL_SERVERS_LIST; - private String SERVICE_PROJECT_PREFIX = ConsumptionUIMessages.LABEL_SERVICE_PROJECT; - private String SERVICE_EAR_PREFIX = ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT; - - /** - * @param displayPreferences Set to true if preferences such as overwrite should be displayed on the wizard page - * @param prefPage Set to true if the widget is being used on the preferences page. Alters widget layout. - */ - public ServerWizardWidget(boolean displayPreferences, boolean prefPage) { - displayPreferences_ = displayPreferences; - preferencesPage_ = prefPage; - initImageRegistry(); - validationState_ = ValidationUtils.VALIDATE_ALL; - } - - private Composite serviceComposite_; - - /** - * Run this ServerWizardWidget, which validates the entry field values. - */ - public void run() { - - // do minimal check here, this call will determine if we at least - // have a "validObjectSelection_" - checkServiceImplTextStatus(); - - if (validObjectSelection_) - { - boolean refreshRuntime = (getWebServiceScenario() != WebServiceScenario.TOPDOWN); - - if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable) - { - IObjectSelectionLaunchable launchable = (IObjectSelectionLaunchable)objectSelectionWidget_; - callObjectTransformation(launchable.getObjectSelection(), launchable.getProject(), launchable.getComponentName(), refreshRuntime); - } - else - { - IObjectSelectionWidget widget = (IObjectSelectionWidget)objectSelectionWidget_; - callObjectTransformation(widget.getObjectSelection(), widget.getProject(), widget.getComponentName(), refreshRuntime); - } - } - else - setObjectSelection(null); - - // do full validation after all transformations and calculations have occurred - validationState_ = ValidationUtils.VALIDATE_ALL; - statusListener_.handleEvent(null); - } - - /** - * Pack this widget and the client-side widget as well. - */ - private void packSelf() { - // don't need to call packIt(), since clientWidget_ has a callback to packIt() already. - clientWidget_.packIt(); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable#packIt() - */ - public void packIt() { - groupComposite_.pack(true); - utils_.horizontalResize(groupComposite_.getShell(), groupComposite_, UIUtils.DEFAULT_PADDING); - } - - public WidgetDataEvents addControls(Composite parent, - Listener statusListener) { - - statusListener_ = statusListener; - utils_.createInfoPop(parent, INFOPOP_WSWSCEN_PAGE); - - Composite typeComposite = utils_.createComposite(parent, 3); - - webserviceType_ = utils_.createCombo(typeComposite, - ConsumptionUIMessages.LABEL_WEBSERVICETYPE, - ConsumptionUIMessages.TOOLTIP_PWPR_COMBO_TYPE, - INFOPOP_WSWSCEN_COMBO_SERVICETYPE, SWT.SINGLE | SWT.BORDER - | SWT.READ_ONLY); - GridData gdata1 = (GridData) webserviceType_.getLayoutData(); - gdata1.horizontalSpan = 2; - webserviceType_.setLayoutData(gdata1); - - webserviceType_.addSelectionListener(new SelectionListener(){ - public void widgetDefaultSelected(SelectionEvent e) {} - - public void widgetSelected(SelectionEvent e) { - String oldTypeId = ids_.getTypeId(); - int currentSelectionIdx = webserviceType_.getSelectionIndex(); - String currentTypeId = labelIds_.getIds_()[currentSelectionIdx]; - if (!oldTypeId.equals(currentTypeId)) { - ids_.setTypeId(currentTypeId); - - // don't need to refresh runtime or validate fields if we are on the preference page, just return - if (preferencesPage_) - return; - - int oldScenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(oldTypeId); - int currentScenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(currentTypeId); - - objectSelectionWidget_ = getSelectionWidget(); - // change the label for the service - // implementation/definition based on the web service type - handleTypeChange(); - - // After bug 159911, we will not refresh the runtime in TOPDOWN scenario unless we absolutely - // have to. Therefore, if we are switching from another scenario type, we should check if the - // current selections are valid for this TOPDOWN scenario, if not, try to pick a more suitable - // runtime. - if (currentScenario == WebServiceScenario.TOPDOWN) { - validationState_ = ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES; - - // this will force a refresh the next time the wsdl is changed - forceRefreshRuntime = !checkErrorStatus().isOK(); - } - - //if the web service type change is from one top-down type to another - //top-down type leave the object selection field in tact and refresh - //the server/runtime project defaulting. - //Otherwise clear the object selection field since it's value is not valid anymore - if (oldScenario==WebServiceScenario.TOPDOWN && currentScenario==WebServiceScenario.TOPDOWN) - { - // if switching from one TOPDOWN scenario to another TOPDOWN scenario and - // we've determined that the current runtime selection is not suitable, we - // can refresh the runtime now (don't need to wait for the next time the - // wsdl is changed). - if (forceRefreshRuntime) { - refreshServerRuntimeSelection(); - forceRefreshRuntime = false; - } - } - else - { - //clear the object selection field - // serviceImpl may be null if on the preferences page - if (serviceImpl_ != null) - { - serviceImpl_.removeModifyListener(objectModifyListener_); - serviceImpl_.setText(""); - setObjectSelection(null); - serviceImpl_.addModifyListener(objectModifyListener_); - } - } - validationState_ = ValidationUtils.VALIDATE_ALL; - statusListener_.handleEvent(null); - - } - } - - }); - - // Create text field and browse for object selection if not on preferences page - if (!preferencesPage_) - { - //text of this label is based on the web service type selected in webserviceType_ combo - serviceLabel_ = new Label( typeComposite, SWT.WRAP); - serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEIMPL); - serviceLabel_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL); - - serviceImpl_ = new Text(typeComposite, SWT.LEFT | SWT.BORDER ); - GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL); - griddata.widthHint = 225; - serviceImpl_.setLayoutData( griddata ); - serviceImpl_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL); - utils_.createInfoPop(serviceImpl_, INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL); - - objectModifyListener_ = new ModifyListener(){ - public void modifyText(ModifyEvent e) { - if (serviceImpl_.getText().indexOf(':') > 0) { - timer_ = Timer.newInstance(timer_, Display.getCurrent(), ServerWizardWidget.this); - timer_.startTimer(); - } - else - run(); - } - }; - - serviceImpl_.addModifyListener(objectModifyListener_); - - browseButton_ = utils_.createPushButton(typeComposite, - ConsumptionUIMessages.BUTTON_BROWSE, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL, null); - - IWorkbench workbench = PlatformUI.getWorkbench(); - browseDialog_ = new ServiceImplSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(), - new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION, "", - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ObjectSelectionWidget(); - } - })); - browseButton_.addSelectionListener(new ServiceImplBrowseListener()); - } - // Service Lifecycle section - scales for service & client, graphic - - groupComposite_ = new Composite(parent, SWT.NONE); - GridLayout gclayout = new GridLayout(); - gclayout.numColumns = 2; - gclayout.horizontalSpacing=0; - gclayout.marginHeight=0; - gclayout.marginBottom=5; - groupComposite_.setLayout( gclayout ); - GridData gcGridData = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true); - groupComposite_.setLayoutData(gcGridData); - - groupComposite_.addControlListener(new ControlListener() - { - public void controlMoved(ControlEvent e) { - // TODO Auto-generated method stub - - } - public void controlResized(ControlEvent e) { - groupComposite_.pack(true); - } - }); - - serviceComposite_ = new Composite(groupComposite_, SWT.NONE); - GridLayout gridlayout = new GridLayout(); - gridlayout.numColumns = 2; - gridlayout.horizontalSpacing=0; - gridlayout.marginHeight=0; - serviceComposite_.setLayout( gridlayout ); - GridData scGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - serviceComposite_.setLayoutData(scGridData); - - serviceComposite_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE); - - - serviceScale_ = new Scale(serviceComposite_, SWT.VERTICAL | SWT.BORDER); - utils_.createInfoPop(serviceScale_, INFOPOP_WSWSCEN_SCALE_SERVICE); - serviceScale_.setMinimum(0); - serviceScale_.setMaximum(6); - serviceScale_.setIncrement(1); - serviceScale_.setPageIncrement(1); - serviceScale_.addSelectionListener(scaleSelectionListener); - serviceScale_.setSelection(getServiceGeneration()); - serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE); - - Accessible accessibleScale = serviceScale_.getAccessible(); - accessibleScale.addAccessibleListener(new AccessibleAdapter(){ - // return a string that describes what to do with the slider - // this is read by the screen reader when the slider first gets focus - public void getName(AccessibleEvent e) { - e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE; - } - }); - accessibleScale.addAccessibleControlListener(new AccessibleControlAdapter(){ - // return a meaningful string when the screen reader - // attempts to get the value from the service scale - public void getValue(AccessibleControlEvent e) { - int selection = serviceScale_.getSelection(); - switch (selection) { - case 0: - e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST; - break; - case 1: - e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN; - break; - case 2: - e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL; - break; - case 3: - e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY; - break; - case 4: - e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE; - break; - case 5: - case 6: - e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP; - break; - default: - break; - } - } - }); - - GridData layoutData1 = new GridData(); - layoutData1.horizontalAlignment=SWT.CENTER; - layoutData1.verticalAlignment = SWT.BEGINNING; - Rectangle scaleR = (imageReg_.get(ICON_SCALE_BG_0)).getBounds(); - layoutData1.heightHint=scaleR.height; - layoutData1.widthHint=scaleR.width+1; - serviceScale_.setLayoutData(layoutData1); - - topologySpot_ = new Label(serviceComposite_, SWT.BORDER | SWT.TOP ); - topologySpot_.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); - topologySpot_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE); - - GridData layoutData2 = new GridData(); - layoutData2.horizontalAlignment=SWT.BEGINNING; - layoutData2.verticalAlignment = SWT.BEGINNING; - Rectangle topR = (imageReg_.get(GRAPHIC_SERVICE_0)).getBounds(); - layoutData2.heightHint=topR.height; - layoutData2.widthHint=topR.width; - topologySpot_.setLayoutData(layoutData2); - - setGraphics(getServiceGeneration()); - - hCompService_ = utils_.createComposite(groupComposite_, 1); - - Label serviceDetailsLabel = new Label(hCompService_, SWT.NONE); - serviceDetailsLabel.setText(ConsumptionUIMessages.LABEL_SUMMARY); - - hLinkServiceServer_= new Hyperlink(hCompService_, SWT.NULL); - utils_.createInfoPop(hLinkServiceServer_, INFOPOP_WSWSCEN_HYPERLINK_SERVER); - hLinkServiceServer_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_SERVER); - hLinkServiceServer_.addHyperlinkListener(new IHyperlinkListener(){ - public void linkActivated(HyperlinkEvent e){ - launchRuntimeSelectionDialog(false, true); - } - public void linkEntered(HyperlinkEvent e){} - public void linkExited(HyperlinkEvent e){} - }); - - hLinkServiceRuntime_ = new Hyperlink(hCompService_, SWT.NULL); - utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_RUNTIME); - hLinkServiceRuntime_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_RUNTIME); - hLinkServiceRuntime_.addHyperlinkListener(new IHyperlinkListener(){ - public void linkActivated(HyperlinkEvent e){ - launchRuntimeSelectionDialog(false); - } - public void linkEntered(HyperlinkEvent e){} - public void linkExited(HyperlinkEvent e){} - }); - - IWorkbench workbench = PlatformUI.getWorkbench(); - projectDialog_ = new ProjectSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(), - new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_PROJECT_SETTINGS, "", - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ProjectSelectionWidget(); - } - })); - - hLinkServiceProject_= new Hyperlink(hCompService_, SWT.NULL); - utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS); - hLinkServiceProject_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK); - hLinkServiceProject_.addHyperlinkListener(new IHyperlinkListener(){ - public void linkActivated(HyperlinkEvent e){ - launchProjectDialog(); - } - public void linkEntered(HyperlinkEvent e){} - public void linkExited(HyperlinkEvent e){} - }); - - hLinkServiceEAR_= new Hyperlink(hCompService_, SWT.NULL); - utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS); - hLinkServiceEAR_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK); - hLinkServiceEAR_.addHyperlinkListener(new IHyperlinkListener(){ - public void linkActivated(HyperlinkEvent e){ - launchProjectDialog(); - } - public void linkEntered(HyperlinkEvent e){} - public void linkExited(HyperlinkEvent e){} - }); - - hLinkServiceServer_.setText(SERVICE_SERVER_PREFIX); - hLinkServiceRuntime_.setText(SERVICE_RUNTIME_PREFIX); - hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX); - hLinkServiceEAR_.setText(SERVICE_EAR_PREFIX); - - HyperlinkGroup serverRuntimeGroup = new HyperlinkGroup(Display.getCurrent()); - - serverRuntimeGroup.add(hLinkServiceServer_); - serverRuntimeGroup.add(hLinkServiceRuntime_); - serverRuntimeGroup.add(hLinkServiceProject_); - serverRuntimeGroup.add(hLinkServiceEAR_); - serverRuntimeGroup.setHyperlinkUnderlineMode(HyperlinkSettings.UNDERLINE_ALWAYS); - - utils_.createHorizontalSeparator(parent, 1); - - // Add client widgets... - clientWidget_ = new WebServiceClientTypeWidget(false); - clientWidget_.addControls(parent, statusListener ); - clientWidget_.setPackable(this); - clientWidget_.enableClientSlider(serviceScale_.getSelection()<=ScenarioContext.WS_START); - - // Advanced buttons section - utils_.createHorizontalSeparator(parent, 3); - - Composite advancedButtonPanel = utils_.createComposite(parent, 1); - - publishButton_ = utils_.createCheckbox(advancedButtonPanel, - ConsumptionUIMessages.BUTTON_WSWSCEN_PUBLISH, ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS, INFOPOP_WSWSCEN_CHECKBOX_LAUNCH_WS); - monitorButton_ = utils_.createCheckbox(advancedButtonPanel, - ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE, ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE, INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE); - - if (displayPreferences_ && getResourceContext().isOverwriteFilesEnabled()) { - utils_.createHorizontalSeparator(parent, 1); - Composite prefButtonPanel = utils_.createComposite(parent, 1); - overwriteButton_ = utils_.createCheckbox(prefButtonPanel, - ConsumptionUIMessages.CHECKBOX_OVERWRITE_FILES, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_OVERWRITE_FILES, INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE); - overwriteButton_.setSelection(getResourceContext() - .isOverwriteFilesEnabled()); - overwriteButton_.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - getResourceContext().setOverwriteFilesEnabled(overwriteButton_.getSelection()); - } - }); - } - - return this; - } - - private void launchProjectDialog() - { - String currentProjectName = getServiceProjectName(); - String currentEarProjectName = getServiceEarProjectName(); - String currentProjectType = getServiceComponentType(); - boolean currentNeedEar = getServiceNeedEAR(); - - projectDialog_.setProjectName(currentProjectName); - projectDialog_.setEarProjectName(currentEarProjectName); - projectDialog_.setProjectComponentType(currentProjectType); - projectDialog_.setNeedEAR(currentNeedEar); - - int status = projectDialog_.open(); - if (status == Window.OK) - { - String newProjectName = projectDialog_.getProjectName(); - String newEarProjectName = projectDialog_.getEarProjectName(); - String newProjectType = projectDialog_.getProjectComponentType(); - boolean newNeedEar = projectDialog_.getNeedEAR(); - - //Update project settings and validate page if selections changed. - if (!newProjectName.equals(currentProjectName) - || !newEarProjectName.equals(currentEarProjectName) - || !newProjectType.equals(currentProjectType) - || newNeedEar != currentNeedEar) { - setServiceProjectName(newProjectName); - setServiceEarProjectName(newEarProjectName); - setServiceComponentType(newProjectType); - setServiceNeedEAR(newNeedEar); - validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_PROJECT_CHANGES); - statusListener_.handleEvent(null); - } - - /*check to see if text has changed for project and EAR - if so, repaint links */ - if (!newProjectName.equals(currentProjectName)) - { - hLinkServiceProject_.pack(true); - packSelf(); - } - if (!newEarProjectName.equals(currentEarProjectName)) - { - hLinkServiceEAR_.pack(true); - packSelf(); - } - } - } - - private void launchRuntimeSelectionDialog(boolean clientContext) - { - launchRuntimeSelectionDialog(clientContext, false); - } - - private void launchRuntimeSelectionDialog(boolean clientContext, boolean selectServerFirst) - { - byte mode = clientContext ? (byte)1 : (byte)0; - - //TODO: jvh - investigate - don't think j2ee version shouldn't be hard coded (last parm) - // question - where to pick it up from? - //Remember the current values - TypeRuntimeServer currentServiceTRS = getServiceTypeRuntimeServer(); - IWorkbench workbench = PlatformUI.getWorkbench(); - RuntimeServerSelectionDialog rssd = new RuntimeServerSelectionDialog( - workbench.getActiveWorkbenchWindow().getShell(), mode, currentServiceTRS, "14"); - rssd.setSelectServerFirst(selectServerFirst); - int result = rssd.open(); - if (result == Window.OK) - { - TypeRuntimeServer newServiceTRS = rssd.getTypeRuntimeServer(); - if (!currentServiceTRS.equals(newServiceTRS)) - { - setServiceTypeRuntimeServer(newServiceTRS); - refreshClientServerRuntimeSelection(); - validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES); - clientWidget_.setValidationState(ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES); - statusListener_.handleEvent(null); //Revalidate the page since server/runtime selections changed. - } - - } - } - - public void setClientTypeRuntimeServer(TypeRuntimeServer ids) { - clientWidget_.setTypeRuntimeServer( ids ); - } - - public TypeRuntimeServer getClientTypeRuntimeServer() { - return clientWidget_.getTypeRuntimeServer(); - } - - public void setInstallClient(Boolean install) { - clientWidget_.setInstallClient( install ); - } - - public Boolean getInstallClient() { - return clientWidget_.getInstallClient(); - } - - public void setStartClient(Boolean startClient) { - clientWidget_.setStartClient( startClient ); - } - - public Boolean getStartClient() { - return clientWidget_.getStartClient(); - } - - public void setTestClient(Boolean testClient) { - clientWidget_.setTestClient( testClient ); - } - - public Boolean getTestClient() { - return clientWidget_.getTestClient(); - } - - public void setDevelopClient(boolean develop) { - clientWidget_.setDevelopClient( develop ); - } - - public boolean getDevelopClient() { - return clientWidget_.getDevelopClient(); - } - - public void setAssembleClient(boolean assemble) { - clientWidget_.setAssembleClient( assemble ); - } - - public boolean getAssembleClient() { - return clientWidget_.getAssembleClient(); - } - - public void setDeployClient(boolean deploy) { - clientWidget_.setDeployClient( deploy ); - } - - public boolean getDeployClient() { - return clientWidget_.getDeployClient(); - } - -private void handleTypeChange() - { - if (!preferencesPage_) { - int scenario = getWebServiceScenario(); - - if (scenario == WebServiceScenario.BOTTOMUP) - { - serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEIMPL); - } - else if (scenario == WebServiceScenario.TOPDOWN) - { - serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEDEF); - } - } - } - - public void setServiceTypeRuntimeServer(TypeRuntimeServer ids) { - LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils2 - .getServiceTypeLabels(); - // rskreg - int selection = 0; - String[] serviceIds = labelIds.getIds_(); - String selectedId = ids.getTypeId(); - - webserviceType_.setItems(labelIds.getLabels_()); - - // Now find the selected one. - for (int index = 0; index < serviceIds.length; index++) { - if (selectedId.equals(serviceIds[index])) { - selection = index; - break; - } - } - webserviceType_.select(selection); - - ids_ = ids; - - if (ids_ != null) - { - String serviceServerText = ""; - String serverId = ids_.getServerId(); - if (serverId != null && serverId.length()>0) - { - serviceServerText = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId); - } - String serviceRuntimeText = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(ids_.getRuntimeId()); - - String currentServerText = hLinkServiceServer_.getText(); - String currentRuntimeText = hLinkServiceRuntime_.getText(); - String newServerText = SERVICE_SERVER_PREFIX + " " + serviceServerText; - String newRuntimeText = SERVICE_RUNTIME_PREFIX + " " + serviceRuntimeText; - hLinkServiceServer_.setText(newServerText); - hLinkServiceRuntime_.setText(newRuntimeText); - - /*check to see if text has changed for server or runtime - if so, repaint links */ - if (!newServerText.equals(currentServerText)) - { - hLinkServiceServer_.pack(true); - packSelf(); - } - - if (!newRuntimeText.equals(currentRuntimeText)) - { - hLinkServiceRuntime_.pack(true); - packSelf(); - } - } - labelIds_ = labelIds; - handleTypeChange(); - - if (projectDialog_ != null) - projectDialog_.setTypeRuntimeServer(ids_); - - - //When the server changes, the state of needEar could change. - //If the the server change results in a change in the state of needEar, - //update needEar and serviceEarProjectName. - ValidationUtils vu = new ValidationUtils(); - boolean oldNeedEar = getServiceNeedEAR(); - boolean serviceProjectOrProjectTypeNeedsEar; - - if (!oldNeedEar) - { - //If an EAR was not needed previously it could have been because of the project/project type or the server. - //If it was because of the project/project type, changing the server should have no impact - //on the state of needEar. - serviceProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getServiceProjectName(), getServiceComponentType()); - } - else - { - serviceProjectOrProjectTypeNeedsEar = true; - } - - //boolean serviceProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getServiceProjectName(), getServiceComponentType()); - if (serviceProjectOrProjectTypeNeedsEar) - { - //Could not rule out need for an Ear from the project/project type so changing the server - //may impact the need for an Ear. - - boolean currentServiceServerNeedsEar = vu.serverNeedsEAR(getServiceTypeRuntimeServer().getServerId()); - if (oldNeedEar != currentServiceServerNeedsEar) - { - //Update needEar and serviceEarProjectName. - if (currentServiceServerNeedsEar) - { - //Calculate a reasonable default for the Ear project name - String earProjectName = DefaultingUtils.getDefaultEARProjectName(getServiceProjectName()); - setServiceNeedEAR(currentServiceServerNeedsEar); - setServiceEarProjectName(earProjectName); - } - else - { - setServiceNeedEAR(currentServiceServerNeedsEar); - setServiceEarProjectName(""); - } - - } - } - } - - public TypeRuntimeServer getServiceTypeRuntimeServer() { - return ids_; - } - - public void setServiceGeneration(int value) - { - serviceScale_.setSelection(value); - setGraphics(value); - - //enable client widget based on service scale setting - clientWidget_.enableClientSlider(value<=ScenarioContext.WS_START); - - /*for popup case need to make sure that the UI is refreshed based on - changes to data*/ - packSelf(); - } - - public int getServiceGeneration() - { - return serviceScale_.getSelection(); - } - - public boolean getDevelopService() { - return developService_; - } - - public void setDevelopService(boolean developService) { - this.developService_ = developService; - } - - public boolean getAssembleService() { - return assembleService_; - } - - public void setAssembleService(boolean assembleService) { - this.assembleService_ = assembleService; - } - - public boolean getDeployService() { - return deployService_; - } - - public void setDeployService(boolean deployService) { - this.deployService_ = deployService; - } - - public Boolean getStartService(){ - return startService_; - } - - public void setStartService(Boolean value) { - startService_=value; - } - - public Boolean getInstallService() { - return installService_; - } - - public void setInstallService(Boolean value) { - installService_=value; - } - - public Boolean getTestService() { - return - new Boolean( testService_.booleanValue() || clientWidget_.getTestClient().booleanValue()); - } - - public void setTestService(Boolean value) { - testService_= value; - } - public Boolean getMonitorService() { - return new Boolean(monitorButton_.getSelection()); - } - - public void setMonitorService(Boolean value) { - monitorButton_.setSelection(value.booleanValue()); - } - - public Boolean getPublishService() { - return new Boolean(publishButton_.getSelection()); - } - - public void setPublishService(Boolean value) { - publishButton_.setSelection( value.booleanValue() ); - } - - public Boolean getGenerateProxy() { - return new Boolean(clientWidget_.getGenerateProxy()); - } - - public void setClientGeneration(int value) - { - clientWidget_.setClientGeneration(value); - /*for popup case need to make sure that the UI is refreshed based on - changes to data*/ - packSelf(); - } - - public String getClientEarProjectName() - { - return clientWidget_.getClientEarProjectName(); - } - - public String getClientProjectName() - { - return clientWidget_.getClientProjectName(); - } - - public int getClientGeneration() - { - return clientWidget_.getClientGeneration(); - } - - public ResourceContext getResourceContext() { - if (resourceContext_ == null) { - resourceContext_ = WebServicePlugin.getInstance() - .getResourceContext(); - } - return resourceContext_; - } - - public void setResourceContext(ResourceContext context) { - resourceContext_ = context; - } - - public IStructuredSelection getObjectSelection() - { - return objectSelection_; - } - - public void setObjectSelection(IStructuredSelection selection ) - { - objectSelection_ = selection; - } - - public WebServicesParser getWebServicesParser() - { - return parser_; - } - - public void setWebServicesParser(WebServicesParser parser) - { - parser_ = parser; - clientWidget_.setWebServicesParser(parser); - } - - public void internalize() { - - if (preferencesPage_) - return; - - if (objectSelectionWidget_ == null) - objectSelectionWidget_ = getSelectionWidget(); - - String displayable = null; - - if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable) { - IObjectSelectionLaunchable launchable = (IObjectSelectionLaunchable) objectSelectionWidget_; - launchable.setInitialSelection(objectSelection_); - objectSelection_ = launchable.getObjectSelection(); - displayable = launchable.getObjectSelectionDisplayableString(); - } - else { - IObjectSelectionWidget selectionWidget = (IObjectSelectionWidget) objectSelectionWidget_; - selectionWidget.setInitialSelection(objectSelection_); - displayable = selectionWidget.getObjectSelectionDisplayableString(); - } - - if (displayable == null || displayable.length() == 0) - return; - - serviceImpl_.removeModifyListener(objectModifyListener_); - serviceImpl_.setText(displayable); - serviceImpl_.addModifyListener(objectModifyListener_); - } - - public IStatus getStatus() { - IStatus status = Status.OK_STATUS; - - IStatus missingFieldStatus = checkMissingFieldStatus(); - if (missingFieldStatus.getSeverity() == IStatus.ERROR) { - return missingFieldStatus; - } - - IStatus serviceImplValidationStatus = checkServiceImplTextStatus(); - if (serviceImplValidationStatus.getSeverity() == IStatus.ERROR) { - return serviceImplValidationStatus; - } - else if (serviceImplValidationStatus.getSeverity() == IStatus.WARNING){ - return serviceImplValidationStatus; - } - - IStatus possibleErrorStatus = checkErrorStatus(); - if (possibleErrorStatus.getSeverity() == IStatus.ERROR || possibleErrorStatus.getSeverity() == IStatus.WARNING) { - return possibleErrorStatus; - } - - IStatus possibleWarningStatus = checkWarningStatus(); - if (possibleWarningStatus.getSeverity() == IStatus.WARNING) { - return possibleWarningStatus; - } - - // If no warnings/errors were reported, clear validation state on - // service side and client side (if enabled) - validationState_ = ValidationUtils.VALIDATE_NONE; - if (clientWidget_.getGenerateProxy()) { - clientWidget_.setValidationState(ValidationUtils.VALIDATE_NONE); - } - - return status; - } - - /* - * call validation code in the object selection widget to ensure any - * modifications to the serviceImpl_ field are valid - */ - private IStatus checkServiceImplTextStatus() { - - String fieldText = serviceImpl_.getText().trim(); - - if (objectSelectionWidget_ == null) - { - objectSelectionWidget_ = getSelectionWidget(); - } - - IObjectSelectionLaunchable launchable = null; - if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable) - { - launchable = (IObjectSelectionLaunchable)objectSelectionWidget_; - validObjectSelection_ = launchable.validate(fieldText); - } - else - { - IObjectSelectionWidget widget = (IObjectSelectionWidget)objectSelectionWidget_; - validObjectSelection_ = widget.validate(fieldText); - } - - if (!validObjectSelection_) - { - int scenario = getWebServiceScenario(); - - if (scenario == WebServiceScenario.BOTTOMUP){ - if (launchable != null){ - IStatus valStatus = launchable.validateSelection(new StructuredSelection(fieldText)); - if (valStatus.getSeverity() == IStatus.WARNING) - return StatusUtils.warningStatus(ConsumptionUIMessages.MSG_WARN_SERVICE_IMPL_NAMING_CONVENTION); - } - else - return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_IMPL); - } - else - return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_DEF); - } - - return Status.OK_STATUS; - } - - private int getWebServiceScenario() - { - int index = webserviceType_.getSelectionIndex(); - String typeId = labelIds_.getIds_()[index]; - return WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId); - } - - private IStatus checkMissingFieldStatus() { - - // 1. Check for missing fields on service side - ValidationUtils valUtils = new ValidationUtils(); - String serviceImpl = serviceImpl_.getText().trim(); - String typeId = getServiceTypeRuntimeServer().getTypeId(); - String runtimeId = getServiceTypeRuntimeServer().getRuntimeId(); - String serverId = getServiceTypeRuntimeServer().getServerId(); - String projectName = getServiceProjectName(); - boolean needEar = getServiceNeedEAR(); - String earProjectName = getServiceEarProjectName(); - String projectTypeId = getServiceComponentType(); - - IStatus serviceMissingFieldStatus = valUtils.checkMissingFieldStatus(validationState_, typeId, serviceImpl, - runtimeId, serverId, projectName, needEar, earProjectName, projectTypeId, false); - if (serviceMissingFieldStatus.getSeverity() == IStatus.ERROR) { - return serviceMissingFieldStatus; - } - - // 2. Check for missing fields on the client side if it's visible. - if (clientWidget_.getGenerateProxy()) { - IStatus clientMissingFieldsStatus = clientWidget_.checkMissingFieldStatus(); - if (clientMissingFieldsStatus.getSeverity() == IStatus.ERROR) { - return clientMissingFieldsStatus; - } - - } - - return Status.OK_STATUS; - } - - private IStatus checkErrorStatus() { - - ValidationUtils valUtils = new ValidationUtils(); - - // 1. Check for errors on service side - String runtimeId = getServiceTypeRuntimeServer().getRuntimeId(); - String serverId = getServiceTypeRuntimeServer().getServerId(); - String serverInstanceId = getServiceTypeRuntimeServer().getServerInstanceId(); - String typeId = getServiceTypeRuntimeServer().getTypeId(); - String projectName = getServiceProjectName(); - boolean needEar = getServiceNeedEAR(); - String earProjectName = getServiceEarProjectName(); - String projectTypeId = getServiceComponentType(); - String initialProjectName = ""; - if (initialProject_ != null) { - initialProjectName = initialProject_.getName(); - } - IStatus serviceSideErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId, - serverInstanceId, projectName, initialProjectName, needEar, earProjectName, projectTypeId, false); - if (serviceSideErrorStatus.getSeverity() == IStatus.ERROR) { - return serviceSideErrorStatus; - } - - // 2. Check for errors on client side if it is visible - if (clientWidget_.getGenerateProxy()) { - IStatus clientSideErrorStatus = clientWidget_.checkErrorStatus(); - if (clientSideErrorStatus.getSeverity() == IStatus.ERROR) { - return clientSideErrorStatus; - } - - // 3. Check for errors that span service and client if client side - // is visible. - int clientValidationState = clientWidget_.getValidationState(); - if (validationState_ == ValidationUtils.VALIDATE_ALL - || validationState_ == ValidationUtils.VALIDATE_PROJECT_CHANGES - || clientValidationState == ValidationUtils.VALIDATE_ALL - || clientValidationState == ValidationUtils.VALIDATE_PROJECT_CHANGES) { - IWebServiceRuntimeChecker runtimeChecker = null; - - String serviceRuntimeId = WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(getServiceTypeRuntimeServer(), projectName, projectTypeId); - runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId); - - if (runtimeChecker != null) { - return runtimeChecker.checkServiceClientCompatibility( - getServiceNeedEAR(), getServiceEarProjectName(), getServiceProjectName(), - clientWidget_.getClientNeedEAR(), clientWidget_.getClientEarProjectName(), - clientWidget_.getClientProjectName()); - } - } - } - - return Status.OK_STATUS; - } - - private IStatus checkWarningStatus() { - ValidationUtils valUtils = new ValidationUtils(); - // 1. Check for warnings on the service side - int scaleSetting = getServiceGeneration(); - String serverId = getServiceTypeRuntimeServer().getServerId(); - IStatus serviceWarningStatus = valUtils.checkWarningStatus(validationState_, scaleSetting, serverId, getServiceTypeRuntimeServer().getServerInstanceId(), false); - if (serviceWarningStatus.getSeverity() == IStatus.WARNING) { - return serviceWarningStatus; - } - - // 2. Check for warnings on the client side if it's enabled - if (clientWidget_.getGenerateProxy()) { - IStatus clientWarningStatus = clientWidget_.checkWarningStatus(); - if (clientWarningStatus.getSeverity() == IStatus.WARNING) { - return clientWarningStatus; - } - - } - - return Status.OK_STATUS; - } - - protected void initImageRegistry() - { - imageReg_ = new ImageRegistry(Display.getCurrent()); - - imageReg_.put(ICON_SCALE_BG_0, WebServiceConsumptionUIPlugin - .getImageDescriptor(ICON_SCALE_BG_0)); - imageReg_.put(ICON_SCALE_BG_1, WebServiceConsumptionUIPlugin - .getImageDescriptor(ICON_SCALE_BG_1)); - imageReg_.put(ICON_SCALE_BG_2, WebServiceConsumptionUIPlugin - .getImageDescriptor(ICON_SCALE_BG_2)); - imageReg_.put(ICON_SCALE_BG_3, WebServiceConsumptionUIPlugin - .getImageDescriptor(ICON_SCALE_BG_3)); - imageReg_.put(ICON_SCALE_BG_4, WebServiceConsumptionUIPlugin - .getImageDescriptor(ICON_SCALE_BG_4)); - imageReg_.put(ICON_SCALE_BG_5, WebServiceConsumptionUIPlugin - .getImageDescriptor(ICON_SCALE_BG_5)); - imageReg_.put(ICON_SCALE_BG_6, WebServiceConsumptionUIPlugin - .getImageDescriptor(ICON_SCALE_BG_6)); - - imageReg_.put(GRAPHIC_SERVICE_0, WebServiceCreationUIPlugin - .getImageDescriptor(GRAPHIC_SERVICE_0)); - imageReg_.put(GRAPHIC_SERVICE_1, WebServiceCreationUIPlugin - .getImageDescriptor(GRAPHIC_SERVICE_1)); - imageReg_.put(GRAPHIC_SERVICE_2, WebServiceCreationUIPlugin - .getImageDescriptor(GRAPHIC_SERVICE_2)); - imageReg_.put(GRAPHIC_SERVICE_3, WebServiceCreationUIPlugin - .getImageDescriptor(GRAPHIC_SERVICE_3)); - imageReg_.put(GRAPHIC_SERVICE_4, WebServiceCreationUIPlugin - .getImageDescriptor(GRAPHIC_SERVICE_4)); - imageReg_.put(GRAPHIC_SERVICE_5, WebServiceCreationUIPlugin - .getImageDescriptor(GRAPHIC_SERVICE_5)); - } - - private void setAdvancedOptions(boolean enabled) - { - monitorButton_.setEnabled(enabled); - publishButton_.setEnabled(enabled); - } - - public void setServiceProjectName(String name) - { - serviceProjectName_= name; - hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX + " " + serviceProjectName_); - hLinkServiceProject_.pack(true); - packSelf(); - } - - public void setInitialProject(IProject project) - { - initialProject_ = project; - } - - public void setServiceEarProjectName(String name) - { - serviceEarProjectName_ = name; - refreshEARLink(); - } - - public void refreshEARLink() - { - hLinkServiceEAR_.setVisible(needEar_); - if (needEar_) - { - hLinkServiceEAR_.setText(SERVICE_EAR_PREFIX + " " + serviceEarProjectName_); - hLinkServiceEAR_.pack(true); - packSelf(); - } - } - public void setServiceComponentType( String type ) - { - serviceComponentType_ = type; - } - - public void setClientProjectName(String name) - { - clientWidget_.setClientProjectName(name); - } - - public void setClientEarProjectName(String name) - { - clientWidget_.setClientEarProjectName(name); - } - - IProject project_; - - public String getServiceComponentType() - { - return serviceComponentType_; - } - - public void setClientComponentType(String type) - { - clientWidget_.setClientComponentType(type); - } - - public String getClientComponentType() - { - return clientWidget_.getClientComponentType(); - } - - public String getServiceProjectName() - { - return serviceProjectName_; - } - - public String getServiceEarProjectName() - { - return serviceEarProjectName_; - } - - public void setClientProject(IProject project) - { - clientWidget_.setProject(project); - } - - private IProject getClientProject() - { - return clientWidget_.getProject(); - } - - public void setProject(IProject project) - { - project_ = project; - } - - public IProject getProject() - { - return project_; - } - - public String getServiceRuntimeId() - { - // calculate the most appropriate serviceRuntimeId based on current settings. - return WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(getServiceTypeRuntimeServer(), getServiceProjectName(), getServiceComponentType()); - } - - public String getClientRuntimeId() - { - return clientWidget_.getClientRuntimeId(); - } - - public void setServiceNeedEAR(boolean b) - { - needEar_ = b; - refreshEARLink(); - } - - public boolean getServiceNeedEAR() - { - return needEar_; - } - - public void setClientNeedEAR(boolean b) - { - clientWidget_.setClientNeedEAR(b); - } - - public boolean getClientNeedEAR() - { - return clientWidget_.getClientNeedEAR(); - } - - // looks through extensions and returns the appropriate selection widget - private Object getSelectionWidget() - { - String wst = getServiceTypeRuntimeServer().getTypeId(); - int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst); - String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst); - WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId); - Object result = null; - - - if (wsimpl != null) - { - String objectSelectionWidgetId = null; - if (scenario == WebServiceScenario.TOPDOWN) - { - objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"; - } - else - { - objectSelectionWidgetId = wsimpl.getObjectSelectionWidget(); - } - - ObjectSelectionRegistry registry = ObjectSelectionRegistry.getInstance(); - boolean editable = registry.getExternalModify( objectSelectionWidgetId ); - - serviceImpl_.setEditable( editable ); - result = registry.getSelectionWidget( objectSelectionWidgetId ); - } - - return result; - } - - // for the purposes of disabling the service implementation controls from the preferences dialog - public void disableNonPreferenceWidgets() - { - if (serviceImpl_ != null) - serviceImpl_.setEnabled(false); - if (browseButton_ != null) - browseButton_.setEnabled(false); - if (hCompService_ != null) - { - hCompService_.setVisible(false); - } - clientWidget_.disableNonPreferenceWidgets(); - } - - private void setGraphics(int value) - { - String iconImage = ""; - String toplogyImage = ""; - switch (value) { - case 0: - iconImage=ICON_SCALE_BG_0; - toplogyImage=GRAPHIC_SERVICE_0; - break; - case 1: - iconImage=ICON_SCALE_BG_1; - toplogyImage=GRAPHIC_SERVICE_1; - break; - case 2: - iconImage=ICON_SCALE_BG_2; - toplogyImage=GRAPHIC_SERVICE_2; - break; - case 3: - iconImage=ICON_SCALE_BG_3; - toplogyImage=GRAPHIC_SERVICE_3; - break; - case 4: - iconImage=ICON_SCALE_BG_4; - toplogyImage=GRAPHIC_SERVICE_4; - break; - case 5: - case 6: - iconImage=ICON_SCALE_BG_5; - toplogyImage=GRAPHIC_SERVICE_5; - break; - default: - break; - } - serviceScale_.setBackgroundImage(imageReg_.get(iconImage)); - topologySpot_.setImage(imageReg_.get(toplogyImage)); - } - - private void refreshServerRuntimeSelection() - { - //new up ServerRuntimeSelectionWidgetDefaultingCommand - ServerRuntimeSelectionWidgetDefaultingCommand serverRTDefaultCmd = new ServerRuntimeSelectionWidgetDefaultingCommand(); - - //call setters of new defaulting command: - serverRTDefaultCmd.setInitialSelection(getObjectSelection()); - serverRTDefaultCmd.setInitialProject(getProject()); - serverRTDefaultCmd.setGenerateProxy(clientWidget_.getGenerateProxy()); - serverRTDefaultCmd.setServiceTypeRuntimeServer(getServiceTypeRuntimeServer()); - serverRTDefaultCmd.setWebServicesParser(getWebServicesParser()); - serverRTDefaultCmd.setClientInitialSelection(getObjectSelection()); - serverRTDefaultCmd.setClientInitialProject(getClientProject()); - serverRTDefaultCmd.setClientEarProjectName(clientWidget_.getClientEarProjectName()); - serverRTDefaultCmd.setClientTypeRuntimeServer(getClientTypeRuntimeServer()); - - serverRTDefaultCmd.execute(null, null); - - //perform mappings from the defaulting command to the project settings... - setServiceProjectName(serverRTDefaultCmd.getServiceProjectName()); - setServiceEarProjectName(serverRTDefaultCmd.getServiceEarProjectName()); - setServiceComponentType(serverRTDefaultCmd.getServiceComponentType()); - setClientProjectName(serverRTDefaultCmd.getClientProjectName()); - setClientEarProjectName(serverRTDefaultCmd.getClientEarProjectName()); - setServiceTypeRuntimeServer(serverRTDefaultCmd.getServiceTypeRuntimeServer()); - setClientTypeRuntimeServer(serverRTDefaultCmd.getClientTypeRuntimeServer()); - setServiceNeedEAR(serverRTDefaultCmd.getServiceNeedEAR()); - setClientNeedEAR(serverRTDefaultCmd.getClientNeedEAR()); - setClientComponentType(serverRTDefaultCmd.getClientComponentType()); - } - - /** - * Update client server and runtime based on service side - */ - private void refreshClientServerRuntimeSelection() - { - TypeRuntimeServer clientTypeRuntimeserver = getClientTypeRuntimeServer(); - clientTypeRuntimeserver.setRuntimeId(getServiceTypeRuntimeServer().getRuntimeId()); - clientTypeRuntimeserver.setServerId(getServiceTypeRuntimeServer().getServerId()); - clientTypeRuntimeserver.setServerInstanceId(getServiceTypeRuntimeServer().getServerInstanceId()); - setClientTypeRuntimeServer(clientTypeRuntimeserver); - } - - - private void callObjectTransformation(IStructuredSelection objectSelection, - IProject project, String componentName, boolean refreshRuntime) - { - ObjectSelectionOutputCommand objOutputCommand = new ObjectSelectionOutputCommand(); - objOutputCommand.setTypeRuntimeServer(getServiceTypeRuntimeServer()); - objOutputCommand.setObjectSelection(objectSelection); - objOutputCommand.setProject(project); - objOutputCommand.setComponentName(componentName); - - objOutputCommand.execute(null, null); - - setWebServicesParser(objOutputCommand.getWebServicesParser()); - setObjectSelection(objOutputCommand.getObjectSelection()); - setProject(objOutputCommand.getProject()); - - if (refreshRuntime || forceRefreshRuntime) - refreshServerRuntimeSelection(); - - forceRefreshRuntime = false; - } - - private class ScaleSelectionListener implements SelectionListener - { - public void widgetSelected(SelectionEvent e) { - - Scale scale = (Scale)e.widget; - int selection = scale.getSelection(); - - //TODO: change the hard coded integers here to the the ScenarioContext.WS_xxx when in less critical phase - switch (selection) { - case 0: - serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST); - break; - case 1: - serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN); - break; - case 2: - serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL); - break; - case 3: - serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY); - break; - case 4: - serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE); - break; - case 5: - case 6: - serviceScale_.setSelection(ScenarioContext.WS_DEVELOP); //"no selection" is not allowed...must develop service @ minimum - serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP); - //reset local selection so that setters get correct value below - selection = ScenarioContext.WS_DEVELOP; - break; - default: - break; - } - - setDevelopService(selection <= ScenarioContext.WS_DEVELOP); - setAssembleService(selection <= ScenarioContext.WS_ASSEMBLE); - setDeployService(selection <= ScenarioContext.WS_DEPLOY); - - setTestService(new Boolean(selection <= ScenarioContext.WS_TEST)); - setInstallService(new Boolean(selection <= ScenarioContext.WS_INSTALL)); - setStartService(new Boolean(selection <= ScenarioContext.WS_START)); - setAdvancedOptions(selection <= ScenarioContext.WS_INSTALL); - clientWidget_.enableClientSlider(selection <= ScenarioContext.WS_START); - - setGraphics(selection); - - //Validate the page - validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SCALE_CHANGES); - statusListener_.handleEvent(null); - - } - - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } - } - - private class ServiceImplBrowseListener implements SelectionListener - { - public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub - } - - public void widgetSelected(SelectionEvent e) { - - if (objectSelectionWidget_ == null) - objectSelectionWidget_ = getSelectionWidget(); - - IStructuredSelection objectSelection = null; - IProject project = null; - String componentName=""; - int result=Dialog.CANCEL; - - if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable) - { - IObjectSelectionLaunchable launchable = ((IObjectSelectionLaunchable)objectSelectionWidget_); - launchable.setInitialSelection(getObjectSelection()); - IWorkbench workbench = PlatformUI.getWorkbench(); - result = launchable.launch(workbench.getActiveWorkbenchWindow().getShell()); - if (result == Dialog.OK) - { - serviceImpl_.removeModifyListener(objectModifyListener_); - serviceImpl_.setText(launchable.getObjectSelectionDisplayableString()); - serviceImpl_.addModifyListener(objectModifyListener_); - objectSelection = launchable.getObjectSelection(); - project = launchable.getProject(); - componentName= launchable.getComponentName(); - } - } - else - { - browseDialog_.setTypeRuntimeServer(getServiceTypeRuntimeServer()); - browseDialog_.setInitialSelection(getObjectSelection()); - result = browseDialog_.open(); - if (result == Dialog.OK) - { - serviceImpl_.removeModifyListener(objectModifyListener_); - serviceImpl_.setText(browseDialog_.getDisplayableSelectionString()); - serviceImpl_.addModifyListener(objectModifyListener_); - objectSelection = browseDialog_.getObjectSelection(); - project = browseDialog_.getProject(); - componentName= browseDialog_.getComponentName(); - } - } - - // call ObjectSelectionOutputCommand to carry out any transformation on the objectSelection - if (result == Dialog.OK) - { - callObjectTransformation(objectSelection, project, componentName, getWebServiceScenario() != WebServiceScenario.TOPDOWN); - validationState_ = ValidationUtils.VALIDATE_ALL; - statusListener_.handleEvent(null); // validate the page - } - } - } - - -} - diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java deleted file mode 100644 index 788b95978..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java +++ /dev/null @@ -1,211 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews - * 20060529 141422 kathy@ca.ibm.com - Kathy Chan - * 20070327 172339 kathy@ca.ibm.com - Kathy Chan - * 20080220 219537 makandre@ca.ibm.com - Andrew Mak - * 20080523 233764 makandre@ca.ibm.com - Andrew Mak, Top down EJB preference not respected - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; - -public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefaultingCommand -{ - private TypeRuntimeServer typeRuntimeServer_; - private IStructuredSelection initialSelection_; - private int serviceGeneration_; - private boolean developService_; - private boolean assembleService_; - private boolean deployService_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - - String type = getScenarioContext().getWebServiceType(); - String runtime = WebServiceRuntimeExtensionUtils2.getDefaultRuntimeValueFor( type ); - - String factoryID = WebServiceRuntimeExtensionUtils2.getDefaultServerValueFor(type); - typeRuntimeServer_ = new TypeRuntimeServer(); - - typeRuntimeServer_.setTypeId( type ); - typeRuntimeServer_.setRuntimeId( runtime ); - typeRuntimeServer_.setServerId( factoryID ); - - //Default the typeId from the initial selection - String[] typeIds = WebServiceRuntimeExtensionUtils2.getWebServiceTypeBySelection(initialSelection_); - - if (typeIds!=null && typeIds.length>0) - { - String preferred = typeIds[0]; // default to first entry initially - for (String typeId : typeIds) { - if (typeId.equals(type)) { - preferred = typeId; - break; - } - } - typeRuntimeServer_.setTypeId(preferred); - } else { - if (initialSelection_ != null && !initialSelection_.isEmpty()) - { - Object initialObject = initialSelection_.getFirstElement(); - // initialObject would not be null since !initialSelection_.isEmpty() - boolean hasAdapter = AdapterUtils.hasAdapter(initialObject); - if (hasAdapter) { - String entry = null; - String prefix = WebServiceScenario.TOPDOWN + "/"; - if (type.startsWith(prefix)) - entry = type; - else { - StringBuffer entrybuff = new StringBuffer(); - entrybuff.append(prefix); - entrybuff.append("org.eclipse.jst.ws.wsImpl.java"); - entry = entrybuff.toString(); - } - typeRuntimeServer_.setTypeId(entry); - } - } - } - - serviceGeneration_ = getScenarioContext().getGenerateWebService(); - - developService_ = serviceGeneration_ <= ScenarioContext.WS_DEVELOP; - assembleService_ = serviceGeneration_ <= ScenarioContext.WS_ASSEMBLE; - deployService_ = serviceGeneration_ <= ScenarioContext.WS_DEPLOY; - - defaultClientScale(); - - return Status.OK_STATUS; - } - - public void setInitialSelection(IStructuredSelection selection) - { - initialSelection_ = selection; - } - - public IStructuredSelection getInitialSelection() - { - return initialSelection_ ; - } - - IProject project_; - - public IProject getInitialProject() - { - if (project_==null) - { - project_ = getProjectFromObjectSelection(initialSelection_); - } - - return project_; - } - - private IProject getProjectFromObjectSelection(IStructuredSelection selection) - { - if (selection != null && selection.size() == 1) - { - Object obj = selection.getFirstElement(); - if (obj != null) - { - try - { - IResource resource = ResourceUtils.getResourceFromSelection(obj); - if (resource==null) - return null; - IProject p = ResourceUtils.getProjectOf(resource.getFullPath()); - return p; - } catch(CoreException e) - { - return null; - } - } - } - return null; - } - - public TypeRuntimeServer getServiceTypeRuntimeServer() - { - return typeRuntimeServer_; - } - - public Boolean getInstallService() - { - return new Boolean( getScenarioContext().getInstallWebService() ); - } - - public Boolean getStartService() - { - return new Boolean( getScenarioContext().getStartWebService() ); - } - - public Boolean getTestService() - { - return new Boolean( getScenarioContext().getTestWebService() ); - } - - public Boolean getPublishService() - { - return new Boolean( getScenarioContext().getLaunchWebServiceExplorer() ); - } - - public Boolean getGenerateProxy() - { - return new Boolean( getScenarioContext().getGenerateProxy() ); - } - - public boolean getRunTestClient() - { - return getScenarioContext().isLaunchSampleEnabled(); - } - - public Boolean getMonitorService() - { - return new Boolean(getScenarioContext().getMonitorWebService()); - } - - public int getServiceGeneration() - { - return serviceGeneration_; - } - - public int getClientGeneration() - { - return getScenarioContext().getGenerateClient(); - } - - public boolean getDevelopService() { - return developService_; - } - - public boolean getAssembleService() { - return assembleService_; - } - - public boolean getDeployService() { - return deployService_; - } - -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java deleted file mode 100644 index 6252ca65e..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java +++ /dev/null @@ -1,181 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews - * 20060529 141422 kathy@ca.ibm.com - Kathy Chan - * 20060727 144354 kathy@ca.ibm.com - Kathy Chan - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets; - -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; - - -public class ServerWizardWidgetOutputCommand extends ClientWizardWidgetOutputCommand -{ - private TypeRuntimeServer typeRuntimeServer_; - private boolean installService_; - private boolean startService_; - private boolean testService_; - private boolean testClient_; - private boolean runTestClient_; - private boolean publishService_; - private boolean generateProxy_; - private boolean developService_; - private boolean assembleService_; - private boolean deployService_; - - private ResourceContext resourceContext_; - private IStructuredSelection selection_; - - - public TypeRuntimeServer getServiceTypeRuntimeServer() - { - return typeRuntimeServer_; - } - - public boolean getInstallService() - { - return installService_; - } - - public boolean getStartService() - { - return startService_; - } - - public boolean getTestService() - { - return testService_; - } - - public boolean getRunTestClient() - { - return runTestClient_; - } - - public boolean getPublishService() - { - return publishService_; - } - - public boolean getGenerateProxy() - { - return generateProxy_; - } - - public ResourceContext getResourceContext() - { - return resourceContext_; - } - - /** - * @param generateProxy_ The generateProxy_ to set. - */ - public void setGenerateProxy(boolean generateProxy_) - { - this.generateProxy_ = generateProxy_; - } - /** - * @param publishService_ The publishService_ to set. - */ - public void setPublishService(boolean publishService_) - { - this.publishService_ = publishService_; - } - /** - * @param installService_ The installService_ to set. - */ - public void setInstallService(boolean installService_) - { - this.installService_ = installService_; - } - /** - * @param startService_ The startService_ to set. - */ - public void setStartService(boolean startService_) - { - this.startService_ = startService_; - } - /** - * @param testService_ The testService_ to set. - */ - public void setTestService(boolean testService_) - { - this.testService_ = testService_; - } - - /** - * @param testService_ The testService_ to set. - */ - public void setRunTestClient(boolean runTestClient_) - { - this.runTestClient_ = runTestClient_; - } - - /** - * @param typeRuntimeServer_ The typeRuntimeServer_ to set. - */ - public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer_) - { - this.typeRuntimeServer_ = typeRuntimeServer_; - } - - public void setResourceContext(ResourceContext rc) - { - resourceContext_ = rc; - } - - public void setObjectSelection(IStructuredSelection selection) - { - selection_ = selection; - } - - public IStructuredSelection getObjectSelection() - { - return selection_; - } - - public boolean getDevelopService() { - return developService_; - } - - public void setDevelopService(boolean developService) { - this.developService_ = developService; - } - - public boolean getAssembleService() { - return assembleService_; - } - - public void setAssembleService(boolean assembleService) { - this.assembleService_ = assembleService; - } - - public boolean getDeployService() { - return deployService_; - } - - public void setDeployService(boolean deployService) { - this.deployService_ = deployService; - } - - public boolean getTestClient() { - return testClient_; - } - - public void setTestClient(boolean testClient_) { - this.testClient_ = testClient_; - } - -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java deleted file mode 100644 index fd210a0d9..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java +++ /dev/null @@ -1,105 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060410 135441 joan@ca.ibm.com - Joan Haggarty - * 20060418 136335 joan@ca.ibm.com - Joan Haggarty - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets; - -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.wst.command.internal.env.ui.widgets.AbstractSelectionDialog; -import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; - -public class ServiceImplSelectionDialog extends AbstractSelectionDialog { - - TypeRuntimeServer trs_; - String titleText_; - IStructuredSelection selection_; - - public ServiceImplSelectionDialog(Shell parent, PageInfo pageInfo) { - super(parent, pageInfo); - titleText_ = pageInfo.getPageName(); - } - - protected void callSetters() - { - ((ObjectSelectionWidget)getWidget()).setTypeRuntimeServer(trs_); - ((ObjectSelectionWidget)getWidget()).setInitialSelection(selection_); - } - - public void setTypeRuntimeServer(TypeRuntimeServer trs) - { - trs_ = trs; - - // set dialog title text based on the web service scenario - if (trs != null) - { - String typeId = trs.getTypeId(); - int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId); - - if (scenario == WebServiceScenario.BOTTOMUP) - { - titleText_ = ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION; - } - else if (scenario == WebServiceScenario.TOPDOWN) - { - titleText_ = ConsumptionUIMessages.DIALOG_TITILE_SERVICE_DEF_SELECTION; - } - } - } - - protected void setShellStyle(int newShellStyle) - { - super.setShellStyle( newShellStyle | SWT.RESIZE ); - } - - protected void configureShell(Shell newShell) - { - newShell.setText(titleText_); - super.configureShell(newShell); - } - - public String getDisplayableSelectionString() { - - return ((ObjectSelectionWidget)getWidget()).getObjectSelectionDisplayableString(); - } - - public IStructuredSelection getObjectSelection() { - return ((ObjectSelectionWidget)getWidget()).getObjectSelection(); - } - - public IProject getProject(){ - return ((ObjectSelectionWidget)getWidget()).getProject(); - } - - public String getComponentName(){ - return ((ObjectSelectionWidget)getWidget()).getComponentName(); - } - - public void setInitialSelection(IStructuredSelection selection) - { - selection_ = selection; - } - - protected Point getInitialSize() - { - return ((ObjectSelectionWidget)getWidget()).getWidgetSize(); - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java deleted file mode 100644 index d0067a5d8..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets.binding; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; -import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; - - -public class ExportWSWidgetBinding implements CommandWidgetBinding -{ - private CanFinishRegistry canFinishRegistry; - private WidgetRegistry widgetRegistry; - private DataMappingRegistry dataMappingRegistry; - private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag; - - public ExportWSWidgetBinding() - { - publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment(); - } - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create() - */ - public CommandFragmentFactory create() - { - return new CommandFragmentFactory() - { - public CommandFragment create() - { - SequenceFragment root = new SequenceFragment(); - root.add(new SimpleFragment("WSExport")); - root.add(publishToPrivateUDDICmdFrag); - root.add(new SimpleFragment(new WSExplorerLauncherCommand(), "")); - return root; - } - }; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry) - */ - public void registerCanFinish(CanFinishRegistry canFinishRegistry) - { - this.canFinishRegistry = canFinishRegistry; - publishToPrivateUDDICmdFrag.registerCanFinish(this.canFinishRegistry); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - this.dataMappingRegistry = dataRegistry; - publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry); - - // PublishToPrivateUDDICommandFragment - dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class); - - // LaunchWebServicesExplorerCommand - dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class); - dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry) - */ - public void registerWidgetMappings(WidgetRegistry widgetRegistry) - { - this.widgetRegistry = widgetRegistry; - publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry); - - widgetRegistry.add("WSExport", - ConsumptionUIMessages.PAGE_TITLE_WS_PUBLISH, - ConsumptionUIMessages.PAGE_DESC_WS_PUBLISH, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new PublishWSWidget(true); - } - } - ); - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java deleted file mode 100644 index 6d0f38e70..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets.binding; - -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; - - -public class PublishWSDLWidgetBinding implements CommandWidgetBinding -{ - public PublishWSDLWidgetBinding() - { - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create() - */ - public CommandFragmentFactory create() - { - return new CommandFragmentFactory() - { - public CommandFragment create() - { - return new SimpleFragment(); - } - }; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry) - */ - public void registerCanFinish(CanFinishRegistry canFinishRegistry) - { - } - - /* (non-Javadoc), - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry) - */ - public void registerWidgetMappings(WidgetRegistry widgetRegistry) - { - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java deleted file mode 100644 index cc9284989..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java +++ /dev/null @@ -1,652 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner - * 20060204 121605 rsinha@ca.ibm.com - Rupam Kuehner - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - * 20060407 135415 rsinha@ca.ibm.com - Rupam Kuehner - * 20060410 135562 joan@ca.ibm.com - Joan Haggarty - * 20060417 136391 joan@ca.ibm.com - Joan Haggarty - * 20060425 138052 kathy@ca.ibm.com - Kathy Chan - * 20060524 142635 gilberta@ca.ibm.com - Gilbert Andrews - * 20060529 141422 kathy@ca.ibm.com - Kathy Chan - * 20060530 144358 kathy@ca.ibm.com - Kathy Chan - * 20060608 145529 kathy@ca.ibm.com - Kathy Chan - * 20060609 86421 kathy@ca.ibm.com - Kathy Chan - * 20060727 144354 kathy@ca.ibm.com - Kathy Chan - * 20060728 145426 kathy@ca.ibm.com - Kathy Chan - * 20060810 135395 makandre@ca.ibm.com - Andrew Mak, Enable WTP Web service framework opening Java editor - * 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime - * 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk - * 20070502 180304 gilberta@ca.ibm.com - Gilbert Andrews - * 20071031 140518 joan@ca.ibm.com - Joan Haggarty - * 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews - * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews - * 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews - * 20080506 227848 makandre@ca.ibm.com - Andrew Mak, Disabled "Run on Server" checkbox is in checked state - * 20080729 241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets.binding; - -import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer; -import org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.ComputeProxyEndpointCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.ManageServerStartUpCommand; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerInstToIServerTransformer; -import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment; -import org.eclipse.jst.ws.internal.consumption.ui.common.ScenarioCleanupCommand; -import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment; -import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand; -import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand; -import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand; -import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment; -import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget; -import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand; -import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.creation.ui.widgets.test.LaunchFragment; -import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestFragment; -import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestWidget; -import org.eclipse.jst.ws.internal.creation.ui.widgets.test.WebServiceTestDefaultingCommand; -import org.eclipse.wst.command.internal.env.core.common.Condition; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; -import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; -import org.eclipse.wst.ws.internal.ui.command.OpenEditorCommand; - -public class ServerWidgetBinding implements CommandWidgetBinding -{ - private CanFinishRegistry canFinishRegistry_; - private WidgetRegistry widgetRegistry_; - private DataMappingRegistry dataMappingRegistry_; - private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag; - - public ServerWidgetBinding() - { - publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment(); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create() - */ - public CommandFragmentFactory create() - { - return new CommandFragmentFactory() - { - public CommandFragment create() - { - return new ServiceRootCommandFragment(); - } - }; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry) - */ - public void registerCanFinish(CanFinishRegistry canFinishRegistry) - { - canFinishRegistry_ = canFinishRegistry; - publishToPrivateUDDICmdFrag.registerCanFinish(canFinishRegistry_); - } - - /* (non-Javadoc), - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - dataMappingRegistry_ = dataRegistry; - - // Before ServerWizardWidget - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceGeneration", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", CreateMonitorCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ComputeEndpointCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ComputeProxyEndpointCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientGeneration", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopClient", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleClient", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject", ServerWizardWidget.class); - - - - // After ServerWizardWidget - dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class ); - dataRegistry.addMapping(ServerWizardWidget.class, "InstallService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "InstallClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "StartService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "TestService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", CreateMonitorCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", ComputeEndpointCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", ComputeProxyEndpointCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "PublishService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ResourceContext", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ObjectSelection", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "DevelopService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "AssembleService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "DeployService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "DevelopClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "AssembleClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "DeployClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "StartClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "TestClient", ServerWizardWidgetOutputCommand.class); - - // Before ObjectSelectionWidget - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class ); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class); - - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ClientFragment.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerWizardWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerWizardWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerWizardWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ServerWizardWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ServerWizardWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerWizardWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerWizardWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ServerWizardWidget.class); //jvh - - // After ServerWizardWidget - dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "WebServicesParser", ServerExtensionDefaultingCommand.class ); - - // Map fragments that depend on data. - dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class); - - // CreateMonitorCommand - dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeEndpointCommand.class); - dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeProxyEndpointCommand.class); - - // ComputeEndpointCommand - dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ServiceTestWidget.class); - dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ComputeProxyEndpointCommand.class); - - // ComputeProxyEndpointCommand - dataRegistry.addMapping(ComputeProxyEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class); - - // 145426 - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyEndpoint", ComputeProxyEndpointCommand.class); - - //ServiceTestWidget mappings - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServiceTestWidget.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ServiceTestWidget.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", CreateMonitorCommand.class); - dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ServiceTestWidget.class); - dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ServiceTestWidget.class); - dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ComputeEndpointCommand.class); - dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WebServicesParser", ComputeEndpointCommand.class); - dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ServiceTestFacilities", ServiceTestWidget.class); - dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "Environment", ServiceTestWidget.class); - dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", FinishTestFragment.class); - dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", TestDefaultingFragment.class); - - // Before Client Test widget. - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class ); - - // Before ClientTestWidget - - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class ); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class ); - dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunTestClient",ClientTestWidget.class); - - // After ClientTestWidget - dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",FinishDefaultCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",FinishDefaultCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "RunTestClient",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "Methods",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class); - dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class); - dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class); - // PublishWSWidget - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null); - - // PublishToPrivateUDDICommandFragment - dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class); - - // LaunchWebServicesExplorerCommand - dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", LaunchFragment.class); - dataRegistry.addMapping(PublishWSWidget.class, "PublishToPublicUDDI", LaunchFragment.class); - // TODO Need defaults for these properties. - dataRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class); - dataRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class); - - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry) - */ - public void registerWidgetMappings(WidgetRegistry widgetRegistry) - { - - widgetRegistry_ = widgetRegistry; - publishToPrivateUDDICmdFrag.registerWidgetMappings(widgetRegistry_); - - widgetRegistry.add( "ServerWizardWidget", - ConsumptionUIMessages.PAGE_TITLE_WS_PROJECT, - ConsumptionUIMessages.PAGE_DESC_WS_SERVICE, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ServerWizardWidget( true, false ); - } - } ); - - widgetRegistry.add( "TestService", - ConsumptionUIMessages.PAGE_TITLE_WSTEST, - ConsumptionUIMessages.PAGE_DESC_WSTEST, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ServiceTestWidget(); - } - } ); - - widgetRegistry.add( "ClientTestWidget", - ConsumptionUIMessages.PAGE_TITLE_WS_SAMPLE, - ConsumptionUIMessages.PAGE_DESC_WS_SAMPLE, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ClientTestWidget(); - } - }); - - widgetRegistry.add( "Publish", - ConsumptionUIMessages.PAGE_TITLE_WS_PUBLISH, - ConsumptionUIMessages.PAGE_DESC_WS_PUBLISH, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new PublishWSWidget(true); - } - } ); - } - - private class ClientFragment extends BooleanFragment - { - boolean genProxy_ = false; - - public ClientFragment() - { - setCondition( new Condition() - { - public boolean evaluate() - { - return genProxy_; - } - }); - - SequenceFragment clientRoot = new SequenceFragment(); - - clientRoot.add( new SimpleFragment( new ClientExtensionDefaultingCommand( false ), "")); - //clientRoot.add(new SimpleFragment(new ClientServerDeployableConfigCommand(), "")); //Note: added here for client - //clientRoot.add( new ClientExtensionFragment() ); - clientRoot.add( new ClientRootFragment() ); - clientRoot.add( new SimpleFragment( new ClientExtensionOutputCommand(), "" )); - - setTrueFragment( clientRoot ); - } - - public void setGenerateProxy( boolean genProxy ) - { - genProxy_ = genProxy; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - // Map the output of the service scenario to the client scenario. - dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class ); - dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerFactoryId", ClientExtensionDefaultingCommand.class ); - dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ClientExtensionDefaultingCommand.class ); - - - // Setup the PreClientDevelopCommand. - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "TestService", PreClientDevelopCommand.class); - - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DevelopClient", PreClientDevelopCommand.class); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "AssembleClient", PreClientDevelopCommand.class); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DeployClient", PreClientDevelopCommand.class ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "StartClient", PreClientDevelopCommand.class, "StartService", null); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", PreClientDevelopCommand.class ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientRuntimeId", PreClientDevelopCommand.class ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", PreClientDevelopCommand.class); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", PreClientDevelopCommand.class, "Module", null ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", PreClientDevelopCommand.class, "ModuleType", null); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", PreClientDevelopCommand.class, "Ear", null ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class); - dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null ); - } - } - - private class ServiceRootCommandFragment extends SequenceFragment - { - public ServiceRootCommandFragment() - { - add( new SimpleFragment( new ScenarioCleanupCommand(), "" )); - - add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), "")); - add (new SimpleFragment( new ObjectSelectionOutputCommand(), "")); - add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), "")); - add( new SimpleFragment( "ServerWizardWidget" ) ); - add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" )); - add( new SimpleFragment( new ServerExtensionDefaultingCommand(), "")); - add( new ServiceRootFragment() ); - add( new SimpleFragment( new ServerExtensionOutputCommand(), "" )); - add(new SimpleFragment(new CreateMonitorCommand(), "")); - add(new SimpleFragment(new ComputeEndpointCommand(), "")); - add( new ServiceTestFragment( "TestService") ); - add( new ClientFragment() ); - add( new SimpleFragment(new TestDefaultingFragment(),"")); - add( new SimpleFragment(new ComputeProxyEndpointCommand(), "")); - add( new ClientTestFragment( "ClientTestWidget") ); - add( new SimpleFragment( "Publish") ); - add(publishToPrivateUDDICmdFrag); - add( new SimpleFragment( new OpenEditorCommand(), "") ); - add(new LaunchFragment()); - add(new FinishFragment()); - - add( new SimpleFragment( new ScenarioCleanupCommand(), "" )); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) - */ - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - publishToPrivateUDDICmdFrag.registerDataMappings(dataMappingRegistry_); - - dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerWizardWidgetDefaultingCommand.class ); - - // Map ServerWizardWidgetDefaultingCommand to ObjectSelectionOutputCommand - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialSelection", ObjectSelectionOutputCommand.class, "ObjectSelection", null); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ObjectSelectionOutputCommand.class, "TypeRuntimeServer", null); - - // Map ServerWizardWidgetDefaultingCommand to ServerWizardWidgetOutputCommand - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "RunTestClient", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class); - - // Map ServerWizardWidgetOutputCommand. - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "RunTestClient", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class); // KSC - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class); - - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployService", ServerExtensionDefaultingCommand.class); - - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartClient", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopClient", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleClient", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployClient", ClientExtensionDefaultingCommand.class); - - - //Map ObjectSelectionOutputCommand to ServerRuntimeSelectionWidgetDefaultingCommand - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null); - - //Map ObjectSelectionOutputCommand to ServerWizardWidgetOutputCommand - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerWizardWidgetOutputCommand.class); - - //to the test wizard - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServiceTestFragment.class); - dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", WSDLTestLaunchCommand.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSDLTestLaunchCommand.class); - - // Map ServerRuntimeSelectionWidgetDefaultingCommand - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientFragment.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.class ); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class); - - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "InstallService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "MonitorService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "PublishService", ServerExtensionDefaultingCommand.class); - - - // Map ServerExtensionDefaultingCommand - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ServiceTestFragment.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "Publish", PublishToPrivateUDDICommandFragment.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer",WSDLTestLaunchCommand.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerExtensionDefaultingCommand.class, "InitialProject", null); - - // Setup the PreServiceDevelopCommand. - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DevelopService", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "AssembleService", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DeployService", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "InstallService", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "StartService", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "TestService", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "PublishService", PreServiceDevelopCommand.class); - - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() ); - - //dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null ); - - dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class ); - - // Map ClientExtensionDefaultingCommand - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", FinishDefaultCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class ); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class ); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "CanRunTestClient", ClientTestWidget.class ); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "CanRunTestClient", ClientTestDelegateCommand.class ); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient", ClientTestWidget.class ); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarComponentName", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "LaunchedServiceTestName", WebServiceClientTestArrivalCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient",ClientTestDelegateCommand.class); - - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "RunTestClient", ClientTestDelegateCommand.class); - - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestClient", ClientExtensionDefaultingCommand.class, "TestService", null); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestClient", TestDefaultingFragment.class, "GenerateProxy", null); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", TestDefaultingFragment.class, "GenerateProxy", null); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntimeId", TestDefaultingFragment.class); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class, "GenerateProxy", null); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", FinishTestFragment.class, "GenerateProxy", null); - - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ClientTestDelegateCommand.class); - - dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", CreateMonitorCommand.class); - - // Map ServerExtensionOutputCommand for ServerStart() - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null); - - // MAP post server config call - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null); - - // Map ClientExtensionOutputCommand - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "CanGenerateProxy", ClientTestFragment.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class); - - // Map ManageServerStartUpCommand - dataRegistry.addMapping(ServerExtensionOutputCommand.class, "IsWebProjectStartupRequested", ManageServerStartUpCommand.class); - - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ManageServerStartUpCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ManageServerStartUpCommand.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ManageServerStartUpCommand.class, "ServiceProject", new StringToIProjectTransformer()); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", ManageServerStartUpCommand.class,"ServiceServerTypeId", null); - - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ManageServerStartUpCommand.class, "SampleProject", new StringToIProjectTransformer()); - dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ManageServerStartUpCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer()); - - // Map WebServiceClientTestArrivalCommand - dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class); - dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class); - - // Map OpenEditorCommand - dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", OpenEditorCommand.class ); - dataRegistry.addMapping( PreServiceDevelopCommand.class, "Context", OpenEditorCommand.class ); - - //Map Finish Command - - - } - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java deleted file mode 100644 index 5b6d55511..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java +++ /dev/null @@ -1,667 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - * 20060227 124392 rsinha@ca.ibm.com - Rupam Kuehner - * 20060315 131963 rsinha@ca.ibm.com - Rupam Kuehner - * 20060418 129688 rsinha@ca.ibm.com - Rupam Kuehner - * 20060427 126780 rsinha@ca.ibm.com - Rupam Kuehner - * 20060427 138058 joan@ca.ibm.com - Joan Haggarty - * 20060523 133714 joan@ca.ibm.com - Joan Haggarty - * 20060525 143843 joan@ca.ibm.com - Joan Haggarty - * 20060905 156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime - * 20070319 159458 mahutch@ca.ibm.com - Mark Hutchinson added in some null checks - * 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews - * 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report - * 20080326 221364 kathy@ca.ibm.com - Kathy Chan - * 20080402 225032 makandre@ca.ibm.com - Andrew Mak - * 20080527 234226 kathy@ca.ibm.com - Kathy Chan - * 20080730 242611 zhang@ca.ibm.com - Peter Moogk - * 20080925 242312 ericdp@ca.ibm.com - Eric D. Peters, Cannot create BUJB WS from Bean in Java project using ANT tasks - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime; - -import java.util.ArrayList; -import java.util.Set; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.ILog; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.common.DefaultingUtils; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext; -import org.eclipse.jst.ws.internal.consumption.ui.preferences.ProjectTopologyContext; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.FacetMatchCache; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ui.WSUIPluginMessages; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerType; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; - -public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand -{ - private boolean generateProxy_=true; //jvh - - private TypeRuntimeServer serviceIds_; - private boolean serviceIdsFixed_ = false; - private String serviceRuntimeId_; - private String serviceProjectName_; - private String serviceEarProjectName_; - private String serviceComponentType_; - private IProject initialProject_; - private boolean serviceNeedEAR_ = true; - private FacetMatcher serviceFacetMatcher_; - - public ServerRuntimeSelectionWidgetDefaultingCommand() - { - super(); - } - - - /** - * Defaults the following bits of information in the following order: - * serviceRuntimeId_ : the serviceRuntimeId. Must be defaulted to non-empty String. - * serviceIds_.runtimeId_: the Web service runtime id. Must be defaulted to non-empty String. - * serviceProjectName_ : the name of the service project. Must be non-empty. May or may not exist. - * serviceComponentType_: the id of the service project template. Must be empty if the service - * project exists. Must be non-empty of the service project does not exist. - * serviceIds_.serverId_: the server type id. May be an empty String if the defaulted Web service runtime - * does not require a server. - * serviceIds_.serverInstanceId_: the server id. May be null or an empty String. - * serviceNeedEAR_: true if an EAR is needed. False otherwise. - * serviceEarProjectName_: the service EAR project. Must be empty if the serviceNeedEAR_ is false. - * Must be non-empty if the serviceNeedEAR_ is true. - * Defaults the parallel information on the client-side if needed - * (@see ClientRuntimeSelectionWidgetDefaultingCommand#execute). - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - try - { - - //**Step 1** Default the serviceRuntime and the Web service runtime. - //serviceIdsFixed_ is set to true for the Ant scenario. It's always false for the wizard - //scenarios. - if (serviceIdsFixed_) - { - //Set the serviceRuntime based on the runtime and server. - //If user set a service project use that as initial project otherwise default from initial selection. - //(above is true for all scenarios except BUJ from Java Project- for BUJ from Java Project need to create a dependancy in downstream commands - //between the initial project and the service project so don't use as the initial selection - if (serviceProjectName_ != null) - { - IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_); - //use the user provided service project to define the runtime triplet (if user provided service project is not valid for - //the web service type, the runtime triplet will contain a suitable project if one exists) - DefaultRuntimeTriplet drt = getDefaultRuntime(serviceProject, serviceIds_.getTypeId(), false, serviceIds_.getServerId()); - if (!(WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(serviceIds_.getTypeId()) == WebServiceScenario.BOTTOMUP && - FacetUtils.isJavaProject(initialProject_))){ - //user set a service project, use as initial project - //initialProject_ is the project where the selected object resides, set to be the service project for now for all scenarios except BUJ from Java Project (for - //BUJ from Java Project need to create a dependancy in downstream commands between the initial project and the service project) - initialProject_ = serviceProject; - } - serviceFacetMatcher_ = drt.getFacetMatcher(); - serviceProjectName_ = drt.getProjectName(); //a suitable service project for the web service type, or null if a suitable project does not exist - serviceRuntimeId_ = drt.getRuntimeId(); - - if (serviceRuntimeId_ != null) - { - serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime() - .getId()); - } - } - else - { - DefaultRuntimeTriplet drt = getDefaultServiceRuntimeForFixedRuntimeAndServer(initialProject_, serviceIds_.getServerId()); - serviceFacetMatcher_ = drt.getFacetMatcher(); - serviceProjectName_ = drt.getProjectName(); - serviceRuntimeId_ = drt.getRuntimeId(); - } - } - else - { - // Set the runtime based on the initial selection - DefaultRuntimeTriplet drt = getDefaultRuntime(initialProject_, serviceIds_.getTypeId(), false, serviceIds_.getServerId()); - if (drt.getProjectName() == null && initialProject_ != null - && WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(serviceIds_.getTypeId()) == WebServiceScenario.BOTTOMUP - && WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(serviceIds_.getTypeId()).equals("org.eclipse.jst.ws.wsImpl.ejb") ) - { - drt.setProjectName(initialProject_.getName()); - } - serviceFacetMatcher_ = drt.getFacetMatcher(); - serviceProjectName_ = drt.getProjectName(); - serviceRuntimeId_ = drt.getRuntimeId(); - - if (serviceRuntimeId_ != null) - { - serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime() - .getId()); - } - } - - //**Step 2** Default the service project if it was not already defaulted - //as part of defaulting the Web service runtime. - if (serviceProjectName_ == null) - { - // Project name did not get set when the runtime was set, so set it now - serviceProjectName_ = getDefaultServiceProjectName(); - } - - //**Step 3** Default the service project type. - IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_); - if (!serviceProject.exists()) - { - // Set the project template - serviceComponentType_ = getDefaultServiceProjectTemplate(); - } - else - { - //Set it to an empty String - serviceComponentType_ = ""; - } - //**Step 4** Default the server if this is not an Ant scenario. - if (!serviceIdsFixed_) - { - // Set the server - IStatus serverStatus = setServiceDefaultServer(); - if (serverStatus.getSeverity() == Status.ERROR) - { - env.getStatusHandler().reportError(serverStatus); - return serverStatus; - } - } - - //**Step 5** Default clientNeedEAR and client EAR if an EAR is needed - setDefaultServiceEarProject(); - - // jvh - for now comment out generate proxy - // need to look at defaulting based on an event - // on page 1 - when client generation goes from none - // to develop... - /*if (generateProxy_) - {*/ - //Default the client-side. - IStatus clientSideStatus = defaultClientSide(monitor); - if (clientSideStatus.getSeverity() == Status.ERROR) - { - return clientSideStatus; - } - // } - - return Status.OK_STATUS; - - } catch (Exception e) - { - // Catch all Exceptions in order to give some feedback to the user - IStatus errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, - new String[] { e.getMessage() }), e); - - // If the exception has no error msg, it's kind of useless to the user so let's log it - if ( e.getMessage() == null){ - ILog pluginlog = WebServiceConsumptionUIPlugin.getInstance().getLog(); - pluginlog.log(errorStatus); - - // create a new IStatus which has a non-null msg, this is to be thrown to the user. - errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, - new String[] { WSUIPluginMessages.MSG_SEE_ERROR_LOG }), e); - } - - env.getStatusHandler().reportError(errorStatus); - return errorStatus; - } - } - - private IStatus defaultClientSide(IProgressMonitor monitor) - { - IStatus clientDefaultFromServiceStatus = defaultClientSideFromServiceSide(serviceProjectName_, serviceIds_, serviceNeedEAR_, serviceEarProjectName_); - - // If an error status is returned, the only property that was set on - // ClientRuntimeSelectionWidgetDefaultingCommand is clientProjectName_. - // The rest of the properties including clientRuntimeId_, clientComponentType_, - // all the values in clientIds_, clientNeedEAR_, and clientEarProjectName_ - // have not been set because the service side server and - // web service runtime could not be used on the client side. Run the entire - // client-side defaulting algorithm using clientProjectName_ as the - // clientInitialProject_. Then update the clientEarProjectName_ based on the - // service side EAR. - if (clientDefaultFromServiceStatus.getSeverity() == IStatus.ERROR) - { - // 1. Run client side defaulting from scratch with clientInitialProject_ - // set to the new clientProjectName_. - IProject clientProject = ResourcesPlugin.getWorkspace().getRoot().getProject(getClientProjectName()); - setClientInitialProject(clientProject); - IStatus clientExecuteStatus = super.execute(monitor, null); - if (clientExecuteStatus.getSeverity() == Status.ERROR) - { - return clientExecuteStatus; - } - - // 2. Update the client-side EAR if serviceNeedEAR_ is true; - if (serviceNeedEAR_) - { - defaultClientEarFromServiceEar(serviceProjectName_, serviceEarProjectName_); - } - } - - return Status.OK_STATUS; - - } - - private void setDefaultServiceEarProject() - { - //Don't need an ear if this is a Java project, or if the selected template is jst.utility - IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_); - if (serviceProject.exists()) - { - serviceNeedEAR_ = !(FacetUtils.isJavaProject(serviceProject)); - } - else - { - serviceNeedEAR_ = !(FacetUtils.isUtilityTemplate(serviceComponentType_)); - } - - //If serviceNeedEAR_ is still true, it means that we're not dealing with a Java project - //or Java project type. Check the server. - - - if (serviceNeedEAR_) - { - - // Determine if an ear selection is needed based on the server type. - String serverId = serviceIds_.getServerId(); - if (serverId != null) - { - // Use the server type - String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId); - if (serverTargetId != null && serverTargetId.length() > 0) - { - if (!ServerUtils.isTargetValidForEAR(serverTargetId, "13")) - { - // Default the EAR selection to be empty - serviceNeedEAR_ = false; - } - } - } else { // serverId == null, assume that it does not need EAR - serviceNeedEAR_ = false; - } - } - - if (serviceNeedEAR_) - { - serviceEarProjectName_ = DefaultingUtils.getDefaultEARProjectName(serviceProjectName_); - } - else - { - serviceEarProjectName_ = ""; - } - } - - private IStatus setServiceDefaultServer() - { - //Choose an existing server the module is already associated with if possible - IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_); - IServer[] configuredServers = null; - if(serviceProject.exists()) - configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null); - - if (configuredServers!=null && configuredServers.length>0) - { - serviceIds_.setServerId(configuredServers[0].getServerType().getId()); - serviceIds_.setServerInstanceId(configuredServers[0].getId()); - return Status.OK_STATUS; - } - - //If the project exists, choose a suitable server or server type based on the existing project's runtime or facets - if (serviceProject.exists()) - { - IServer server = getServerFromProject(serviceProjectName_, serviceFacetMatcher_); - if (server != null) - { - serviceIds_.setServerId(server.getServerType().getId()); - serviceIds_.setServerInstanceId(server.getId()); - return Status.OK_STATUS; - } - else - { - IServerType serverType = getServerTypeFromProject(serviceProjectName_, serviceFacetMatcher_); - if (serverType != null) - { - serviceIds_.setServerId(serverType.getId()); - return Status.OK_STATUS; - } - } - } - - //Haven't picked a server/server type on the basis of the project. Pick a server/server type - //that is compatible with the serviceRuntimeId. - IServer server = getServerFromServiceRuntimeId(); - if (server!=null) - { - serviceIds_.setServerId(server.getServerType().getId()); - serviceIds_.setServerInstanceId(server.getId()); - return Status.OK_STATUS; - } - - IServerType serverType = getServerTypeFromServiceRuntimeId(); - if (serverType != null) - { - serviceIds_.setServerId(serverType.getId()); - return Status.OK_STATUS; - } - - //No suitable server was found. Popup an error. - RuntimeDescriptor runtimeDescriptor = WebServiceRuntimeExtensionUtils2.getRuntimeById(serviceIds_.getRuntimeId()); - if (runtimeDescriptor.getServerRequired()) - { - String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(serviceIds_.getRuntimeId()); - IStatus status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME, new String[]{runtimeLabel}) ); - return status; - } - - return Status.OK_STATUS; - } - - private IServer getServerFromServiceRuntimeId() - { - IServer[] servers = ServerCore.getServers(); - if (servers != null && servers.length > 0) - { - PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext(); - String preferredServerFactoryId = context.getServerFactoryId(); - - //If a server of the preferred server type is present, check that one first - for (int j = 0; j < servers.length; j++) - { - if (servers[j] != null && servers[j].getServerType() != null) - { - String serverFactoryId = servers[j].getServerType().getId(); - if (serverFactoryId.equals(preferredServerFactoryId)) - { - if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(serviceRuntimeId_, serverFactoryId)) - { - return servers[j]; - } - } - } - } - - //A server of the preferred server type could not be found or did not match. Check all the existing servers. - for (int i = 0; i < servers.length; i++) - { - if (servers[i] != null && servers[i].getServerType() != null) - { - String serverFactoryId = servers[i].getServerType().getId(); - if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(serviceRuntimeId_, serverFactoryId)) - { - return servers[i]; - } - } - } - } - return null; - } - - private IServerType getServerTypeFromServiceRuntimeId() - { - String[] serverTypes = WebServiceRuntimeExtensionUtils2.getServerFactoryIdsByServiceRuntime(serviceRuntimeId_); - if (serverTypes!=null && serverTypes.length>0) - { - //Return the preferred one if it is in the list - PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext(); - String preferredServerFactoryId = context.getServerFactoryId(); - for (int i=0; i<serverTypes.length; i++) - { - if (serverTypes[i].equals(preferredServerFactoryId)) - { - return ServerCore.findServerType(serverTypes[i]); - } - } - - return ServerCore.findServerType(serverTypes[0]); - } - - return null; - } - - - private String getDefaultServiceProjectTemplate() - { - String[] templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(serviceIds_.getTypeId(), serviceIds_.getRuntimeId()); - - //Walk the list of service project types in the project topology preference - ProjectTopologyContext ptc= WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext(); - String[] preferredTemplateIds = ptc.getServiceTypes(); - for (int j = 0; j < preferredTemplateIds.length; j++) - { - for (int i = 0; i < templates.length; i++) - { - String templateId = templates[i]; - if (templateId.equals(preferredTemplateIds[j])) - { - boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, templateId); - if (matches) - { - return templates[i]; - } - } - } - } - - //Since the preferredTemplateIds contains the union of all project types for all service runtimes, we are - //guaranteed to have returned by now, so the code below will never be executed under normal - //circumstances. Just return something to satisfy the compiler. - if (templates.length > 0) - return templates[0]; - - return ""; - - } - - private String getDefaultServiceProjectName() - { - IProject[] projects = FacetUtils.getAllProjects(); - ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_); - RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions(); - - //Check each project for compatibility with the serviceRuntime - for (int i=0; i<projects.length; i++) - { - Set facetVersions = FacetUtils.getFacetsForProject(projects[i].getName()); - org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null; - String fRuntimeName = null; - fRuntime = FacetUtils.getFacetRuntimeForProject(projects[i].getName()); - if (fRuntime != null) - { - fRuntimeName = fRuntime.getName(); - } - - if (facetVersions != null) - { - FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimeId_, projects[i].getName()); - boolean facetRuntimeMatches = true; - if (fRuntimeName != null) - { - facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(rfvs, fRuntimeName); - } - - if (fm.isMatch() && facetRuntimeMatches) - { - serviceFacetMatcher_ = fm; - return projects[i].getName(); - } - } - } - - //No project was suitable, return a new project name - return ResourceUtils.getDefaultWebProjectName(); - - } - - private DefaultRuntimeTriplet getDefaultServiceRuntimeForFixedRuntimeAndServer(IProject project, String runtimePreferredServer) - { - String[] serviceRuntimes = WebServiceRuntimeExtensionUtils2.getServiceRuntimesByServiceType(serviceIds_.getTypeId(), runtimePreferredServer); - ArrayList<String> validServiceRuntimes = new ArrayList<String>(); - for (int i=0; i<serviceRuntimes.length; i++ ) - { - ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimes[i]); - if (desc.getRuntime().getId().equals(serviceIds_.getRuntimeId())) - { - //Check if this service runtime supports the server - if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(desc.getId(), serviceIds_.getServerId())) - { - validServiceRuntimes.add(desc.getId()); - if (project != null && project.exists()) - { - Set facetVersions = FacetUtils.getFacetsForProject(project.getName()); - if (facetVersions != null) - { - FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimes[i], project.getName()); - if (fm.isMatch()) - { - DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet(); - drt.setFacetMatcher(fm); - drt.setProjectName(project.getName()); - drt.setRuntimeId(desc.getId()); - return drt; - } - } - } - - } - } - - } - - if (validServiceRuntimes.size() > 0) - { - //We couldn't match to the initially selected project so return the first valid runtime. - DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet(); - drt.setFacetMatcher(null); - drt.setProjectName(null); - drt.setRuntimeId(((String[])validServiceRuntimes.toArray(new String[0]))[0]); - return drt; - } - else - { - //There are no service runtimes that match the fixed runtime and server. Fall back to original algorithm. - serviceIdsFixed_ = false; - return getDefaultRuntime(project, serviceIds_.getTypeId(), false, serviceIds_.getServerId()); - } - } - - - - public void setInitialSelection(IStructuredSelection selection) - { - } - - public void setInitialProject(IProject initialProject) - { - initialProject_ = initialProject; - } - - public IProject getInitialProject() - { - return initialProject_; - } - - public void setInitialComponentName(String name) - { - //TODO This method and any mappings to it - // should be removed if no longer needed. - } - - public void setServiceTypeRuntimeServer( TypeRuntimeServer ids ) - { - serviceIds_ = ids; - } - - public void setServiceIdsFixed(boolean b) - { - serviceIdsFixed_ = b; - } - - public TypeRuntimeServer getServiceTypeRuntimeServer() - { - return serviceIds_; - } - - public String getServiceRuntimeId() - { - return serviceRuntimeId_; - } - /** - * @return Returns the generateProxy_. - */ - public boolean getGenerateProxy() - { - return generateProxy_; - } - /** - * @param generateProxy_ The generateProxy_ to set. - */ - public void setGenerateProxy(boolean generateProxy_) - { - this.generateProxy_ = generateProxy_; - } - - public String getServiceProjectName() - { - return serviceProjectName_; - } - - public String getServiceEarProjectName() - { - return serviceEarProjectName_; - } - - public String getServiceComponentType() - { - return serviceComponentType_; - } - - public boolean getServiceNeedEAR() - { - return serviceNeedEAR_; - } - - // This is for the Ant scenario where the service project name can be set in the property file. - // If the user has set the ServiceProjectName use it for defaulting purposes - public void setServiceProjectName(String name) - { - serviceProjectName_ = name; - } - -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java deleted file mode 100644 index 9b6df88ab..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/** - */ -package org.eclipse.jst.ws.internal.creation.ui.widgets.test; - -import org.eclipse.wst.command.internal.env.core.common.Condition; -import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; - - -public class LaunchFragment extends BooleanFragment -{ - private boolean publishToPublicUDDI_; - private boolean publishToPrivateUDDI_; - - public LaunchFragment() - { - Condition condition = new Condition() - { - public boolean evaluate() - { - return (publishToPublicUDDI_ || publishToPrivateUDDI_); - } - }; - setCondition( condition ); - setTrueFragment( new SimpleFragment( new WSExplorerLauncherCommand(), "" ) ); - } - - public void setPublishToPublicUDDI(boolean publishToPublicUDDI) - { - publishToPublicUDDI_ = publishToPublicUDDI; - } - - public void setPublishToPrivateUDDI(boolean publishToPrivateUDDI) - { - publishToPrivateUDDI_ = publishToPrivateUDDI; - } - -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java deleted file mode 100644 index 730e1539c..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/** - */ -package org.eclipse.jst.ws.internal.creation.ui.widgets.test; - -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand; -import org.eclipse.wst.command.internal.env.core.common.Condition; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; - - -public class ServiceTestFragment extends BooleanFragment -{ - private boolean testService; - private boolean generateProxy; - - - public ServiceTestFragment( String id ) - { - SequenceFragment testRoot = new SequenceFragment(); - Condition condition = new Condition() - { - public boolean evaluate() - { - return testService; - } - }; - setCondition( condition ); - - testRoot.add( new SimpleFragment( new WebServiceTestDefaultingCommand(), "" ) ); - testRoot.add( new SimpleFragment( id ) ); - setTrueFragment( testRoot ); - - } - - - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - - dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "TestID",WSDLTestLaunchCommand.class); - - //from the wizard - dataRegistry.addMapping(ServiceTestWidget.class, "TestID",WSDLTestLaunchCommand.class); - dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ExternalBrowser",WSDLTestLaunchCommand.class); - } - - public void setGenerateProxy(boolean generateProxy) - { - this.generateProxy = generateProxy; - } - - public boolean getGenerateProxy() - { - return generateProxy; - } - - /** - * @return Returns the testService. - */ - public void setTestService( boolean testService ) - { - this.testService = testService; - } - - - -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java deleted file mode 100644 index 4f186f1bf..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java +++ /dev/null @@ -1,170 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets.test; - -import java.util.List; -import java.util.Vector; - -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.wst.command.internal.env.core.selection.SelectionList; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.common.environment.IEnvironment; - - -public class ServiceTestWidget extends SimpleWidgetDataContributor -{ - private String createPluginId_ = "org.eclipse.jst.ws.creation.ui"; - - private Combo testTypeCombo_; - /*CONTEXT_ID PSTP0001 for the Test Type Combo box of the Service Test Page*/ - private final String INFOPOP_PSTP_COMBOBOX_TEST = "PSTP0001"; - - private Button launchButton_; - /*CONTEXT_ID PSTP0002 for the launch button of the Service Test Page*/ - private final String INFOPOP_PSTP_LAUNCH_BUTTON = "PSTP0002"; - - - private SelectionList facilities_; - - private String serviceServerInstanceId = null; - - public WidgetDataEvents addControls( Composite parent, Listener statusListener ) - { - UIUtils uiUtils = new UIUtils(createPluginId_ ); - - Composite testComposite = uiUtils.createComposite( parent, 3, 0, 0 ); - - testTypeCombo_ = uiUtils.createCombo( testComposite, ConsumptionUIMessages.LABEL_TEST_TYPES, - ConsumptionUIMessages.TOOLTIP_PSTP_COMBOBOX_TEST, - INFOPOP_PSTP_COMBOBOX_TEST, - SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY ); - - launchButton_ = uiUtils.createPushButton( testComposite, ConsumptionUIMessages.BUTTON_LAUNCH_SERVICE_TEST, - ConsumptionUIMessages.TOOLTIP_PSTP_LAUNCH_BUTTON, - INFOPOP_PSTP_LAUNCH_BUTTON ); - launchButton_.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent event ) - { - handleLaunchButton(); - } - }); - - - return this; - } - - private TypeRuntimeServer serviceids; - private String serverProject; - private String module; - private String wsdlURI; - private String launchedServiceTestName = ""; - private IEnvironment env; - private List endpoints; - - private void handleLaunchButton() - { - // Split up the project and module - int p = serverProject.indexOf("/"); - if (p != -1){ - module = serverProject.substring(p+1); - serverProject = serverProject.substring(0,p); - } - - String testID = testTypeCombo_.getText(); - launchedServiceTestName = testID; - WSDLTestLaunchCommand wtlc = new WSDLTestLaunchCommand(); - wtlc.setTestID(testID); - wtlc.setServiceTypeRuntimeServer(serviceids); - wtlc.setServiceServerInstanceId(serviceServerInstanceId); - wtlc.setServerProject(serverProject); - wtlc.setServerModule(module); - wtlc.setWsdlURI(wsdlURI); - wtlc.setExternalBrowser(true); - wtlc.setEndpoint(endpoints); - wtlc.setEnvironment( env ); - wtlc.execute( null, null ); - } - - public void setServiceTestFacilities( SelectionList facilities ) - { - facilities_ = facilities; - testTypeCombo_.setItems( facilities.getList() ); - testTypeCombo_.select( facilities.getIndex() ); - } - - public SelectionList getServiceTestFacilities() - { - facilities_.setIndex( testTypeCombo_.getSelectionIndex() ); - return facilities_; - } - - public String getTestID() - { - return testTypeCombo_.getText(); - } - - public void setWsdlURI(String wsdlURI) - { - this.wsdlURI = wsdlURI; - } - - public void setServerProject(String serverProject) - { - this.serverProject = serverProject; - } - - public void setServiceTypeRuntimeServer(TypeRuntimeServer serviceids) - { - this.serviceids = serviceids; - } - - public String getLaunchedServiceTestName() - { - return launchedServiceTestName; - } - - public void setEnvironment(IEnvironment env) - { - this.env = env; - } - - public void setEndpoint(String endpoint) - { - if (endpoint != null && endpoint.length() > 0) - { - Vector v = new Vector(); - v.add(endpoint); - setEndpoints(v); - } - } - - public void setEndpoints(List endpoints) - { - this.endpoints = endpoints; - } - - public void setServiceServerInstanceId(String ssInstanceId){ - this.serviceServerInstanceId = ssInstanceId; - } - -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java deleted file mode 100644 index 9d1d6af93..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java +++ /dev/null @@ -1,93 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/* - * Created on Apr 15, 2004 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -package org.eclipse.jst.ws.internal.creation.ui.widgets.test; - -import java.util.Enumeration; -import java.util.Vector; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension; -import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry; -import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.wst.command.internal.env.core.selection.SelectionList; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -/** - * @author gilberta - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -public class WebServiceTestDefaultingCommand extends AbstractDataModelOperation -{ - - private SelectionList serviceTestFacilities; - private String[] testID; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy(); - testID = scenarioContext.getNonJavaTestService(); - String[] testTypes = scenarioContext.getWebServiceTestTypes(); - - IStatus status = Status.OK_STATUS; - WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance(); - - - Vector wsdlNames = new Vector(); - for(int i =0 ;i<testTypes.length;i++){ - WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[i]); - if(wscte.testWSDL()){ - wsdlNames.addElement(testTypes[i]); - } - } - - String javaNamesArray[] = new String[wsdlNames.size()]; - Enumeration e = wsdlNames.elements(); - int i = 0; - while(e.hasMoreElements()){ - javaNamesArray[i] = (String)e.nextElement(); - i++; - } - - - serviceTestFacilities = new SelectionList(javaNamesArray,0); - - return status; - } - - public SelectionList getServiceTestFacilities() - { - return serviceTestFacilities; - } - - public String[] getTestID() - { - return testID; - } - - public boolean getExternalBrowser() - { - return false; - } - - -} |
