diff options
Diffstat (limited to 'bundles/org.eclipse.jst.ws.creation.ui/src/org')
25 files changed, 0 insertions, 3991 deletions
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 14c74bf2f..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 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.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 f26be7534..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java +++ /dev/null @@ -1,132 +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.ant; - -import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand; -import org.eclipse.jst.ws.internal.consumption.ui.command.AntDefaultingOperation; -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.selection.SelectionTransformer; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.CheckWSDLValidationCommand; -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 CheckWSDLValidationCommand(), "")); - 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 ScenarioCleanupCommand(), "" )); - } - - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialComponentName", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null); - dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "WebServicesParser", ServerExtensionDefaultingCommand.class ); - - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class); - - // 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); - - //Map AntDefaultingFragment - dataRegistry.addMapping(AntDefaultingOperation.class, "ServiceIdsFixed", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(AntDefaultingOperation.class, "ClientIdsFixed", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(AntDefaultingOperation.class, "StartService", PreServiceDevelopCommand.class); - dataRegistry.addMapping(AntDefaultingOperation.class, "InstallService", PreServiceDevelopCommand.class); - dataRegistry.addMapping(AntDefaultingOperation.class, "DeployService", PreServiceDevelopCommand.class); - - // Map ServerRuntimeSelectionWidgetDefaultingCommand - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class); - - - // Map ServerExtensionDefaultingCommand - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class); - - // Setup the PreServiceDevelopCommand. - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class); - - dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceRuntimeId", PreServiceDevelopCommand.class ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null ); - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null ); - - dataRegistry.addMapping( 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); - - } - -} 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 bb42e9cf9..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java +++ /dev/null @@ -1,106 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060131 121071 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.jst.j2ee.internal.plugin.IJ2EEModuleConstants; -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.RequiredFacetVersion; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.wsrt.IWebService; - -public class PreServiceAssembleCommand extends AbstractDataModelOperation -{ - private IWebService webService_; - private String project_; - private String module_; - private String earProject_; - private String ear_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment environment = getEnvironment(); - - // 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); - - // RequiredFacetVersions is set to an empty array because we don't need to impose any additional constraints. - // We just want to create the highest level of EAR project that the selected server supports. - command.setRequiredFacetVersions(new RequiredFacetVersion[0]); - - command.setServerFactoryId(webService_.getWebServiceInfo().getServerFactoryId()); - command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId()); - IStatus 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); - } - - return status; - } - - public void setProject( String project ) - { - project_ = project; - } - - public void setModule( String module ) - { - module_ = module; - } - - public void setEarProject( String earProject ) - { - earProject_ = earProject; - } - - public void setEar( String ear ) - { - ear_ = ear; - } - - public void setWebService( IWebService webService ) - { - webService_ = webService; - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/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 3df8d7e21..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java +++ /dev/null @@ -1,266 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.creation.ui.extension; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.wsrt.IContext; -import org.eclipse.wst.ws.internal.wsrt.ISelection; -import org.eclipse.wst.ws.internal.wsrt.IWebService; -import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime; -import org.eclipse.wst.ws.internal.wsrt.SimpleContext; -import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; -import org.eclipse.wst.ws.internal.wsrt.WebServiceState; - -public class PreServiceDevelopCommand extends AbstractDataModelOperation -{ - private TypeRuntimeServer typeRuntimeServer_; - private String serviceRuntimeId_; - private IContext context_; - private ISelection selection_; - private String project_; - private String module_; - private String moduleType_; - private String earProject_; - private String ear_; - - private IWebService webService_; - private String j2eeLevel_; - private ResourceContext resourceContext_; - - private boolean deploy_; - private boolean install_; - private boolean run_; - private boolean client_; - private boolean test_; - private boolean publish_; - - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment environment = getEnvironment(); - - // Split up the project and module - int index = module_.indexOf("/"); - if (index!=-1){ - project_ = module_.substring(0,index); - module_ = module_.substring(index+1); - } - - if (ear_!=null && ear_.length()>0) - { - int earIndex = ear_.indexOf("/"); - if (earIndex!=-1) { - earProject_ = ear_.substring(0,earIndex); - ear_ = ear_.substring(earIndex+1); - } - } - - - IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils2.getServiceRuntime( serviceRuntimeId_ ); - WebServiceInfo wsInfo = new WebServiceInfo(); - - wsInfo.setServerFactoryId( typeRuntimeServer_.getServerId() ); - wsInfo.setServerInstanceId( typeRuntimeServer_.getServerInstanceId()); - wsInfo.setState( WebServiceState.UNKNOWN_LITERAL ); - wsInfo.setWebServiceRuntimeId( typeRuntimeServer_.getRuntimeId() ); - - webService_ = wsrt.getWebService( wsInfo ); - - //Set up the IContext - WebServiceScenario scenario = null; - int scenarioInt = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeRuntimeServer_.getTypeId()); - if (scenarioInt == WebServiceScenario.BOTTOMUP) - { - scenario = WebServiceScenario.BOTTOMUP_LITERAL; - String impl = (String)(selection_.getSelection())[0]; - wsInfo.setImplURL(impl); - } - else if (scenarioInt == WebServiceScenario.TOPDOWN) - { - scenario = WebServiceScenario.TOPDOWN_LITERAL; - String wsdlURL = (String)(selection_.getSelection())[0]; - wsInfo.setWsdlURL(wsdlURL); - } - - context_ = new SimpleContext(true, true, deploy_, install_, run_, client_, test_, publish_, - scenario, - resourceContext_.isOverwriteFilesEnabled(), - resourceContext_.isCreateFoldersEnabled(), - resourceContext_.isCheckoutFilesEnabled()); - - IStatus status = Status.OK_STATUS; - - // Create the service module if needed. - IProject project = ProjectUtilities.getProject(project_); - if (!project.exists()) - { - boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, moduleType_); - if (matches) - { - RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRequiredFacetVersions(); - CreateFacetedProjectCommand command = new CreateFacetedProjectCommand(); - command.setProjectName(project_); - command.setTemplateId(moduleType_); - command.setRequiredFacetVersions(rfv); - command.setServerFactoryId(typeRuntimeServer_.getServerId()); - command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId()); - status = command.execute( monitor, adaptable ); - if (status.getSeverity() == Status.ERROR) - { - environment.getStatusHandler().reportError( status ); - return status; - } - } - } - - //The project should now exist. Add facets if needed. - RequiredFacetVersion[] rfvs = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRequiredFacetVersions(); - status = FacetUtils.addRequiredFacetsToProject(project, rfvs, monitor); - if (status.getSeverity() == Status.ERROR) - { - environment.getStatusHandler().reportError( status ); - return status; - } - - 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 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; - } - - -} 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 7bea4682b..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java +++ /dev/null @@ -1,116 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.creation.ui.extension; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.wsrt.IContext; -import org.eclipse.wst.ws.internal.wsrt.IWebService; - -public class PreServiceInstallCommand extends AbstractDataModelOperation -{ - private IWebService webService_; - private String project_; - private String module_; - private String earProject_; - private String ear_; - private IContext context_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - if (context_.getInstall()) - { - IEnvironment environment = getEnvironment(); - - if (webService_.getWebServiceInfo().getServerInstanceId()==null) - { - CreateServerCommand createServerCommand = new CreateServerCommand(); - createServerCommand.setServerFactoryid(webService_.getWebServiceInfo().getServerFactoryId()); - createServerCommand.setEnvironment( environment ); - IStatus createServerStatus = createServerCommand.execute( monitor, null); - if (createServerStatus.getSeverity()==Status.OK) - { - webService_.getWebServiceInfo().setServerInstanceId(createServerCommand.getServerInstanceId()); - } - else - { - if (createServerStatus.getSeverity()==Status.ERROR) - { - environment.getStatusHandler().reportError(createServerStatus); - } - return createServerStatus; - } - } - - - - AddModuleToServerCommand command = new AddModuleToServerCommand(); - command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId()); - if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0) - { - command.setProject(earProject_); - command.setModule(ear_); - } - else - { - command.setProject(project_); - command.setModule(module_); - } - - command.setEnvironment( environment ); - IStatus status = command.execute( monitor, null ); - if (status.getSeverity()==Status.ERROR) - { - environment.getStatusHandler().reportError(status); - } - return status; - } - 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 b3d9c2cc1..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java +++ /dev/null @@ -1,118 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - *******************************************************************************/ - -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, "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 2a18e14d4..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java +++ /dev/null @@ -1,112 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.plugin; - -import java.net.MalformedURLException; -import java.net.URL; -import java.text.MessageFormat; -import org.eclipse.core.runtime.Plugin; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.wst.command.internal.env.core.common.MessageUtils; - - -/** -* This is the plugin class for the Web Services Creation UI plugin. -* <p> -* The Web Services Creation UI plugin's sole function is to add -* user interface of the Web Services Creation Wizard, contained in -* the org.eclipse.jst.ws.ui plugin. -*/ -public class WebServiceCreationUIPlugin extends Plugin -{ - - /** - * The identifier of the descriptor of this plugin in plugin.xml. - */ - public static final String ID = "org.eclipse.jst.ws.creation.ui"; - - /** - * The reference to the singleton instance of this plugin. - */ - private static WebServiceCreationUIPlugin instance_; - - /** - * Constructs a runtime plugin object for this plugin. - * The "plugin" element in plugin.xml should include the attribute - * class = "org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin". - * @param descriptor The descriptor of this plugin. - */ - public WebServiceCreationUIPlugin () - { - super(); - instance_ = this; - } - - /** - * Returns the singleton instance of this plugin. Equivalent to calling - * (WebServiceCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.creation.ui"); - * @return The WebServiceCreationUIPlugin singleton. - */ - public static WebServiceCreationUIPlugin getInstance () - { - return instance_; - } - - /** - * Returns the message string identified by the given key from - * plugin.properties. - * @return The String message. - */ - public static String getMessage ( String key ) - { - MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.creation.ui.plugin", instance_ ); - - if( key.startsWith("%")) - { - key = key.substring( 1, key.length() ); - } - - return msgUtils.getMessage(key); - } - - /** - * Returns the message string identified by the given key from - * plugin.properties. Substitution sequences in the message string - * are replaced by the given array of substitution objects (which - * are most frequently strings). See the JDK's - * {@link java.text.MessageFormat java.text.MessageFormat} - * class for further details on substitution. - * @return The String message. - */ - public static String getMessage ( String key, Object[] args ) - { - return MessageFormat.format(getMessage(key),args); - } - - /** - * Returns an image descriptor for the named resource - * as relative to the plugin install location. - * @return An image descriptor, possibly null. - */ - public static ImageDescriptor getImageDescriptor ( String name ) - { - try - { - URL installURL = instance_.getBundle().getEntry("/"); - URL imageURL = new URL(installURL,name); - return ImageDescriptor.createFromURL(imageURL); - } - catch (MalformedURLException e) - { - return null; - } - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java deleted file mode 100644 index 514b1f3b9..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java +++ /dev/null @@ -1,142 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.preferences; - -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; - - - -/** - * - */ -public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage -{ - private ServerWizardWidget serverWidget_ = null; - - public void init(IWorkbench workbench) { } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ - - protected Control createContents(Composite parent) - { - UIUtils utils = new UIUtils(null); - - Composite page = utils.createComposite( parent, 1 ); - - serverWidget_ = new ServerWizardWidget( false ); - serverWidget_.addControls( page, new Listener() - { - public void handleEvent( Event evt ){} - } ); - initializeValues(); - return page; - } - - private void initializeValues() - { - ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext(); - - // Set values from context. - TypeRuntimeServer serverIds = new TypeRuntimeServer(); - TypeRuntimeServer clientIds = new TypeRuntimeServer(); - - serverIds.setTypeId( context.getWebServiceType() ); - clientIds.setTypeId( context.getClientWebServiceType() ); - - serverWidget_.setServiceTypeRuntimeServer( serverIds ); - serverWidget_.setClientTypeRuntimeServer( clientIds ); - serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxy()) ); - serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorer()) ); - serverWidget_.setInstallService( new Boolean(context.getInstallWebService()) ); - serverWidget_.setInstallClient( new Boolean(context.getInstallClient()) ); - serverWidget_.setStartService( new Boolean(context.getStartWebService()) ); - serverWidget_.setTestService( new Boolean(context.getTestWebService()) ); - serverWidget_.setMonitorService(new Boolean(context.getMonitorWebService())); - serverWidget_.internalize(); - } - - /** - * Does anything necessary because the default button has been pressed. - */ - protected void performDefaults() - { - super.performDefaults(); - setToDefaults(); - } - - private void setToDefaults() - { - ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext(); - - // Set values from context. - TypeRuntimeServer serverIds = new TypeRuntimeServer(); - TypeRuntimeServer clientIds = new TypeRuntimeServer(); - - serverIds.setTypeId( context.getWebServiceTypeDefault() ); - clientIds.setTypeId( context.getClientWebServiceTypeDefault() ); - - serverWidget_.setServiceTypeRuntimeServer( serverIds ); - serverWidget_.setClientTypeRuntimeServer( clientIds ); - serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxyDefault()) ); - serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorerDefault()) ); - serverWidget_.setInstallService( new Boolean(context.getInstallWebServiceDefault()) ); - serverWidget_.setInstallClient( new Boolean(context.getInstallClientDefault()) ); - serverWidget_.setStartService( new Boolean(context.getStartWebServiceDefault()) ); - serverWidget_.setTestService( new Boolean(context.getTestWebServiceDefault()) ); - serverWidget_.setMonitorService(new Boolean(context.getMonitorWebServiceDefault())); - serverWidget_.internalize(); - } - - /** - * Do anything necessary because the OK button has been pressed. - * @return whether it is okay to close the preference page - */ - public boolean performOk() - { - storeValues(); - return true; - } - - private void storeValues() - { - ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext(); - - TypeRuntimeServer serverIds = serverWidget_.getServiceTypeRuntimeServer(); - TypeRuntimeServer clientIds = serverWidget_.getClientTypeRuntimeServer(); - - context.setWebServiceType( serverIds.getTypeId() ); - context.setClientWebServiceType( clientIds.getTypeId() ); - context.setGenerateProxy( serverWidget_.getGenerateProxy().booleanValue() ); - context.setLaunchWebServiceExplorer( serverWidget_.getPublishService().booleanValue() ); - context.setInstallWebService( serverWidget_.getInstallService().booleanValue() ); - context.setInstallClient( serverWidget_.getInstallClient().booleanValue() ); - context.setStartWebService( serverWidget_.getStartService().booleanValue() ); - context.setTestWebService( serverWidget_.getTestService().booleanValue() ); - context.setMonitorWebService(serverWidget_.getMonitorService().booleanValue()); - } - - protected void performApply() - { - performOk(); - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java deleted file mode 100644 index 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 942845f6e..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.creation.ui.server; - -import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.ws.internal.wsrt.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_.getInstall()) - { - server = ServerCore.findServer(webservice_.getWebServiceInfo().getServerInstanceId() ); - } - - if( server != null && server.getServerState() != IServer.STATE_STARTED ) - { - return new StartServerWidgetContributor( server ); - } - - return null; - } - - public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) - { - return null; - } - - public void registerDataMappings(DataMappingRegistry dataRegistry) - { - dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", StartServerWidgetFactory.class ); - 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 b727c51fa..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java +++ /dev/null @@ -1,351 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.PreferencesSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.LabelsAndIds; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; - - -public class ServerWizardWidget extends SimpleWidgetDataContributor -{ - private WebServiceClientTypeWidget clientWidget_; - private PreferencesSelectionWidget preferencesWidget_; - private Listener statusListener_; - private TypeRuntimeServer ids_; - private LabelsAndIds labelIds_; - private boolean displayPreferences_; - - /*CONTEXT_ID PWPR0001 for the Project Page*/ - private String INFOPOP_PWPR_PAGE = "PWPR0001"; - - /*CONTEXT_ID PWPR0005 for the Generate Proxy check box of the Project Page*/ - private String INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY = "PWPR0005"; - private Button generateProxy_; - - /*CONTEXT_ID PWPR0010 for the Web Service Type combo box of the Project Page*/ - private String INFOPOP_PWPR_COMBO_TYPE = "PWPR0010"; - private Combo webserviceType_; - - /*CONTEXT_ID PWPR0011 for the Wizard Scenario Service group of the Project Page*/ - private String INFOPOP_PWPR_GROUP_SCENARIO_SERVICE = "PWPR0011"; - private Button startService_; - - /*CONTEXT_ID PWPR0017 for the Install Service check box of the Scenario page of Service wizard*/ - private String INFOPOP_PWPR_CHECKBOX_INSTALL_SERVICE = "PWPR0017"; - private Button installService_; - - /*CONTEXT_ID PWPR0009 for the Start Web Project check box check box of the Project Page*/ - private String INFOPOP_PWPR_CHECKBOX_START_WEB_PROJECT = "PWPR0009"; - - /*CONTEXT_ID PWPR0013 for the test service checkbox of the project page*/ - private String INFOPOP_PWPR_CHECKBOX_TEST_SERVICE = "PWPR0013"; - private Button testService_; - - /*CONTEXT_ID PWPR0014 for the monitor service checkbox of the projec page*/ - private String INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE = "PWPR0014"; - private Button monitorService; - - /*CONTEXT_ID PWPR0012 for the Launch UDDI check box of the Project Page*/ - private String INFOPOP_PWPR_CHECKBOX_LAUNCH_WS = "PWPR0012"; - private Button launchUddi_; - - public ServerWizardWidget( boolean displayPreferences ) - { - displayPreferences_ = displayPreferences; - } - - public WidgetDataEvents addControls( Composite parent, Listener statusListener) - { - String pluginId = "org.eclipse.jst.ws.consumption.ui"; - String createPluginId = "org.eclipse.jst.ws.creation.ui"; - UIUtils utils = new UIUtils( createPluginId ); - - statusListener_ = statusListener; - - PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PWPR_PAGE ); - - Composite serverComposite = utils.createComposite( parent, 1 ); - - Group serviceGroup = utils.createGroup( serverComposite, ConsumptionUIMessages.GROUP_SCENARIO_SERVICE, - ConsumptionUIMessages.TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE, - INFOPOP_PWPR_GROUP_SCENARIO_SERVICE, - 2, 10, 10); - - - // Create webservice combo box. - webserviceType_ = utils.createCombo( serviceGroup, ConsumptionUIMessages.LABEL_WEBSERVICETYPE, - ConsumptionUIMessages.TOOLTIP_PWPR_COMBO_TYPE, - INFOPOP_PWPR_COMBO_TYPE, - SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY ); - webserviceType_.addListener( SWT.Modify, statusListener ); - - Composite buttonsGroup = utils.createComposite( serviceGroup, 1 ); - GridData buttonGrid = new GridData(); - buttonGrid.horizontalSpan = 2; - buttonsGroup.setLayoutData( buttonGrid ); - - // Create install service check box. - installService_ = utils.createCheckbox( buttonsGroup, ConsumptionUIMessages.BUTTON_INSTALL_SERVICE_WEB_PROJECT, - ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_INSTALL_SERVICE_WEB_PROJECT, - INFOPOP_PWPR_CHECKBOX_INSTALL_SERVICE ); - installService_ .addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - handleInstallPressed(); - } - }); - - // Create start service check box. - startService_ = utils.createCheckbox( buttonsGroup, ConsumptionUIMessages.BUTTON_START_WEB_PROJECT, - ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT, - INFOPOP_PWPR_CHECKBOX_START_WEB_PROJECT ); - startService_.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - handleStartPressed(); - } - }); - - launchUddi_ = utils.createCheckbox( buttonsGroup, ConsumptionUIMessages.BUTTON_WS_PUBLISH, - ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS, - INFOPOP_PWPR_CHECKBOX_LAUNCH_WS ); - - Composite proxyComposite = utils.createComposite( serverComposite, 1, 5, 0 ); - - // Create generate proxy check box. - generateProxy_ = utils.createCheckbox( proxyComposite, ConsumptionUIMessages.BUTTON_GENERATE_PROXY, - ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY, - INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY ); - generateProxy_.addSelectionListener( new SelectionAdapter() - { - public void widgetSelected( SelectionEvent evt ) - { - clientWidget_.enableWidget( generateProxy_.getSelection() ); - } - }); - - // Create client selection widget. - clientWidget_ = new WebServiceClientTypeWidget(); - clientWidget_.addControls( serverComposite, statusListener ); - - Composite testGroup = utils.createComposite(serverComposite,1); - - // Create test service check box. - testService_ = utils.createCheckbox( testGroup, ConsumptionUIMessages.CHECKBOX_TEST_WEBSERVICE, - ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE, - INFOPOP_PWPR_CHECKBOX_TEST_SERVICE ); - - monitorService = utils.createCheckbox( testGroup, ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE, - ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE, - INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE ); - - if( displayPreferences_ ) - { - // Create the preferences widgets. - preferencesWidget_ = new PreferencesSelectionWidget(); - preferencesWidget_.addControls( serverComposite, statusListener ); - } - - return this; - } - - private void handleInstallPressed() - { - boolean enabled = installService_.getSelection(); - - if (!enabled) - { - startService_.setSelection(enabled); - } - startService_.setEnabled(enabled); - handleStartPressed(); - } - - private void handleStartPressed() - { - boolean enabled = startService_.getSelection(); - - testService_.setEnabled( enabled ); - monitorService.setEnabled(enabled); - launchUddi_.setEnabled( enabled ); - generateProxy_.setEnabled( enabled ); - clientWidget_.enableWidget( getGenerateProxy().booleanValue() ); - } - - public void setClientTypeRuntimeServer( TypeRuntimeServer ids ) - { - clientWidget_.setTypeRuntimeServer( ids ); - } - - public TypeRuntimeServer getClientTypeRuntimeServer() - { - return clientWidget_.getTypeRuntimeServer(); - } - - public void setInstallClient( Boolean install) - { - clientWidget_.setInstallClient( install ); - } - - public Boolean getInstallClient() - { - return clientWidget_.getInstallClient(); - } - - public void setServiceTypeRuntimeServer( TypeRuntimeServer ids ) - { - LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils2.getServiceTypeLabels(); - //rskreg - int selection = 0; - String[] serviceIds = labelIds.getIds_(); - String selectedId = ids.getTypeId(); - - webserviceType_.removeListener( SWT.Modify, statusListener_ ); - webserviceType_.setItems( labelIds.getLabels_() ); - - // Now find the selected one. - for( int index = 0; index < serviceIds.length; index++ ) - { - if( selectedId.equals( serviceIds[index ]) ) - { - selection = index; - break; - } - } - - webserviceType_.select( selection ); - webserviceType_.addListener( SWT.Modify, statusListener_ ); - ids_ = ids; - labelIds_ = labelIds; - } - - public TypeRuntimeServer getServiceTypeRuntimeServer() - { - int selectionIndex = webserviceType_.getSelectionIndex(); - - ids_.setTypeId( labelIds_.getIds_()[selectionIndex] ); - - return ids_; - } - - public Boolean getStartService() - { - return new Boolean( startService_.getSelection() && installService_.getSelection()); - } - - public void setStartService( Boolean value ) - { - startService_.setSelection( value.booleanValue() ); - } - - public Boolean getInstallService() - { - return new Boolean( installService_.getSelection() ); - } - - public void setInstallService( Boolean value ) - { - installService_.setSelection( value.booleanValue() ); - } - - public Boolean getTestService() - { - return new Boolean( testService_.getSelection() && startService_.getSelection() ); - } - - public void setTestService( Boolean value ) - { - testService_.setSelection( value.booleanValue() ); - } - - public Boolean getMonitorService() - { - return new Boolean(monitorService.getSelection() && startService_.getSelection()); - } - - public void setMonitorService(Boolean value) - { - monitorService.setSelection(value.booleanValue()); - } - - public Boolean getPublishService() - { - return new Boolean( launchUddi_.getSelection() && startService_.getSelection() ); - } - - public void setPublishService( Boolean value ) - { - launchUddi_.setSelection( value.booleanValue() ); - } - - public Boolean getGenerateProxy() - { - return new Boolean( generateProxy_.getSelection() && startService_.getSelection() ); - } - - public void setGenerateProxy( Boolean value ) - { - generateProxy_.setSelection( value.booleanValue() ); - } - - public ResourceContext getResourceContext() - { - return preferencesWidget_.getResourceContext(); - } - - public void setResourceContext( ResourceContext context ) - { - preferencesWidget_.setResourceContext( context ); - } - - public void internalize() - { - handleInstallPressed(); - handleStartPressed(); - } - - public IStatus getStatus() - { - IStatus status = Status.OK_STATUS; - - // If the webservice has not been selected then user can not move - // forward to the next page. - if( webserviceType_.getText().equals("") ) - { - status = StatusUtils.errorStatus( "" ); - } - - return status; - } -} 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 fb1ad1023..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java +++ /dev/null @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets; - -import org.eclipse.core.runtime.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.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; - -public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefaultingCommand -{ - private TypeRuntimeServer typeRuntimeServer_; - private IStructuredSelection initialSelection_; - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - - String type = getScenarioContext().getWebServiceType(); - String runtime = WebServiceRuntimeExtensionUtils2.getDefaultRuntimeValueFor( type ); - - String factoryID = WebServiceRuntimeExtensionUtils2.getDefaultServerValueFor(type); - typeRuntimeServer_ = new TypeRuntimeServer(); - - typeRuntimeServer_.setTypeId( type ); - typeRuntimeServer_.setRuntimeId( runtime ); - typeRuntimeServer_.setServerId( factoryID ); - - //Default the typeId from the initial selection - String[] typeIds = WebServiceRuntimeExtensionUtils2.getWebServiceTypeBySelection(initialSelection_); - - if (typeIds!=null && typeIds.length>0) - { - typeRuntimeServer_.setTypeId(typeIds[0]); - } - - return Status.OK_STATUS; - } - - public void setInitialSelection(IStructuredSelection selection) - { - initialSelection_ = selection; - } - - public TypeRuntimeServer getServiceTypeRuntimeServer() - { - return typeRuntimeServer_; - } - - public Boolean getInstallService() - { - return new Boolean( getScenarioContext().getInstallWebService() ); - } - - public Boolean getStartService() - { - return new Boolean( getScenarioContext().getStartWebService() ); - } - - public Boolean getPublishService() - { - return new Boolean( getScenarioContext().getLaunchWebServiceExplorer() ); - } - - public Boolean getGenerateProxy() - { - return new Boolean( getScenarioContext().getGenerateProxy() ); - } - - public Boolean getMonitorService() - { - return new Boolean(getScenarioContext().getMonitorWebService()); - } -}
\ No newline at end of file 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 3b0c12549..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets; - -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 publishService_; - private boolean generateProxy_; - private ResourceContext resourceContext_; - - - public TypeRuntimeServer getServiceTypeRuntimeServer() - { - return typeRuntimeServer_; - } - - public boolean getInstallService() - { - return installService_; - } - - public boolean getStartService() - { - return startService_; - } - - public boolean getTestService() - { - return testService_; - } - - 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 typeRuntimeServer_ The typeRuntimeServer_ to set. - */ - public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer_) - { - this.typeRuntimeServer_ = typeRuntimeServer_; - } - - public void setResourceContext(ResourceContext rc) - { - resourceContext_ = rc; - } -}
\ No newline at end of file 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 804cb29d4..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 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and 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); - } - } - ); - } -}
\ No newline at end of file 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 37d757656..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 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and 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) - { - } -}
\ No newline at end of file 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 1797b8f3d..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java +++ /dev/null @@ -1,602 +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 - * -------- -------- ----------------------------------------------------------- - * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner - * 20060204 121605 rsinha@ca.ibm.com - Rupam Kuehner - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - *******************************************************************************/ -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.CreateMonitorCommand; -import org.eclipse.jst.ws.internal.consumption.command.common.ManageServerStartUpCommand; -import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand; -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.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.CheckWSDLValidationCommand; -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.ObjectSelectionFragment; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget; -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.CreationUIMessages; -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.ServerRuntimeSelectionWidget; -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; - -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(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", 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, "PublishService", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", 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, "PublishService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidget.class, "ResourceContext", ServerWizardWidgetOutputCommand.class); - - // Before ObjectSelectionWidget - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class ); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class); - - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", TestDefaultingFragment.class); - // Before ServerRuntimeSelectionWidget - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "InstallService", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "InstallClient", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ServerRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ServerRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientRuntimeId", ServerRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerRuntimeSelectionWidget.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerRuntimeSelectionWidget.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerRuntimeSelectionWidget.class); - - - // After ServerRuntimeSelectionWidget - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class ); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class ); - //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientComponentName", ClientExtensionDefaultingCommand.class); - //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class); - - - // Map fragments that depend on data. - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class); - dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class); - - // CreateMonitorCommand - dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeEndpointCommand.class); - - // ComputeEndpointCommand - dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ServiceTestWidget.class); - dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.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); - - - // 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, "RunClientTest",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_PROJECT, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ServerWizardWidget( true ); - } - } ); - - widgetRegistry.add( "ObjectSelectionWidget", - CreationUIMessages.PAGE_TITLE_OBJECT_SELECTION, - CreationUIMessages.PAGE_DESC_OBJECT_SELECTION, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ObjectSelectionWidget(); - } - }); - - widgetRegistry.add( "ServerRuntimeSelectionWidget", - ConsumptionUIMessages.PAGE_TITLE_WS_RUNTIME_SELECTION, - ConsumptionUIMessages.PAGE_DESC_WS_RUNTIME_SELECTION, - new WidgetContributorFactory() - { - public WidgetContributor create() - { - return new ServerRuntimeSelectionWidget(); - } - } ); - - 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, "DeployClient", PreClientDevelopCommand.class ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class ); - dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", 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( "ServerWizardWidget" ) ); - add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" )); - add( new ObjectSelectionFragment() ); - add( new SimpleFragment( new CheckWSDLValidationCommand(), "")); - add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), "")); - add( new SimpleFragment( "ServerRuntimeSelectionWidget" ) ); - add( new SimpleFragment( new ServerExtensionDefaultingCommand(), "")); - //add(new SimpleFragment(new ServerDeployableConfigurationCommand(), "")); //Note: added here - //add( new ServerExtensionFragment() ); - add( new ServiceRootFragment() ); - add( new SimpleFragment( new ServerExtensionOutputCommand(), "" )); - add(new SimpleFragment(new CreateMonitorCommand(), "")); - add(new SimpleFragment(new ComputeEndpointCommand(), "")); - add( new ServiceTestFragment( "TestService") ); - add( new SimpleFragment(new TestDefaultingFragment(),"")); - add( new ClientFragment() ); -// add( new SimpleFragment(new ManageServerStartUpCommand(),"")); - add( new ClientTestFragment( "ClientTestWidget") ); - add( new SimpleFragment( "Publish") ); - add(publishToPrivateUDDICmdFrag); - 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 ); - - //dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null); - //dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null); - - 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 ); - - // Map ServerWizardWidgetDefaultingCommand - 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, "InstallService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidgetOutputCommand.class); - dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", 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(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, "InstallService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "PublishService", ServerExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class); - dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.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, "ClientNeedEAR", ClientExtensionDefaultingCommand.class); - - - // Map ServerExtensionDefaultingCommand - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ServiceTestFragment.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "Publish", PublishToPrivateUDDICommandFragment.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer",WSDLTestLaunchCommand.class); - dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ClientTestDelegateCommand.class); - - // Setup the PreServiceDevelopCommand. - dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "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( ServerWizardWidgetOutputCommand.class, "PublishService", 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( 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( ObjectSelectionOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() ); - - 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, "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, "GenerateProxy", ClientTestFragment.class); - - - 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, "GenerateProxy", ClientTestFragment.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class); - dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.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 Finish Command - - - } - } -} diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java deleted file mode 100644 index 88334adda..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java +++ /dev/null @@ -1,448 +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 - * -------- -------- ----------------------------------------------------------- - * 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner - * 20060221 100190 pmoogk@ca.ibm.com - Peter Moogk - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - *******************************************************************************/ -package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.RuntimeServerSelectionWidget; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.jst.ws.internal.ui.common.UIUtils; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.ScrolledComposite; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; - -/* - * - * ServerRuntimeSelectionWidget - * This widget is the parent widget for server and client deployment/environment settings - * - */ -public class ServerRuntimeSelectionWidget extends SimpleWidgetDataContributor -{ - private String createPluginId_ = "org.eclipse.jst.ws.creation.ui"; - - /* CONTEXT_ID PWRS0002 for the Wizard Scenario Service configuration of the Runtime Selection Page */ - private String INFOPOP_PWRS_GROUP_SERVICE = "PWRS0002"; - - private RuntimeServerSelectionWidget runtimeWidget_; - private ProjectSelectionWidget projectWidget_; - private ClientRuntimeSelectionWidget clientWidget_; - private TextModifyListener textListener_; - - private boolean isClientWidgetVisible_ = true; - - public WidgetDataEvents addControls( Composite parent, Listener statusListener ) - { - UIUtils uiUtils = new UIUtils( createPluginId_ ); - - ScrolledComposite scroller = new ScrolledComposite( parent, SWT.H_SCROLL | SWT.V_SCROLL ); - scroller.setExpandHorizontal(true); - scroller.setExpandVertical(true); - - Composite root = uiUtils.createComposite( scroller, 1 ); - scroller.setContent( root ); - - Composite textComposite = uiUtils.createComposite( root, 1, 0, 0 ); - createMessageText( textComposite, NLS.bind(ConsumptionUIMessages.MSG_GENERAL_PROJECT_AND_EAR, new String[] {ConsumptionUIMessages.MSG_SERVICE_SUB})); - createMessageText( textComposite, ConsumptionUIMessages.MSG_EAR_PROJECT_WILL_BE_CREATED ); - - Composite serverComp = uiUtils.createComposite( root, 1, 5, 0 ); - - Group serverGroup = uiUtils.createGroup( serverComp, ConsumptionUIMessages.LABEL_SELECTION_VIEW_TITLE, - null, INFOPOP_PWRS_GROUP_SERVICE, - 2, 5, 5); - - runtimeWidget_ = new RuntimeServerSelectionWidget( false ); - runtimeWidget_.addControls( serverGroup, statusListener ); - textListener_ = new TextModifyListener(); - runtimeWidget_.addModifyListener( textListener_ ); - - projectWidget_ = new ProjectSelectionWidget(); - projectWidget_.addControls( serverGroup, statusListener ); - - clientWidget_ = new ClientRuntimeSelectionWidget(); - clientWidget_.addControls( root, statusListener ); - - Point size = root.computeSize(SWT.DEFAULT, SWT.DEFAULT); - scroller.setMinSize( size ); - root.setSize( size ); - - scroller.setLayoutData( new GridData( GridData.FILL_BOTH ) ); - - return this; - } - - //If generate proxy is not selected, don't show the client portion of the page. - public void setGenerateProxy( Boolean value ) - { - clientWidget_.setVisible( value.booleanValue() ); - isClientWidgetVisible_ = value.booleanValue(); - } - - public TypeRuntimeServer getServiceTypeRuntimeServer() - { - return runtimeWidget_.getTypeRuntimeServer(); - } - - public void setServiceTypeRuntimeServer( TypeRuntimeServer ids ) - { - runtimeWidget_.removeModifyListener( textListener_ ); - runtimeWidget_.setTypeRuntimeServer( ids ); - projectWidget_.setTypeRuntimeServer(ids); - projectWidget_.refreshProjectItems(); - runtimeWidget_.addModifyListener( textListener_ ); - } - - public TypeRuntimeServer getClientTypeRuntimeServer() - { - return clientWidget_.getClientTypeRuntimeServer(); - } - - public void setClientTypeRuntimeServer( TypeRuntimeServer ids ) - { - clientWidget_.setClientTypeRuntimeServer( ids ); - } - - public void setServiceRuntimeId(String id) - { - //TODO This method and any mappings to it - // should be deleted if no longer required. - } - - public String getServiceRuntimeId() - { - //calculate the most appropriate clientRuntimeId based on current settings. - String projectName = projectWidget_.getProjectName(); - String templateId = projectWidget_.getComponentType(); - - //Find the service runtime that fits this profile best. - return WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(runtimeWidget_.getTypeRuntimeServer(), projectName, templateId); - } - - public void setClientRuntimeId(String id) - { - //TODO This method and any mappings to it - // should be deleted if no longer required. - } - - public String getClientRuntimeId() - { - //calculate the most appropriate clientRuntimeId based on current settings. - return clientWidget_.getClientRuntimeId(); - } - - public boolean getServiceNeedEAR() - { - return projectWidget_.getNeedEAR(); - } - - public void setServiceNeedEAR(boolean b) - { - projectWidget_.setNeedEAR(b); - } - - public boolean getClientNeedEAR() - { - return clientWidget_.getClientNeedEAR(); - } - - public void setClientNeedEAR(boolean b) - { - clientWidget_.setClientNeedEAR(b); - } - - public String getServiceComponentType() - { - return projectWidget_.getComponentType(); - } - - public void setServiceComponentType( String type ) - { - projectWidget_.setComponentType( type ); - } - - public String getClientComponentType() - { - return clientWidget_.getClientComponentType(); - } - - public void setClientComponentType( String type ) - { - clientWidget_.setClientComponentType( type ); - } - - public String getServiceProjectName() - { - return projectWidget_.getProjectName(); - } - - public void setServiceProjectName(String name) - { - projectWidget_.setProjectName(name); - } - - public String getServiceEarProjectName() - { - return projectWidget_.getEarProjectName(); - } - - public void setServiceEarProjectName(String name) - { - projectWidget_.setEarProjectName(name); - } - - public String getClientProjectName() - { - return clientWidget_.getClientProjectName(); - } - - public void setClientProjectName(String name) - { - clientWidget_.setClientProjectName(name); - } - - public String getClientEarProjectName() - { - return clientWidget_.getClientEarProjectName(); - } - - public void setClientEarProjectName(String name) - { - clientWidget_.setClientEarProjectName(name); - } - - public void setInstallService(boolean b) - { - runtimeWidget_.setInstall(b); - } - - public void setInstallClient(boolean b) - { - clientWidget_.setInstallClient(b); - } - - private class TextModifyListener implements ModifyListener - { - public void modifyText(ModifyEvent e) - { - if( clientWidget_.isVisible() ) - { - TypeRuntimeServer serviceIds = runtimeWidget_.getTypeRuntimeServer(); - TypeRuntimeServer clientIds = clientWidget_.getClientTypeRuntimeServer(); - - clientIds.setRuntimeId( serviceIds.getRuntimeId() ); - clientIds.setServerId( serviceIds.getServerId() ); - clientIds.setServerInstanceId( serviceIds.getServerInstanceId() ); - - clientWidget_.setClientTypeRuntimeServer( clientIds ); - //clientWidget_.setJ2EEVersion(runtimeWidget_.getJ2EEVersion()); - } - - //Set the current server selection and J2EE level on the ProjectSelectionWidget - projectWidget_.setTypeRuntimeServer(runtimeWidget_.getTypeRuntimeServer()); - projectWidget_.refreshProjectItems(); - } - } - - - /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus() - */ - public IStatus getStatus() - { - IStatus serviceStatus = runtimeWidget_.getStatus(); - IStatus projectStatus = projectWidget_.getStatus(); - IStatus clientStatus = isClientWidgetVisible_ ? clientWidget_.getStatus() : Status.OK_STATUS; - IStatus finalStatus = Status.OK_STATUS; - - - // call child widgets' getStatus() - if( serviceStatus.getSeverity() == Status.ERROR ) - { - finalStatus = serviceStatus; - } - else if( clientStatus.getSeverity() == Status.ERROR ) - { - finalStatus = clientStatus; - } - else if ( projectStatus.getSeverity()== Status.ERROR) { - finalStatus = projectStatus; - } - - String projectName = projectWidget_.getProjectName(); - if (projectName != null && projectName.length()>0) - { - //If the project exists, ensure that it is suitable for the selected runtime - //and server. - ValidationUtils valUtils = new ValidationUtils(); - IProject project = ProjectUtilities.getProject(projectName); - String typeId = getServiceTypeRuntimeServer().getTypeId(); - String runtimeId = getServiceTypeRuntimeServer().getRuntimeId(); - String serverFactoryId = getServiceTypeRuntimeServer().getServerId(); - - if (project.exists()) - { - //Check if the runtime supports it. - if (!WebServiceRuntimeExtensionUtils2.doesServiceTypeAndRuntimeSupportProject(typeId, runtimeId, projectName)) - { - String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId); - finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT, new String[]{runtimeLabel, projectName})); - } - - //Check if the server supports it. - - if (serverFactoryId!=null && serverFactoryId.length()>0) - { - if (!valUtils.doesServerSupportProject(serverFactoryId, projectName)) - { - String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId); - finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT, new String[]{serverLabel, projectName})); - } - } - } - else - { - //Non-existing project is only permitted if there is a server selected. - if (serverFactoryId==null || serverFactoryId.length()==0) - { - finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_PROJECT_MUST_EXIST, new String[]{projectName})); - } - else - { - // Look at the project type to ensure that it is suitable for the - // selected runtime and server. - String templateId = getServiceComponentType(); - - if (templateId != null && templateId.length() > 0) - { - // Check if the runtime supports it. - if (!WebServiceRuntimeExtensionUtils2.doesServiceTypeAndRuntimeSupportTemplate(typeId, runtimeId, templateId)) - { - String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId); - String templateLabel = FacetUtils.getTemplateLabelById(templateId); - finalStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE, - new String[] { runtimeLabel, templateLabel })); - } - - // Check if the server supports it. - if (serverFactoryId != null && serverFactoryId.length() > 0) - { - if (!valUtils.doesServerSupportTemplate(serverFactoryId, templateId)) - { - String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverFactoryId); - String templateLabel = FacetUtils.getTemplateLabelById(templateId); - finalStatus = StatusUtils.errorStatus(NLS.bind( - ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE, - new String[] { serverLabel, templateLabel })); - } - } - } - } - - - } - } - - if (isClientWidgetVisible_) - { - String clientEARName = clientWidget_.getClientEarProjectName(); - String clientProjName = clientWidget_.getClientProjectName(); - String serviceProjName = projectWidget_.getProjectName(); - String serviceEarName = projectWidget_.getEarProjectName(); - //String clientComponentName = clientWidget_.getClientComponentName(); - - // check same EAR-ness ----- - String warning_msg = getEARProjectWarningMessage(serviceEarName, clientEARName); - - //if (serviceComponentName.equalsIgnoreCase(clientComponentName)){ - //String err_msg = NLS.bind(ConsumptionUIMessages.MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS, new String[]{ "WEB" } ); - //finalStatus = StatusUtils.errorStatus( err_msg ); - //} - - if( clientProjName != null && serviceProjName != null && - clientProjName.equalsIgnoreCase( serviceProjName )) - { - String error_msg =ConsumptionUIMessages.MSG_SAME_CLIENT_AND_SERVICE_PROJECTS; - finalStatus = StatusUtils.errorStatus( error_msg ); - } - - if (warning_msg != null) - { - if (finalStatus.getSeverity()!=Status.ERROR) - return StatusUtils.warningStatus( warning_msg ); - } - - } - - //If finalStatus is still OK, check if there are any warnings. - if (finalStatus.getSeverity()!=Status.ERROR) - { - if( serviceStatus.getSeverity() == Status.WARNING ) - { - finalStatus = serviceStatus; - } - else if (clientStatus.getSeverity() == Status.WARNING) - { - finalStatus = serviceStatus; - } - } - - return finalStatus; - } - - private void createMessageText( Composite parent, String value ) - { - Text messageText = new Text( parent, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY ); - GridData gridData = new GridData( GridData.FILL_BOTH ); - - gridData.horizontalIndent = 10; - messageText.setLayoutData( gridData ); - messageText.setText( value ); - } - - private String getEARProjectWarningMessage(String serviceEARName, String clientEARName ) { - - // check if service and client share the same EAR - if (serviceEARName!=null && clientEARName!=null) { - - if (clientEARName.equalsIgnoreCase(serviceEARName) && clientEARName.length()>0) { - return NLS.bind(ConsumptionUIMessages.MSG_SAME_CLIENT_AND_SERVICE_EARS, new String[]{ "EAR" }); - } - } - - return null; - - } -} 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 fc3925bd1..000000000 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java +++ /dev/null @@ -1,579 +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 - * -------- -------- ----------------------------------------------------------- - * 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner - * 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner - *******************************************************************************/ -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.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion; -import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages; -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.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerType; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; - -public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand -{ - private String DEFAULT_CLIENT_EAR_PROJECT_EXT = "EAR"; - private boolean generateProxy_; - - 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(); - } - - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - try - { - IStatus clientSideStatus = super.execute(monitor, null); - if (clientSideStatus.getSeverity()==Status.ERROR) - { - return clientSideStatus; - } - - if (serviceIdsFixed_) - { - //Set the serviceRuntime based on the runtime, server, and initial selection. - DefaultRuntimeTriplet drt = getDefaultServiceRuntimeForFixedRuntimeAndServer(initialProject_); - serviceFacetMatcher_ = drt.getFacetMatcher(); - serviceProjectName_ = drt.getProjectName(); - serviceRuntimeId_ = drt.getRuntimeId(); - } - else - { - // Set the runtime based on the initial selection - DefaultRuntimeTriplet drt = getDefaultRuntime(initialProject_, serviceIds_.getTypeId(), false); - serviceFacetMatcher_ = drt.getFacetMatcher(); - serviceProjectName_ = drt.getProjectName(); - serviceRuntimeId_ = drt.getRuntimeId(); - - if (serviceRuntimeId_ == null) - { - // return and error. - } - serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime() - .getId()); - } - - // Set the project - if (serviceProjectName_ == null) - { - // Project name did not get set when the runtime was set, so set it now - serviceProjectName_ = getDefaultServiceProjectName(); - } - - IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_); - if (!serviceProject.exists()) - { - // Set the project template - serviceComponentType_ = getDefaultServiceProjectTemplate(); - } - else - { - //Set it to an empty String - serviceComponentType_ = ""; - } - - updateClientProject(serviceProjectName_, serviceIds_.getTypeId()); - - if (!serviceIdsFixed_) - { - // Set the server - IStatus serverStatus = setServiceDefaultServer(); - if (serverStatus.getSeverity() == Status.ERROR) - { - env.getStatusHandler().reportError(serverStatus); - return serverStatus; - } - } - - setDefaultServiceEarProject(); - - 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); - env.getStatusHandler().reportError(errorStatus); - return errorStatus; - } - } - - private void setDefaultServiceEarProject() - { - //Don't need an ear if this is a Java project, or if the selected template is jst.utility - IProject serviceProject = ProjectUtilities.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; - } - } - } - } - - if (serviceNeedEAR_) - { - serviceEarProjectName_ = getDefaultServiceEarProjectName(); - - - //Client side - if (getClientNeedEAR()) - { - String defaultClientEarProjectName = getDefaultClientEarProjectName(); - IProject clientProject = ProjectUtilities.getProject(getClientProjectName()); - if(clientProject!=null && clientProject.exists() - && defaultClientEarProjectName.equalsIgnoreCase(serviceEarProjectName_)) - { - setClientEarProjectName(defaultClientEarProjectName); - } - else - { - ProjectTopologyContext ptc= WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext(); - if (!ptc.isUseTwoEARs()) - { - setClientEarProjectName(serviceEarProjectName_); - } - else - { - IProject proxyEARProject = getUniqueClientEAR(defaultClientEarProjectName, serviceEarProjectName_, getClientProjectName()); - setClientEarProjectName(proxyEARProject.getName()); - } - } - } - } - else - { - serviceEarProjectName_ = ""; - } - } - - private String getDefaultServiceEarProjectName() - { - //Choose an appropriate default. - - IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_); - if (serviceProject != null && serviceProject.exists()) - { - IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(serviceProject); - if (earComps.length > 0) - { - //pick the first one. - return earComps[0].getName(); - - } - } - - - IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents(); - - //TODO Choose an existing EAR that can be added to the server and who's J2EE level in consistent with - //that of the selected project, if applicable. Picking the first one for now. - if (allEarComps.length > 0) - { - return allEarComps[0].getName(); - } - - - - // there are no suitable existing EARs - return ResourceUtils.getDefaultServiceEARProjectName(); - - } - - private IStatus setServiceDefaultServer() - { - //Choose an existing server the module is already associated with if possible - IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_); - IServer[] 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) { - for (int i = 0; i < servers.length; i++) - { - 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()); - - //Pick the Web one if it's there, otherwise pick the first one. - for (int i=0; i<templates.length; i++) - { - String templateId = templates[i]; - if (templateId.indexOf("web") != -1) - { - boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, templateId); - if (matches) - { - return templates[i]; - } - } - } - - //Didn't find a "web" type. Return the first one that is a match. Calculate the facet matcher for the template - //so that we know what to create and what to add during module creation. - for (int j = 0; j < templates.length; j++) - { - String templateId = templates[j]; - boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, templateId); - if (matches) - { - return templates[j]; - } - } - - //Still nothing, return the first one if available. - if (templates.length > 0) - return templates[0]; - - return ""; - - } - - private String getDefaultServiceProjectName() - { - IProject[] projects = FacetUtils.getAllProjects(); - ServiceRuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_); - RequiredFacetVersion[] rfvs = desc.getRequiredFacetVersions(); - - //Check each project for compatibility with the serviceRuntime - for (int i=0; i<projects.length; i++) - { - Set facetVersions = FacetUtils.getFacetsForProject(projects[i].getName()); - org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = null; - String fRuntimeName = null; - fRuntime = FacetUtils.getFacetRuntimeForProject(projects[i].getName()); - if (fRuntime != null) - { - fRuntimeName = fRuntime.getName(); - } - - if (facetVersions != null) - { - FacetMatcher fm = FacetMatchCache.getInstance().getMatchForProject(false, serviceRuntimeId_, projects[i].getName()); - boolean facetRuntimeMatches = true; - if (fRuntimeName != null) - { - facetRuntimeMatches = FacetUtils.isFacetRuntimeSupported(rfvs, fRuntimeName); - } - - if (fm.isMatch() && facetRuntimeMatches) - { - serviceFacetMatcher_ = fm; - return projects[i].getName(); - } - } - } - - //No project was suitable, return a new project name - return ResourceUtils.getDefaultWebProjectName(); - - } - - private DefaultRuntimeTriplet getDefaultServiceRuntimeForFixedRuntimeAndServer(IProject project) - { - String[] serviceRuntimes = WebServiceRuntimeExtensionUtils2.getServiceRuntimesByServiceType(serviceIds_.getTypeId()); - ArrayList validServiceRuntimes = new ArrayList(); - 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); - } - } - - private IProject getUniqueClientEAR(String earProject, String serviceProject, String clientProjectName) { - - String projectName = new String(); - if (!earProject.equalsIgnoreCase(serviceProject)) { - projectName = earProject; - } - else { - projectName = clientProjectName+DEFAULT_CLIENT_EAR_PROJECT_EXT; - int i=1; - while (projectName.equalsIgnoreCase(serviceProject)) { - projectName = projectName+i; - i++; - } - } - return projectName.equals("") ? null : ResourceUtils.getWorkspaceRoot().getProject(projectName); - - } - - public void setInitialSelection(IStructuredSelection selection) - { - } - - public void setInitialProject(IProject initialProject) - { - initialProject_ = 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_; - } - -} 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 a00645bc3..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 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and 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 196ed3649..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 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and 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 2096c8d90..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 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and 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 20971001b..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 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.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; - } - - -} |