diff options
| author | kchan | 2005-10-26 23:06:33 +0000 |
|---|---|---|
| committer | kchan | 2005-10-26 23:06:33 +0000 |
| commit | b0a9f5a48fb44b7d4d6c84174165f8de48c64399 (patch) | |
| tree | 9fc90508f154545cc305c8033fee77de693f9df6 | |
| parent | 8177bf63b39dcfbe019f33fceab0de228a8bf7ce (diff) | |
| download | webtools.webservices-b0a9f5a48fb44b7d4d6c84174165f8de48c64399.tar.gz webtools.webservices-b0a9f5a48fb44b7d4d6c84174165f8de48c64399.tar.xz webtools.webservices-b0a9f5a48fb44b7d4d6c84174165f8de48c64399.zip | |
[113917] Rename internal.provisional package to internal.
306 files changed, 669 insertions, 639 deletions
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java index fe12940e2..4881f14b7 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java @@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java index bf5b5d40b..218ed4ca2 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java @@ -34,8 +34,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java index 5bbac2cec..a5127b20b 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java @@ -27,8 +27,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java index 65eef56dd..541d3ee6f 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java @@ -23,8 +23,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java index 5733a08ee..7c9edf127 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IContext; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; public class AxisClientInputCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java index d4a67cda9..1f21ce548 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java @@ -16,8 +16,8 @@ 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.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IContext; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; public class AxisClientOutputCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java index d7c524d5f..f7e03fcae 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java @@ -28,9 +28,9 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java index 72c91d4d1..d7e78075c 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java @@ -24,8 +24,8 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java index 23e828805..96e3a7168 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.StatusException; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java index fb07d0891..cd0bc3b07 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java @@ -33,11 +33,11 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisCons import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext; import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java index 55d00b871..7bb2f4eae 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java @@ -18,8 +18,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java index bfeb36d7c..4189ea6f1 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java @@ -34,8 +34,8 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java index 95c7f1e82..2c9103c53 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java index 267156313..b26999ede 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets; +import org.eclipse.wst.command.internal.env.core.common.Condition; import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; public class AxisMappingsFragment extends BooleanFragment diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java index 888298213..8fe929ee5 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java @@ -23,9 +23,9 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; public class AxisMappingsWidget extends SimpleWidgetDataContributor diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java index ffe4c672b..b8c300fbb 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java @@ -19,9 +19,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; public class AxisProxyWidget extends SimpleWidgetDataContributor diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java index e3e7a03a6..dc09eb23b 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java @@ -19,6 +19,8 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand; import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget; import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget; import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; @@ -27,8 +29,6 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; /** @@ -40,7 +40,7 @@ public class WebServiceClientAxisType implements CommandWidgetBinding /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java index dbb43b648..cdb7e9fbf 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java @@ -13,10 +13,10 @@ package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt; import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget; import org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory; public class AxisClientConfigWidgetFactory implements INamedWidgetContributorFactory { diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java index 69fbdd676..037bdce4e 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java @@ -13,15 +13,15 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand; import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand; import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer; import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo; +import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IContext; +import org.eclipse.wst.ws.internal.wsrt.ISelection; +import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; public class AxisWebServiceClient extends AbstractWebServiceClient { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java index 6e7dee4da..1ea105e6f 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.IWebService; public class BUAxisInputCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java index b9d111861..02233df1f 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java @@ -24,8 +24,8 @@ import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jem.java.Method; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java index 4110eb0d8..183223875 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java @@ -16,7 +16,7 @@ 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.provisional.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.IWebService; public class TDAxisInputCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java index 4aa94bbfb..8a4f69e3f 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java @@ -26,8 +26,8 @@ import org.eclipse.jst.j2ee.webapplication.ServletMapping; import org.eclipse.jst.j2ee.webapplication.ServletType; import org.eclipse.jst.j2ee.webapplication.WebApp; import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.environment.IEnvironment; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java index c8003e538..a361b0da3 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java @@ -31,8 +31,8 @@ import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; import org.eclipse.jst.ws.internal.consumption.ui.wsil.Utils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java index c61a46f2e..d993e8f8e 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java @@ -23,8 +23,8 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java index ecabc168d..fe7083968 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java index d9e9568ee..42a258b83 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java @@ -40,9 +40,9 @@ import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; import org.eclipse.jst.ws.internal.consumption.command.common.CopyWSDLCommand; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java index 153b0b85e..d4118fe22 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java @@ -33,8 +33,8 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil; import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.common.BundleUtils; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java index 5b689f1a5..e119a4306 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java index 2345bc160..404c01acc 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java @@ -28,9 +28,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; public class BeanClassWidget extends SimpleWidgetDataContributor diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java index e449eca5f..b8e08fb7e 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java @@ -29,10 +29,10 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; public class BeanConfigWidget extends SimpleWidgetDataContributor diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java index 258179625..3c9e0e46c 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java @@ -24,8 +24,8 @@ import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java index 8c9d2acea..9be41d977 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java @@ -25,9 +25,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; public class SkeletonConfigWidget extends SimpleWidgetDataContributor diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java index 539b63fb5..6d27e68fd 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java @@ -19,6 +19,8 @@ import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodComm import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand; import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget; import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; @@ -27,8 +29,6 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; /** @@ -122,7 +122,7 @@ public class WSBeanAxisType implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java index ede1075bf..2cb0d6e94 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java @@ -19,6 +19,8 @@ import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonCon import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand; import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer; import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; @@ -27,8 +29,6 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; /** * This is the class for the Axis Web service type. @@ -112,7 +112,7 @@ public class WSWSDLAxisType implements CommandWidgetBinding { } /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java index c5d15943e..77e6b55e6 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java @@ -13,10 +13,10 @@ package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt; import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget; import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory; public class AxisBeanConfigWidgetFactory implements INamedWidgetContributorFactory { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java index cbab9b4e9..0d8b8fecc 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java @@ -13,10 +13,10 @@ package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt; import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget; import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory; public class AxisSkeletonConfigWidgetFactory implements INamedWidgetContributorFactory { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java index 11e237817..cf3a2e231 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java @@ -31,16 +31,16 @@ import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectComman import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand; import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer; import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebService; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.AbstractWebService; +import org.eclipse.wst.ws.internal.wsrt.IContext; +import org.eclipse.wst.ws.internal.wsrt.ISelection; +import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class AxisWebService extends AbstractWebService { diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java index 38c8c87d7..bdc5cbf03 100644 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java +++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java @@ -1,11 +1,11 @@ package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt; import org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisWebServiceClient; -import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceRuntime; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo; +import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceRuntime; +import org.eclipse.wst.ws.internal.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; +import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; public class AxisWebServiceRuntime extends AbstractWebServiceRuntime { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd index 61cefe041..439474dfe 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd +++ b/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd @@ -56,7 +56,7 @@ <attribute name="transformer" type="string"> <annotation> <documentation> - This attribute specifies a class that must implement the org.eclipse.wst.command.internal.provisional.env.core.data.Transformer interface. This interface contains a transform method. Even though the type of the input parameter and the return value are of type Object it is expected that they will be used with the type org.eclipse.jface.viewers.IStructuredSelection. This transformation method allows the extender to modify the initial selection to an IStructuredSelection object that is more readily usable by the runtime server type. + This attribute specifies a class that must implement the org.eclipse.wst.command.internal.env.core.data.Transformer interface. This interface contains a transform method. Even though the type of the input parameter and the return value are of type Object it is expected that they will be used with the type org.eclipse.jface.viewers.IStructuredSelection. This transformation method allows the extender to modify the initial selection to an IStructuredSelection object that is more readily usable by the runtime server type. </documentation> </annotation> </attribute> diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java index b34dc7e66..539264588 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java @@ -14,9 +14,9 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; +import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler; -import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext; import org.eclipse.wst.ws.internal.explorer.LaunchOption; import org.eclipse.wst.ws.internal.explorer.LaunchOptions; import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java index 6ccbc616f..c442e74e6 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java @@ -17,9 +17,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.StatusException; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; @@ -62,7 +62,7 @@ public class CheckForServiceProjectCommand extends AbstractDataModelOperation /* (non-Javadoc) - * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment) + * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.env.core.common.Environment) */ public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java index e7482e3cc..9da7f7ecb 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java @@ -26,8 +26,8 @@ import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.common.EnvironmentUtils; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java index 3a7347954..a8ea41f53 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java index d0507f713..8387d2e62 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java @@ -13,7 +13,7 @@ package org.eclipse.jst.ws.internal.consumption.ui.command.data; import java.net.MalformedURLException; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; public class EclipseIPath2URLStringTransformer implements Transformer diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java index 0f772542b..37c5817d7 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java @@ -11,7 +11,7 @@ package org.eclipse.jst.ws.internal.consumption.ui.command.data; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; public class ProjectName2IProjectTransformer implements Transformer { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java index c96075d21..3ba0cd072 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java @@ -13,7 +13,7 @@ */ package org.eclipse.jst.ws.internal.consumption.ui.command.data; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; @@ -23,7 +23,7 @@ import org.eclipse.wst.server.core.ServerCore; public class ServerInstToIServerTransformer implements Transformer { /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object) + * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object) */ public Object transform(Object value) { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java index 0e228a0c8..e1160c50a 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.ui.command.data; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java index cbd7fe66f..e31aa9fd4 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java @@ -31,9 +31,9 @@ import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java index c888d6f34..b93d947e9 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java @@ -11,10 +11,10 @@ package org.eclipse.jst.ws.internal.consumption.ui.extension; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.ws.internal.extensions.AssembleClientFragment; import org.eclipse.wst.ws.internal.extensions.DeployClientFragment; import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java index 244d9a956..bd0b2f51a 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java @@ -19,7 +19,7 @@ import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWit import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; public class PreClientAssembleCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java index 0c9faf734..d9daa64d0 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java @@ -22,19 +22,19 @@ import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState; +import org.eclipse.wst.ws.internal.wsrt.IContext; +import org.eclipse.wst.ws.internal.wsrt.ISelection; +import org.eclipse.wst.ws.internal.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime; import org.eclipse.wst.ws.internal.wsrt.SimpleContext; +import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceState; public class PreClientDevelopCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java index f3096cfff..30f7ff28f 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java @@ -19,7 +19,7 @@ import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerC 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.provisional.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; public class PreClientInstallCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java index d9e35f25d..85a3b0a0e 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; public class PreClientRunCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java index 411fca4d2..da888cadc 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java @@ -17,7 +17,7 @@ import java.text.MessageFormat; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; /** diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java index dc8fa1ad0..e0d4eacff 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java @@ -27,8 +27,8 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; /** diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java index 96b9860ad..932c8af51 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java @@ -13,7 +13,7 @@ package org.eclipse.jst.ws.internal.consumption.ui.selection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.Selection; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; public class SelectionTransformer implements Transformer { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java index a08597eeb..ea986fdb7 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java @@ -11,10 +11,10 @@ package org.eclipse.jst.ws.internal.consumption.ui.server; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor; import org.eclipse.wst.server.core.IServer; public class StartClientWidgetContributor implements INamedWidgetContributor diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java index 77f3dc230..09ea36778 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java @@ -12,12 +12,12 @@ package org.eclipse.jst.ws.internal.consumption.ui.server; import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory; +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.provisional.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; public class StartClientWidgetFactory implements INamedWidgetContributorFactory { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java index 17ce11172..f37bf2246 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java @@ -35,13 +35,13 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext; import org.eclipse.wst.common.environment.NullStatusHandler; import org.eclipse.wst.server.core.IServer; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java index 0457bc4c5..ea63d68a7 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java @@ -21,8 +21,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java index cf0081546..3e4f0bd83 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java @@ -35,7 +35,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java index cfe0eb175..92ad89cf0 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java @@ -18,8 +18,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.IJobManager; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ValidateWSDLJob; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java index 5e52bd6fb..929471640 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java @@ -33,8 +33,8 @@ import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.environment.IEnvironment; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java index b182a805e..315cd122b 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java @@ -30,8 +30,8 @@ import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory; import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientFactoryImpl; import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java index 82b37bf18..006524c6e 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java @@ -16,10 +16,10 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; public class ClientWizardWidget extends SimpleWidgetDataContributor diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java index 56bf0ae1a..86154f1ec 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java @@ -19,7 +19,7 @@ import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensio import org.eclipse.jst.ws.internal.context.ScenarioContext; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java index f7bcd92dc..c331d46f2 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java index 2dae0b23d..a83a3e9f0 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java @@ -48,9 +48,9 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; /** * ConfigClientHandlersTreeWidget diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java index d51b3a4b1..39641aad5 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java @@ -50,9 +50,9 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; /** * ConfigServiceHandlersTreeWidget diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java index 7497b5085..0cfdf31c4 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java index a2c7612e0..73c8c39a1 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java @@ -39,10 +39,10 @@ import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.help.IWorkbenchHelpSystem; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand; import org.eclipse.wst.wsdl.internal.impl.ServiceImpl; import org.eclipse.wst.wsdl.util.WSDLResourceImpl; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java index 1d1f70662..139993e1d 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java @@ -14,10 +14,10 @@ import org.eclipse.jst.ws.internal.ui.common.UIUtils; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Listener; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; public class PreferencesSelectionWidget extends SimpleWidgetDataContributor diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java index 7312ef8a2..656491948 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java @@ -11,12 +11,12 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets; import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; public class PublishToPrivateUDDICommandFragment extends AbstractCommandFragment diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java index 5d03e01d9..bdae50a9d 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java @@ -27,9 +27,9 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.help.IWorkbenchHelpSystem; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.ws.internal.explorer.LaunchOption; import org.eclipse.wst.ws.internal.explorer.LaunchOptions; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java index 703805128..d6c2f735e 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java @@ -30,8 +30,8 @@ import org.eclipse.jst.j2ee.webservice.wsdd.WebServices; import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.wsdl.Service; import org.eclipse.wst.wsdl.internal.impl.ServiceImpl; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java index 9064efc8d..2e96978ce 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java @@ -58,10 +58,10 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; public class TableViewerWidget extends SimpleWidgetDataContributor diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java index 3551c050f..14056035c 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java @@ -16,9 +16,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication; import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.Condition; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java index 96a67e42e..310deae63 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java index f7b9d2b7a..6c8f2287d 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java @@ -33,10 +33,10 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java index 6b149bf34..d50e049ca 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java @@ -19,9 +19,9 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Listener; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java index 062511649..49e288bb8 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java @@ -36,6 +36,8 @@ import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultComm import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment; import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment; import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; @@ -46,8 +48,6 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.ws.internal.extensions.AssembleClientFragment; import org.eclipse.wst.ws.internal.extensions.DeployClientFragment; import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment; @@ -79,7 +79,7 @@ public class ClientWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { @@ -245,7 +245,7 @@ public class ClientWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @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) { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java index 6e4b80779..7cc9c3c49 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java @@ -15,6 +15,8 @@ import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; @@ -25,8 +27,6 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; /** @@ -62,7 +62,7 @@ public class ConfigClientHandlersWidgetBinding implements CommandWidgetBinding /* * (non-Javadoc) * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { @@ -123,7 +123,7 @@ public class ConfigClientHandlersWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @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) { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java index ecbbc351c..b615c3922 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java @@ -15,6 +15,8 @@ import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; @@ -25,8 +27,6 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; /** @@ -61,7 +61,7 @@ public class ConfigServiceHandlersWidgetBinding implements CommandWidgetBinding /* * (non-Javadoc) * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { @@ -123,7 +123,7 @@ public class ConfigServiceHandlersWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @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) { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java index ef14da7a8..d94d94be7 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java @@ -18,6 +18,9 @@ import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersT import org.eclipse.jst.ws.internal.consumption.ui.widgets.HandlersDefaultingCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand; +import org.eclipse.wst.command.internal.env.core.common.Condition; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; @@ -29,9 +32,6 @@ 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.command.internal.provisional.env.core.common.Condition; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding { @@ -66,7 +66,7 @@ public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding { /* * (non-Javadoc), * - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { @@ -188,7 +188,7 @@ public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding { /* * (non-Javadoc) * - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class); @@ -232,7 +232,7 @@ public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding { /* * (non-Javadoc) * - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class); diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java index 5e9b55e63..edd798e8d 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java @@ -39,6 +39,10 @@ import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFra import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestWebServiceClient; import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; +import org.eclipse.wst.command.internal.env.core.data.Transformer; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; @@ -49,15 +53,11 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; +import org.eclipse.wst.ws.internal.wsrt.WebServiceState; public class GenSampleWidgetBinding implements CommandWidgetBinding @@ -84,7 +84,7 @@ public class GenSampleWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { @@ -298,7 +298,7 @@ public class GenSampleWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @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) { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java index 5cf4625c7..f94a2995a 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java @@ -12,6 +12,8 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding; import org.eclipse.jst.ws.internal.consumption.ui.widgets.ImportWSILWidget; import org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; @@ -22,8 +24,6 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; public class ImportWSILWidgetBinding implements CommandWidgetBinding @@ -56,7 +56,7 @@ public class ImportWSILWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java index eeaf6294e..e6f7cec1c 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java @@ -12,6 +12,8 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding; import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment; import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; @@ -21,8 +23,6 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; @@ -65,7 +65,7 @@ public class ImportWSWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java index 4915b372c..f605b87b2 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java index fb3fb9c9f..5923a9f98 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java @@ -18,7 +18,7 @@ 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.provisional.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; public class ClientExtensionOutputCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java index ac0eb4059..1d84f039a 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.IWebService; public class ServerExtensionOutputCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java index 61f6e3a66..94e3c5270 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java @@ -3,7 +3,7 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.object; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; public class EJBSelectionTransformer implements Transformer { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java index 61be9e438..8f0afb67b 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java @@ -36,9 +36,9 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Table; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java index cda16922f..a84268ab9 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java @@ -23,7 +23,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; public class EJBTableViewer extends TableViewer { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java index eef2d28c1..e7ec8f254 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; public class JavaBeanSelectionTransformer implements Transformer { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java index d0d2ede1f..a2a59cb60 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java @@ -42,9 +42,9 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; public class JavaBeanSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java index dfa0b1380..a889d944a 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java @@ -13,13 +13,13 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.object; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; +import org.eclipse.wst.command.internal.env.core.common.Condition; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class ObjectSelectionFragment extends SequenceFragment implements Condition diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java index 55a9e0556..3899686a6 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java @@ -23,13 +23,13 @@ import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.StatusException; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class ObjectSelectionOutputCommand extends AbstractDataModelOperation diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java index 13fa081b7..25a07a015 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java @@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Listener; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class ObjectSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java index 7c55b0114..ac8afbac2 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java @@ -32,10 +32,10 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.wsdl.validation.internal.IValidationMessage; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java index b562902ea..2e2a8093a 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java @@ -16,7 +16,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl; import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; import org.eclipse.wst.wsdl.internal.impl.ServiceImpl; import org.eclipse.wst.wsdl.util.WSDLResourceImpl; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java index 707c9f279..b74130b92 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java @@ -49,9 +49,9 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java index 114913919..e405d3bfe 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java @@ -25,11 +25,11 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Listener; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.selection.SelectionList; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java index dc0222a1e..5281b80b9 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java @@ -39,11 +39,11 @@ import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo; import org.eclipse.jst.ws.internal.context.ProjectTopologyContext; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.selection.SelectionList; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; @@ -54,14 +54,14 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState; +import org.eclipse.wst.ws.internal.wsrt.IContext; +import org.eclipse.wst.ws.internal.wsrt.ISelection; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime; import org.eclipse.wst.ws.internal.wsrt.SimpleContext; +import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceState; public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataModelOperation { @@ -412,7 +412,7 @@ public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataM } /* (non-Javadoc) - * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment) + * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.env.core.common.Environment) */ /* public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java index 130881f21..477c57c8e 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java @@ -31,11 +31,11 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.server.core.IRuntime; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java index 0d528df34..028ce08e7 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java @@ -27,10 +27,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServerType; import org.eclipse.wst.server.core.ServerCore; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java index ef21a0a9f..c29b8d8f8 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java @@ -21,17 +21,17 @@ import org.eclipse.jst.ws.internal.context.ScenarioContext; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension; import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; +import org.eclipse.wst.command.internal.env.core.selection.SelectionList; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.IStatusHandler; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester; -import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester; +import org.eclipse.wst.ws.internal.wsrt.TestInfo; /* diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java index 1c13e3b4d..f86bb2619 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java @@ -12,10 +12,10 @@ */ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; +import org.eclipse.wst.command.internal.env.core.common.Condition; import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; public class ClientTestFragment extends BooleanFragment diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java index 87d54067f..4bd489f3c 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java @@ -40,11 +40,11 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; +import org.eclipse.wst.command.internal.env.core.selection.SelectionList; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; public class ClientTestWidget extends SimpleWidgetDataContributor diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java index 1b6cf3e46..f7b8c03f5 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java @@ -24,11 +24,11 @@ import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.IStatusHandler; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java index b6e822d23..f90c1b5ac 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java @@ -17,10 +17,10 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand; +import org.eclipse.wst.command.internal.env.core.common.Condition; import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; /** diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java index c5d4b774f..aeb174ab7 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java @@ -20,8 +20,8 @@ import org.eclipse.jst.ws.internal.context.ScenarioContext; import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension; import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry; import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; +import org.eclipse.wst.command.internal.env.core.common.Condition; import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; /** diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java index 36f95ffb8..d3e5fb5b5 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.context.ScenarioContext; import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; +import org.eclipse.wst.command.internal.env.core.selection.SelectionList; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java index 7c007098f..8668a7469 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java @@ -1,11 +1,11 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo; +import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IContext; +import org.eclipse.wst.ws.internal.wsrt.ISelection; +import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; public class TestWebServiceClient extends AbstractWebServiceClient { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java index 1a78d181e..d81df90ab 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java @@ -23,16 +23,16 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension; import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.IStatusHandler; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester; -import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester; +import org.eclipse.wst.ws.internal.wsrt.TestInfo; /** * @author gilberta diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java index f9cdd0822..2815fea85 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java @@ -23,9 +23,9 @@ import org.eclipse.jem.java.Method; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.IStatusHandler; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java index 9e0efec2f..00bdfd0b4 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java @@ -18,9 +18,9 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test; import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand; import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; /** diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java index a45328ea6..76e919683 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java @@ -15,7 +15,7 @@ import org.eclipse.wst.ws.internal.explorer.LaunchOption; import org.eclipse.wst.ws.internal.explorer.LaunchOptions; import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin; -import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; +import org.eclipse.wst.ws.internal.wsrt.TestInfo; public class WSEGenerateCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java index 32bb37c02..e50e1a085 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java @@ -1,10 +1,11 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester; -import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester; +import org.eclipse.wst.ws.internal.wsrt.TestInfo; public class WSEWebServiceTester implements IWebServiceTester { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java index ea2d7fdc7..35000b28c 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java @@ -32,7 +32,7 @@ import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleComman import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; +import org.eclipse.wst.ws.internal.wsrt.TestInfo; public class AddModuleDependenciesCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java index 5cab4e2e7..a8455d634 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java @@ -23,7 +23,7 @@ import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.common.EnvironmentUtils; import org.eclipse.wst.ws.internal.datamodel.Model; -import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; +import org.eclipse.wst.ws.internal.wsrt.TestInfo; public class GSTCGenerateCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java index 2a6b62ff7..0c0fadeaf 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java @@ -19,13 +19,13 @@ import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUI import org.eclipse.ui.PartInitException; import org.eclipse.ui.browser.IWebBrowser; import org.eclipse.ui.browser.IWorkbenchBrowserSupport; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.common.environment.StatusException; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; +import org.eclipse.wst.ws.internal.wsrt.TestInfo; public class GSTCLaunchCommand extends AbstractDataModelOperation { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java index c7c5fec34..17ca90a74 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java @@ -1,10 +1,11 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester; -import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceTester; +import org.eclipse.wst.ws.internal.wsrt.TestInfo; public class GSTCWebServiceTester implements IWebServiceTester { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java index 356bdcc1e..86d810f8d 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java @@ -40,9 +40,9 @@ import org.eclipse.jst.ws.internal.ext.test.JavaProxyTestCommand; import org.eclipse.ui.PartInitException; import org.eclipse.ui.browser.IWebBrowser; import org.eclipse.ui.browser.IWorkbenchBrowserSupport; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.common.environment.StatusException; diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java index ee1a33015..2d28a715f 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java @@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class TypeSelectionFilter diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java index 8ae6bec86..b58fb52e3 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java @@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class TypeSelectionFilter2 diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java index 14bd601c8..576c76f2d 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java @@ -10,7 +10,7 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime; public class ClientRuntimeDescriptor { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java index 3abfb4489..034a6e8ef 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.ui.wsrt; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.IContext; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; /** * @author rsinha diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java index ec4640339..631454bd6 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java @@ -11,7 +11,7 @@ package org.eclipse.jst.ws.internal.consumption.ui.wsrt; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; +import org.eclipse.wst.ws.internal.wsrt.ISelection; public class Selection implements ISelection { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java index 7e64bcd68..55dcaaec1 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java @@ -9,7 +9,7 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime; public class ServiceRuntimeDescriptor diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java index cb5ed82f3..85bf5af4a 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java @@ -13,7 +13,7 @@ package org.eclipse.jst.ws.internal.consumption.ui.wsrt; import java.util.Hashtable; import java.util.StringTokenizer; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class ServiceType { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java index cca569eb8..acb0acc1b 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java @@ -17,7 +17,7 @@ import java.util.Hashtable; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class WebServiceRuntimeExtensionRegistry { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java index 00e90d2fd..20e178d17 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java @@ -7,7 +7,7 @@ import java.util.Hashtable; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class WebServiceRuntimeExtensionRegistry2 { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java index 8db7fa7b5..bbb3d53ba 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java @@ -9,17 +9,17 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.internal.consumption.ui.wizard.TypeSelectionFilter; import org.eclipse.jst.ws.internal.data.LabelsAndIds; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.selection.SelectionList; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerType; import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.ui.ServerUICore; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class WebServiceRuntimeExtensionUtils { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java index d450b91c1..557f75f2a 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java @@ -15,9 +15,9 @@ import org.eclipse.jst.ws.internal.consumption.ui.common.FacetUtils; import org.eclipse.jst.ws.internal.consumption.ui.wizard.TypeSelectionFilter2; import org.eclipse.jst.ws.internal.data.LabelsAndIds; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.selection.SelectionList; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; @@ -26,8 +26,8 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerType; import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.ui.ServerUICore; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class WebServiceRuntimeExtensionUtils2 { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java index 2b85d6fd2..a69832c3d 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java @@ -15,7 +15,7 @@ import java.util.Hashtable; import java.util.StringTokenizer; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime; public class WebServiceRuntimeInfo { diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java index 7c63cd06e..d0fb8827f 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java @@ -21,8 +21,8 @@ import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElem import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory; import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.common.environment.StatusException; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java index d86c8f942..4f5c48a38 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java @@ -28,9 +28,9 @@ import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofFi import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.ws.internal.datamodel.Element; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java index f163d997c..85b388e1d 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java @@ -19,8 +19,8 @@ import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTy import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.FieldElement; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.common.environment.StatusException; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java index 9f9d369f7..d84066201 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java @@ -23,8 +23,8 @@ import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofPa import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.ws.internal.datamodel.Element; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java index f8ca714f8..7ed5d51ad 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.ws.internal.datamodel.Element; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java index 7f65acad6..0133f4e0e 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java @@ -18,8 +18,8 @@ import org.eclipse.jem.java.JavaHelpers; import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory; import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.ws.internal.datamodel.Element; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java index ff80e0152..29948826b 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java @@ -15,7 +15,7 @@ import java.util.Vector; import org.eclipse.jem.java.JavaClass; import org.eclipse.jst.ws.internal.consumption.codegen.Visitor; import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java index 756abb953..3e37c717a 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java @@ -18,7 +18,7 @@ import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.Method; import org.eclipse.jst.ws.internal.consumption.codegen.Visitor; import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction; -import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; +import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; /** diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java index ff8501f06..00a232585 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java @@ -19,8 +19,8 @@ import org.eclipse.jem.java.JavaParameter; import org.eclipse.jem.java.Method; import org.eclipse.jst.ws.internal.consumption.codegen.Visitor; import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.IEnvironment; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java index 36fc90110..c90a3781c 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.common.environment.EnvironmentService; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.server.core.IServer; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java index 7628626a3..a5195ebea 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java @@ -9,8 +9,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IModule; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java index 096939a01..6305cb611 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java @@ -8,8 +8,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java index a986b894d..3b6e24320 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java @@ -15,8 +15,8 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java index 72ee1e79d..3ec7683e8 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java @@ -41,7 +41,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.util.EList; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.uri.URIException; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java index 23d4151ad..df296231d 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java @@ -22,8 +22,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java index 521bc5caf..dbf1ee930 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java @@ -25,7 +25,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java index dca1a53f2..fd13a6aee 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java @@ -20,8 +20,8 @@ import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataMo import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java index dc7723c95..eb8dcd9bc 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java index 6899b6acd..58ca9569a 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java @@ -6,8 +6,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IRuntime; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java index 49fcf2550..6fb2660d0 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.datamodel.Model; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java index 8d881db0f..a59a55818 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java index b565b13ac..9fd46d0a9 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java @@ -29,7 +29,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.StatusException; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java index 2f2f33cfb..896e121c2 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java @@ -25,7 +25,7 @@ import org.eclipse.jem.java.JavaHelpers; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java index c444bd582..1fd9c93eb 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java index f873892ca..3bc7047eb 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.common.ResourceUtils; import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java index 39f2e49db..76baa3ba8 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java index 1aadc504c..97f1aacea 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java index 40042a260..09bafcc4e 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java @@ -19,9 +19,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.common.ServerUtils; import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.server.core.IServer; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java index 1c2143ef7..61c28e762 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java @@ -9,8 +9,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.EnvironmentService; import org.eclipse.wst.common.environment.ILog; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java index 42e11d018..ac20679c5 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java @@ -13,7 +13,7 @@ package org.eclipse.jst.ws.internal.consumption.plugin; import java.text.MessageFormat; import org.eclipse.core.runtime.Plugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; /** * This is the plugin class for the Web Services plugin. diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java index 3c1f4753f..d456f896e 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java @@ -21,8 +21,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.codegen.Generator; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.eclipse.wst.ws.internal.datamodel.Element; diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java index 4f12369ea..a75d2b699 100644 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java @@ -20,9 +20,9 @@ import org.eclipse.jem.java.JavaClass; import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions.JavaMofBeanVisitorAction; import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor; import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; 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 index 1d38f42db..5ed4a2808 100644 --- 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 @@ -19,7 +19,7 @@ import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWit import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.IWebService; public class PreServiceAssembleCommand extends AbstractDataModelOperation { 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 index 07c6ae434..4e694c78d 100644 --- 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 @@ -28,18 +28,18 @@ import org.eclipse.jst.ws.internal.consumption.ui.common.FacetMatcher; import org.eclipse.jst.ws.internal.consumption.ui.common.FacetUtils; import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState; +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 { 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 index 5023b11a3..04b3f236f 100644 --- 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 @@ -19,7 +19,7 @@ import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerC 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.provisional.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.IWebService; public class PreServiceInstallCommand extends AbstractDataModelOperation { 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 index 0e544413d..b0f876d10 100644 --- 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 @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.IWebService; public class PreServiceRunCommand extends AbstractDataModelOperation { 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 index 86a7020ff..e2b3e0a3d 100644 --- 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 @@ -12,10 +12,10 @@ 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.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.ws.internal.extensions.AssembleServiceFragment; import org.eclipse.wst.ws.internal.extensions.DeployServiceFragment; import org.eclipse.wst.ws.internal.extensions.DevelopServiceFragment; 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 index 42317407b..4c6869bdb 100644 --- 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 @@ -15,7 +15,7 @@ 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.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; /** 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 index d63a7eb2c..e2d2872c2 100644 --- 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 @@ -12,10 +12,10 @@ package org.eclipse.jst.ws.internal.creation.ui.server; import org.eclipse.jst.ws.internal.consumption.ui.server.StartServerWidget; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor; import org.eclipse.wst.server.core.IServer; public class StartServerWidgetContributor implements INamedWidgetContributor 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 index 4c0341ae0..8f7d44300 100644 --- 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 @@ -12,12 +12,12 @@ 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.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory; +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.provisional.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.IWebService; public class StartServerWidgetFactory implements INamedWidgetContributorFactory { 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 index 195686035..75502535b 100644 --- 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 @@ -28,11 +28,11 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; public class ServerWizardWidget extends SimpleWidgetDataContributor 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 index 2395c95c1..c2811f84d 100644 --- 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 @@ -12,7 +12,7 @@ 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.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; public class ServerWizardWidgetOutputCommand extends ClientWizardWidgetOutputCommand 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 index 346307048..c79280fe5 100644 --- 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 @@ -12,6 +12,8 @@ package org.eclipse.jst.ws.internal.creation.ui.widgets.binding; import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment; import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; @@ -21,8 +23,6 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; @@ -65,7 +65,7 @@ public class ExportWSWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { 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 index 068d4afd1..37d757656 100644 --- 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 @@ -10,13 +10,13 @@ *******************************************************************************/ 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; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; public class PublishWSDLWidgetBinding implements CommandWidgetBinding @@ -47,7 +47,7 @@ public class PublishWSDLWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc), - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { 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 index ffaff1648..74581ce8a 100644 --- 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 @@ -51,6 +51,9 @@ 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.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; @@ -62,9 +65,6 @@ 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.command.internal.provisional.env.core.common.Condition; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; public class ServerWidgetBinding implements CommandWidgetBinding @@ -103,7 +103,7 @@ public class ServerWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc), - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { @@ -356,7 +356,7 @@ public class ServerWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @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) { @@ -415,7 +415,7 @@ public class ServerWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @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) { 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 index f1576d2d1..4d632f791 100644 --- 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 @@ -32,11 +32,11 @@ 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.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; /* 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 index 6d91efb0c..71d4911c0 100644 --- 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 @@ -40,9 +40,9 @@ import org.eclipse.jst.ws.internal.context.ProjectTopologyContext; import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.selection.SelectionList; +import org.eclipse.wst.command.internal.env.core.selection.SelectionListChoices; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.environment.IEnvironment; @@ -52,7 +52,7 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.core.ServerUtil; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; +import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand { 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 index 72e0589c1..a00645bc3 100644 --- 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 @@ -12,9 +12,9 @@ */ 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.command.internal.provisional.env.core.common.Condition; import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand; 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 index 99d82143c..196ed3649 100644 --- 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 @@ -13,11 +13,11 @@ 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; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; public class ServiceTestFragment extends BooleanFragment 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 index e7fba34a3..2ae4df21f 100644 --- 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 @@ -22,10 +22,10 @@ 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.common.MessageUtils; +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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList; import org.eclipse.wst.common.environment.IEnvironment; 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 index a78eef7cc..3d23aa171 100644 --- 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 @@ -26,7 +26,7 @@ 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.provisional.env.core.selection.SelectionList; +import org.eclipse.wst.command.internal.env.core.selection.SelectionList; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java index ea24416fc..7fb402cef 100644 --- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java +++ b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java @@ -18,10 +18,10 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /* -import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; -import org.eclipse.wst.command.internal.provisional.env.core.common.Status; +import org.eclipse.wst.command.internal.env.core.common.Environment; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.SimpleStatus; +import org.eclipse.wst.command.internal.env.core.common.Status; import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin; */ diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java index 84fd197eb..b408b68f1 100644 --- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java +++ b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java @@ -11,11 +11,11 @@ package org.eclipse.jst.ws.internal.uddiregistry.widgets; import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; public class PrivateUDDISelectionCommandFragment extends AbstractCommandFragment diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java index 77c692133..1c2b8e2e7 100644 --- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java @@ -25,10 +25,10 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.help.IWorkbenchHelpSystem; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; /** diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java index f741d9c8e..3141b637c 100644 --- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java +++ b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java @@ -14,7 +14,7 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; +import org.eclipse.wst.command.internal.env.core.common.Condition; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java index 78dedf196..6b098277f 100644 --- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java +++ b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java @@ -15,6 +15,8 @@ import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionComm import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommandFragment; import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidget; import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidgetConditionCommand; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; @@ -24,8 +26,6 @@ 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.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; public class PrivateUDDIWidgetBinding implements CommandWidgetBinding @@ -74,7 +74,7 @@ public class PrivateUDDIWidgetBinding implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java index 5115a8530..3b493bdd8 100644 --- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java +++ b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; public class UIUtils diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java index 7462e176b..098180e87 100644 --- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java +++ b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java @@ -17,7 +17,7 @@ import java.text.MessageFormat; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jst.ws.internal.ui.preferences.PersistentActionDialogsContext; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; /** diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java index deb26ba7d..92c17a010 100644 --- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java +++ b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java @@ -22,8 +22,8 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.help.IWorkbenchHelpSystem; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceDefaults; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.ResourceDefaults; diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java index 2804c0d7f..5bec5527e 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java @@ -11,7 +11,7 @@ package org.eclipse.jst.ws.internal.common; import org.eclipse.core.resources.IProject; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java index be45cab68..d09436a04 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java @@ -563,8 +563,17 @@ public final class ResourceUtils { * project has no Web nature. */ public static IModule getModule(IProject project) { - return ServerUtil.getModule(project); - } + return ServerUtil.getModule(project); +} + +// Workaround for 113621 +//public static IModule getModule(IProject project) { +// IModule[] modules = ServerUtil.getModules(project); +// if (modules!=null && modules.length!=0) { +// return modules[0]; +// } +// return null; +//} /** * Returns the build output location of the <code>project</code> as an diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java index dcab1439a..7c77dabbc 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java @@ -17,12 +17,12 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; public class SelectionToResource implements Transformer { /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object) + * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object) */ public Object transform(Object value) { diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java index 4bb804382..303a27eed 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java @@ -27,8 +27,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.server.core.IModule; @@ -391,8 +391,17 @@ public final class ServerUtils { } public static IModule getModule(IProject project) { - return ServerUtil.getModule(project); - } + return ServerUtil.getModule(project); +} + +// Workaround for 113621 +//public static IModule getModule(IProject project) { +// IModule[] modules = ServerUtil.getModules(project); +// if (modules!=null && modules.length!=0) { +// return modules[0]; +// } +// return null; +//} /** * Returns the URL string corresponding to the web server module root of the @@ -554,9 +563,16 @@ public final class ServerUtils { */ public static IServer getDefaultExistingServer(IProject project) { - IModule module = ServerUtil.getModule(project); - IServer preferredServer = null; - preferredServer = ServerCore.getDefaultServer(module); + IModule module = ServerUtil.getModule(project); + IServer preferredServer = null; + preferredServer = ServerCore.getDefaultServer(module); + +// Workaround for 113621 +// IModule[] modules = ServerUtil.getModules(project); +// IServer preferredServer = null; +// if (modules.length > 0){ +// preferredServer = ServerCore.getDefaultServer(modules[0]); +// } if (preferredServer != null) return preferredServer; diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java index 9dc1a6e16..92efc3b17 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java @@ -11,7 +11,7 @@ package org.eclipse.jst.ws.internal.common; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; /** @@ -20,7 +20,7 @@ import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; public class StringToIProjectTransformer implements Transformer { /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object) + * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object) * @param Object This must be a java.lang.String * @return Object Returns an IProject */ diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java index 15c387ee4..f5f3a57aa 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java @@ -11,7 +11,7 @@ package org.eclipse.jst.ws.internal.ext.test; -import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; +import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; public interface JavaProxyTestCommand extends WebServiceTestFinishCommand { diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java index ec4e508a4..0b5f0dd61 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java @@ -21,7 +21,7 @@ import org.eclipse.jst.ws.internal.context.ProjectTopologyContext; import org.eclipse.jst.ws.internal.context.ScenarioContext; import org.eclipse.jst.ws.internal.context.UDDIPreferenceContext; import org.eclipse.wst.command.internal.env.context.PersistentResourceContext; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; /** diff --git a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF index 07b364066..4ac6e7f61 100644 --- a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF @@ -9,12 +9,11 @@ Export-Package: org.eclipse.wst.command.env.core, org.eclipse.wst.command.internal.env.core.data, org.eclipse.wst.command.internal.env.core.fragment, org.eclipse.wst.command.internal.env.core.registry, - org.eclipse.wst.command.internal.provisional.env.core, - org.eclipse.wst.command.internal.provisional.env.core.common, - org.eclipse.wst.command.internal.provisional.env.core.context, - org.eclipse.wst.command.internal.provisional.env.core.data, - org.eclipse.wst.command.internal.provisional.env.core.selection, - org.eclipse.wst.command.internal.provisional.env.core.uri + org.eclipse.wst.command.internal.env.core, + org.eclipse.wst.command.internal.env.core.common, + org.eclipse.wst.command.internal.env.core.context, + org.eclipse.wst.command.internal.env.core.selection, + org.eclipse.wst.command.internal.env.core.uri Require-Bundle: org.eclipse.wst.common.frameworks, org.eclipse.core.commands, org.eclipse.core.runtime, diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java index 88c20c012..0957e6ded 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandFactory.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core; +package org.eclipse.wst.command.internal.env.core; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandManager.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java index 873a376cd..19da21946 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandManager.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/CommandManager.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core; +package org.eclipse.wst.command.internal.env.core; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; /** * CommandManagers help manage the lifecycle of Commands. diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/ICommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java index 3f32a71fb..182a28b10 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/ICommandFactory.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/ICommandFactory.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core; +package org.eclipse.wst.command.internal.env.core; import java.util.Iterator; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/SimpleCommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java index 89b7eb729..75fdc4a52 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/SimpleCommandFactory.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/SimpleCommandFactory.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core; +package org.eclipse.wst.command.internal.env.core; import java.util.Vector; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Condition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java index 35058af0c..6d5b18053 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Condition.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Condition.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.common; +package org.eclipse.wst.command.internal.env.core.common; /** * This interface defines a boolean condition that can be evaluated for any object. diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Evaluate.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java index 255a81f01..0dcb74ec0 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Evaluate.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Evaluate.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.common; +package org.eclipse.wst.command.internal.env.core.common; /** * This interface can be used when a conditional object needs to be returned. diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/MessageUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java index 8dbf18289..aa7bb5939 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/MessageUtils.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/MessageUtils.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.common; +package org.eclipse.wst.command.internal.env.core.common; import java.text.MessageFormat; import java.util.Hashtable; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/ProgressUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java index 1ca1aa14d..4028caa12 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/ProgressUtils.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/ProgressUtils.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.common; +package org.eclipse.wst.command.internal.env.core.common; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Range.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java index 580c4e55c..2e98b4b20 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Range.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/Range.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.common; +package org.eclipse.wst.command.internal.env.core.common; import org.eclipse.wst.common.environment.uri.IURI; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/RangeVector.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java index ee3c52a02..3f86edfaf 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/RangeVector.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/RangeVector.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.common; +package org.eclipse.wst.command.internal.env.core.common; import java.util.Vector; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/StatusUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java index 3927873db..a03a57201 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/StatusUtils.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/common/StatusUtils.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.common; +package org.eclipse.wst.command.internal.env.core.common; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/Context.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java index af278b9ff..d38351bd0 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/Context.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/Context.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.context; +package org.eclipse.wst.command.internal.env.core.context; /** * This interface provides a way to get and set preference information. diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/ResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java index 9faff0041..b36ecc2ca 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/ResourceContext.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceContext.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.context; +package org.eclipse.wst.command.internal.env.core.context; public interface ResourceContext { diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/ResourceDefaults.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java index 7a22a287b..dad802626 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/ResourceDefaults.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/ResourceDefaults.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.context; +package org.eclipse.wst.command.internal.env.core.context; public class ResourceDefaults { diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/TransientResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java index 791aa959c..1dffa025b 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/TransientResourceContext.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/context/TransientResourceContext.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.context; +package org.eclipse.wst.command.internal.env.core.context; /** * This class implements a ResourceContext interface where the state @@ -28,49 +28,49 @@ public class TransientResourceContext implements ResourceContext } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#setOverwriteFilesEnabled(boolean) + * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setOverwriteFilesEnabled(boolean) */ public void setOverwriteFilesEnabled(boolean enable) { overWriteFiles = enable; } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#isOverwriteFilesEnabled() + * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isOverwriteFilesEnabled() */ public boolean isOverwriteFilesEnabled() { return overWriteFiles; } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#setCreateFoldersEnabled(boolean) + * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setCreateFoldersEnabled(boolean) */ public void setCreateFoldersEnabled(boolean enable) { createFolders = enable; } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#isCreateFoldersEnabled() + * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isCreateFoldersEnabled() */ public boolean isCreateFoldersEnabled() { return createFolders; } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#setCheckoutFilesEnabled(boolean) + * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#setCheckoutFilesEnabled(boolean) */ public void setCheckoutFilesEnabled(boolean enable) { checkOutFiles = enable; } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#isCheckoutFilesEnabled() + * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#isCheckoutFilesEnabled() */ public boolean isCheckoutFilesEnabled() { return checkOutFiles; } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#copy() + * @see org.eclipse.wst.command.internal.env.core.context.ResourceContext#copy() */ public ResourceContext copy() { ResourceContext cc = new TransientResourceContext(); diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java index 8527369c6..30ce90f80 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java @@ -15,8 +15,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Hashtable; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.ILog; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/data/DataMappingRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java index b34a8748b..99da37a6f 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/data/DataMappingRegistry.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistry.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.data; +package org.eclipse.wst.command.internal.env.core.data; public interface DataMappingRegistry { diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java index 03f41cf46..7bea57788 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java @@ -12,8 +12,6 @@ package org.eclipse.wst.command.internal.env.core.data; import java.util.Hashtable; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; public class DataMappingRegistryImpl implements DataMappingRegistry @@ -26,7 +24,7 @@ public class DataMappingRegistryImpl implements DataMappingRegistry } /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class, java.lang.String, org.eclipse.wst.command.internal.provisional.env.core.data.Transformer) + * @see org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class, java.lang.String, org.eclipse.wst.command.internal.env.core.data.Transformer) */ public void addMapping( Class sourceType, String sourceProperty, Class targetType, String targetProperty, @@ -110,7 +108,7 @@ public class DataMappingRegistryImpl implements DataMappingRegistry // } /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class) + * @see org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class) */ public void addMapping(Class sourceType, String sourceProperty, Class targetType) { diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java index 883523991..df242c105 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.core.data; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; public class RuleEntry { diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/data/Transformer.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java index 1c2bdb2e6..19c3c01e7 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/data/Transformer.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/Transformer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.data; +package org.eclipse.wst.command.internal.env.core.data; /** * This interface is used to transform an object from one class to another. diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java index 9f8ea47f3..d18a2f2db 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.core.fragment; -import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; +import org.eclipse.wst.command.internal.env.core.CommandFactory; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; /** diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java index 6379c5b3a..571156de4 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.core.fragment; -import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; +import org.eclipse.wst.command.internal.env.core.CommandFactory; +import org.eclipse.wst.command.internal.env.core.common.Condition; /** diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java index 3dcf25de3..3982cbd05 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.command.internal.env.core.fragment; import java.util.Enumeration; import java.util.Hashtable; -import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.Evaluate; + +import org.eclipse.wst.command.internal.env.core.CommandFactory; +import org.eclipse.wst.command.internal.env.core.common.Evaluate; /** diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java index 053ce5bfc..19075ac57 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java @@ -12,9 +12,10 @@ package org.eclipse.wst.command.internal.env.core.fragment; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; + +import org.eclipse.wst.command.internal.env.core.CommandFactory; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; public abstract class CommandFactoryFragment implements CommandFragment diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java index e68761c80..03af35eca 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.core.fragment; -import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; +import org.eclipse.wst.command.internal.env.core.CommandFactory; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; /** diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java index 6b19936ef..d4fce3d4b 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java @@ -15,12 +15,12 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.wst.command.internal.env.core.CommandFactory; +import org.eclipse.wst.command.internal.env.core.CommandManager; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.command.internal.env.core.data.DataFlowManager; -import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.CommandManager; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java index 7d41fc13d..60cdc9a72 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.core.fragment; -import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.common.RangeVector; +import org.eclipse.wst.command.internal.env.core.CommandFactory; +import org.eclipse.wst.command.internal.env.core.common.RangeVector; /** diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java index 5e0e70438..190871230 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java @@ -13,7 +13,8 @@ package org.eclipse.wst.command.internal.env.core.fragment; import java.util.Arrays; import java.util.List; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; + +import org.eclipse.wst.command.internal.env.core.CommandFactory; /** diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java index 9435224c8..0d1f1e4eb 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.core.fragment; -import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory; +import org.eclipse.wst.command.internal.env.core.CommandFactory; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; /** diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/BooleanSelection.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java index 13865219c..b2ee8b00a 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/BooleanSelection.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/BooleanSelection.java @@ -12,7 +12,7 @@ * This class combines a string with a boolean value. This is * useful for storing the state data for a boolean selection list. */ -package org.eclipse.wst.command.internal.provisional.env.core.selection; +package org.eclipse.wst.command.internal.env.core.selection; public class BooleanSelection { diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/ChoicesToString.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java index 5f39b4e83..3453a0203 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/ChoicesToString.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/ChoicesToString.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.selection; +package org.eclipse.wst.command.internal.env.core.selection; -import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; +import org.eclipse.wst.command.internal.env.core.data.Transformer; /** * This transformer class selects a string at a particular level @@ -26,7 +26,7 @@ public class ChoicesToString implements Transformer } /* (non-Javadoc) - * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object) + * @see org.eclipse.wst.command.internal.env.core.data.Transformer#transform(java.lang.Object) */ public Object transform( Object value ) { diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/DynamicList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java index a76b04b76..937d38d13 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/DynamicList.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/DynamicList.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.selection; +package org.eclipse.wst.command.internal.env.core.selection; import java.util.Vector; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/SelectionList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java index d6354dbb1..e52ebdc65 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/SelectionList.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionList.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.selection; +package org.eclipse.wst.command.internal.env.core.selection; /** * This class stores a list strings along with a selectionIndex which diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/SelectionListChoices.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java index 04b0d72fa..6c6aba878 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/SelectionListChoices.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/selection/SelectionListChoices.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.selection; +package org.eclipse.wst.command.internal.env.core.selection; import java.util.Vector; diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/uri/NativeFileCommand.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java index f88261af0..ef51355ea 100644 --- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/uri/NativeFileCommand.java +++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/uri/NativeFileCommand.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.core.uri; +package org.eclipse.wst.command.internal.env.core.uri; import java.io.File; import java.util.LinkedList; diff --git a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF index ae83b3a4b..2eb4b84a8 100644 --- a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF @@ -14,8 +14,7 @@ Export-Package: org.eclipse.wst.command.env.ui, org.eclipse.wst.command.internal.env.ui.preferences, org.eclipse.wst.command.internal.env.ui.registry, org.eclipse.wst.command.internal.env.ui.widgets, - org.eclipse.wst.command.internal.env.ui.widgets.popup, - org.eclipse.wst.command.internal.provisional.env.ui.widgets + org.eclipse.wst.command.internal.env.ui.widgets.popup Require-Bundle: org.eclipse.wst.command.env.core, org.eclipse.wst.command.env, org.eclipse.core.runtime, diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseEnvironment.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseEnvironment.java index cac36cc95..b8cadc2b7 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseEnvironment.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseEnvironment.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.ui.eclipse; +import org.eclipse.wst.command.internal.env.core.CommandManager; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment; -import org.eclipse.wst.command.internal.provisional.env.core.CommandManager; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; import org.eclipse.wst.common.environment.EnvironmentService; import org.eclipse.wst.common.environment.ILog; import org.eclipse.wst.common.environment.IStatusHandler; @@ -52,7 +52,7 @@ public class EclipseEnvironment implements BaseEclipseEnvironment } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.common.IEnvironment#getCommandManager() + * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getCommandManager() */ public CommandManager getCommandManager() { @@ -60,7 +60,7 @@ public class EclipseEnvironment implements BaseEclipseEnvironment } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.common.IEnvironment#getLog() + * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getLog() */ public ILog getLog() { @@ -82,7 +82,7 @@ public class EclipseEnvironment implements BaseEclipseEnvironment } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.common.IEnvironment#getStatusHandler() + * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getStatusHandler() */ public IStatusHandler getStatusHandler() { @@ -90,7 +90,7 @@ public class EclipseEnvironment implements BaseEclipseEnvironment } /** (non-Javadoc) - * @see org.eclipse.wst.command.internal.provisional.env.core.common.IEnvironment#getURIFactory() + * @see org.eclipse.wst.command.internal.env.core.common.IEnvironment#getURIFactory() */ public IURIFactory getURIFactory() { diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java index b7a844e9d..dfe021dec 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java @@ -13,9 +13,9 @@ package org.eclipse.wst.command.internal.env.ui.eclipse; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.swt.widgets.Shell; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.ui.dialog.MessageDialog; import org.eclipse.wst.command.internal.env.ui.dialog.StatusDialogConstants; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.StatusException; import org.eclipse.wst.common.environment.IStatusHandler; @@ -115,7 +115,7 @@ public class EclipseStatusHandler implements IStatusHandler } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.common.IStatusHandler#reportError(org.eclipse.wst.command.internal.provisional.env.core.common.Status) + * @see org.eclipse.wst.command.internal.env.core.common.IStatusHandler#reportError(org.eclipse.wst.command.internal.env.core.common.Status) */ public void reportError(IStatus status) { @@ -123,7 +123,7 @@ public class EclipseStatusHandler implements IStatusHandler } /** - * @see org.eclipse.wst.command.internal.provisional.env.core.common.IStatusHandler#reportInfo(org.eclipse.wst.command.internal.provisional.env.core.common.Status) + * @see org.eclipse.wst.command.internal.env.core.common.IStatusHandler#reportInfo(org.eclipse.wst.command.internal.env.core.common.Status) */ public void reportInfo(IStatus status) { diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java index 3c7e83db5..695719756 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java @@ -28,8 +28,8 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; /** diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java index b2daa71c5..f55e12abc 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java @@ -15,7 +15,7 @@ import java.util.Hashtable; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory; +import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory; public class WidgetRegistry { diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java index eb4e5856a..bfe0a0e07 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.ui.widgets; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; +import org.eclipse.wst.command.internal.env.core.common.Condition; /** * This is an interface for an abstract can finish registry. diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java index f77c3ac24..afd591ba5 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.ui.widgets; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; public interface CommandWidgetBinding extends CommandFragmentFactoryFactory diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java index af4dff471..7b8784584 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java @@ -11,10 +11,11 @@ package org.eclipse.wst.command.internal.env.ui.widgets; import java.util.Vector; + +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory; import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; public class CommandWidgetBindingList implements CommandWidgetBinding @@ -59,7 +60,7 @@ public class CommandWidgetBindingList implements CommandWidgetBinding } /* (non-Javadoc) - * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry) + * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry) */ public void registerDataMappings(DataMappingRegistry dataRegistry) { diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java index 0930afe5a..3a9a20523 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java @@ -27,6 +27,8 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; import org.eclipse.wst.command.internal.env.context.PersistentResourceContext; +import org.eclipse.wst.command.internal.env.core.common.Condition; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.env.core.data.DataFlowManager; import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; @@ -34,8 +36,6 @@ 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.eclipse.EclipseEnvironment; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.osgi.framework.Bundle; diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/env/ui/widgets/INamedWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java index da54ce967..a5baf32b4 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/env/ui/widgets/INamedWidgetContributor.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributor.java @@ -9,9 +9,8 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.ui.widgets; +package org.eclipse.wst.command.internal.env.ui.widgets; -import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory; public interface INamedWidgetContributor { diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/env/ui/widgets/INamedWidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java index 0485ffd96..f14ff0380 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/env/ui/widgets/INamedWidgetContributorFactory.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/INamedWidgetContributorFactory.java @@ -9,9 +9,9 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.command.internal.provisional.env.ui.widgets; +package org.eclipse.wst.command.internal.env.ui.widgets; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; public interface INamedWidgetContributorFactory { diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java index ce371919d..43d193ff0 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java @@ -11,7 +11,8 @@ package org.eclipse.wst.command.internal.env.ui.widgets; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.common.Condition; + +import org.eclipse.wst.command.internal.env.core.common.Condition; diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java index a263997e4..a943959f5 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.PlatformUI; import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java index c1c6c3951..652acb165 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java @@ -11,8 +11,7 @@ package org.eclipse.wst.command.internal.env.ui.widgets; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor; +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; public class SimpleWidgetContributor implements INamedWidgetContributor { diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java index c8725c7f3..152f7c8c8 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java @@ -12,8 +12,8 @@ package org.eclipse.wst.command.internal.env.ui.widgets; import java.util.Hashtable; -import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor; + +import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry; public class WidgetBindingToWidgetFactoryAdapter { diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java index f4caf2ed5..726f9a932 100644 --- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java +++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java @@ -20,8 +20,6 @@ import org.eclipse.wst.command.internal.env.core.data.DataFlowManager; import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment; import org.eclipse.wst.command.internal.env.ui.registry.WidgetRegistry; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor; -import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory; diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java index e6e7a3a72..0960ac613 100644 --- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java +++ b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java @@ -17,7 +17,7 @@ import java.io.OutputStream; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.common.environment.IStatusHandler; diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java index 48ee364ca..589aa362b 100644 --- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java +++ b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java @@ -30,9 +30,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.StatusException; import org.eclipse.wst.common.environment.IStatusHandler; diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java index e2f2d3bf0..5852c9083 100644 --- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java +++ b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java @@ -12,7 +12,7 @@ package org.eclipse.wst.command.internal.env.context; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Preferences; -import org.eclipse.wst.command.internal.provisional.env.core.context.Context; +import org.eclipse.wst.command.internal.env.core.context.Context; /** * This class is used as the base class for types that what to persist preference diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java index d30a35dc7..a0675c409 100644 --- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java +++ b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.context; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.ResourceDefaults; +import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext; import org.eclipse.wst.command.internal.env.plugin.EnvPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceDefaults; -import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext; public class PersistentResourceContext extends PersistentContext implements ResourceContext diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java index 526358907..4f59f6ca6 100644 --- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java +++ b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.wst.command.internal.env.eclipse; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; import org.eclipse.wst.common.environment.IEnvironment; diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp index dbda2cf86..6a2a888a8 100644 --- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp +++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/wsdl_content.jsp @@ -20,7 +20,7 @@ org.eclipse.wst.ws.internal.explorer.platform.constants.*, org.eclipse.wst.ws.internal.explorer.platform.datamodel.*, org.eclipse.wst.ws.internal.explorer.platform.util.*, - org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo, + org.eclipse.wst.ws.internal.wsrt.WebServiceInfo, org.eclipse.wst.ws.internal.wsfinder.WebServiceFinder, javax.wsdl.extensions.soap.*, javax.wsdl.extensions.http.*, diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java index 19e827284..d2dc6dc69 100644 --- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java +++ b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/plugin/ParserPlugin.java @@ -16,7 +16,7 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import org.eclipse.core.runtime.Plugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; /** * The main plugin class to be used in the desktop. diff --git a/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF index 27acc26c1..50bb254c4 100644 --- a/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 0.7.0 Bundle-Activator: org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin Bundle-Vendor: %PLUGIN_PROVIDER Bundle-Localization: plugin -Export-Package: org.eclipse.wst.ws.internal.provisional.ui.wsrt, +Export-Package: org.eclipse.wst.ws.internal.ui.wsrt, org.eclipse.wst.ws.internal.ui.plugin, org.eclipse.wst.ws.internal.ui.preferences, org.eclipse.wst.ws.internal.ui.wsi.preferences, diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java index 700c1a01e..d5424e6f1 100644 --- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java +++ b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/plugin/WSUIPlugin.java @@ -20,7 +20,7 @@ import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIAPContext; import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext; import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSISSBPContext; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; /** diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java index 10222250f..1c953f7e7 100644 --- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java +++ b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSICompliancePreferencePage.java @@ -28,7 +28,7 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.help.IWorkbenchHelpSystem; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.ws.internal.plugin.WSPlugin; import org.eclipse.wst.ws.internal.preferences.PersistentWSDLValidationContext; import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin; diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSIComplianceUtils.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSIComplianceUtils.java index dc29ac6a6..5d2f2ed5f 100644 --- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSIComplianceUtils.java +++ b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/preferences/WSIComplianceUtils.java @@ -14,8 +14,8 @@ package org.eclipse.wst.ws.internal.ui.wsi.preferences; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.IStatusHandler; import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin; diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/properties/WSICompliancePropertyPage.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/properties/WSICompliancePropertyPage.java index cee6427c8..04b266b58 100644 --- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/properties/WSICompliancePropertyPage.java +++ b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsi/properties/WSICompliancePropertyPage.java @@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PropertyPage; import org.eclipse.ui.help.IWorkbenchHelpSystem; -import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; +import org.eclipse.wst.command.internal.env.core.common.MessageUtils; import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin; import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext; diff --git a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/provisional/ui/wsrt/IObjectSelector.java b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsrt/IObjectSelector.java index 8f7e3b1e4..459e68b2f 100644 --- a/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/provisional/ui/wsrt/IObjectSelector.java +++ b/bundles/org.eclipse.wst.ws.ui/src/org/eclipse/wst/ws/internal/ui/wsrt/IObjectSelector.java @@ -9,13 +9,13 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.ui.wsrt; +package org.eclipse.wst.ws.internal.ui.wsrt; import org.eclipse.core.runtime.IStatus; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Listener; import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; +import org.eclipse.wst.ws.internal.wsrt.ISelection; public interface IObjectSelector { diff --git a/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF index 93c6c8f15..896d9fb83 100644 --- a/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Export-Package: org.eclipse.wst.ws.internal.common, org.eclipse.wst.ws.internal.monitor, org.eclipse.wst.ws.internal.plugin, org.eclipse.wst.ws.internal.preferences, - org.eclipse.wst.ws.internal.provisional.wsrt, org.eclipse.wst.ws.internal.wsfinder, org.eclipse.wst.ws.internal.wsil, org.eclipse.wst.ws.internal.wsrt diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/EnvironmentUtils.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/EnvironmentUtils.java index 5d3c12fff..42348c526 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/EnvironmentUtils.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/EnvironmentUtils.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.wst.ws.internal.common; +import org.eclipse.wst.command.internal.env.core.context.ResourceContext; +import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext; import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext; import org.eclipse.wst.common.environment.IEnvironment; public final class EnvironmentUtils diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java index 6187615dd..8e277ffe5 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java @@ -13,9 +13,9 @@ package org.eclipse.wst.ws.internal.extensions; import org.eclipse.wst.command.internal.env.core.fragment.CommandFactoryFragment; import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; +import org.eclipse.wst.ws.internal.wsrt.IContext; +import org.eclipse.wst.ws.internal.wsrt.ISelection; +import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; public abstract class AbstractClientFragment extends CommandFactoryFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java index abcafa03e..47f6d7c58 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java @@ -13,9 +13,9 @@ package org.eclipse.wst.ws.internal.extensions; import org.eclipse.wst.command.internal.env.core.fragment.CommandFactoryFragment; import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; +import org.eclipse.wst.ws.internal.wsrt.IContext; +import org.eclipse.wst.ws.internal.wsrt.ISelection; +import org.eclipse.wst.ws.internal.wsrt.IWebService; public abstract class AbstractServiceFragment extends CommandFactoryFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.java index 406325bd8..c144f1f26 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.ws.internal.extensions; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; public class AssembleClientFragment extends AbstractClientFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java index aaa6a9c7a..3c8366eb9 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.ws.internal.extensions; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; public class AssembleServiceFragment extends AbstractServiceFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java index 004b6213b..e941490b6 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.ws.internal.extensions; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; public class DeployClientFragment extends AbstractClientFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java index 2b171eae0..db1a8751b 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.ws.internal.extensions; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; public class DeployServiceFragment extends AbstractServiceFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java index 78389a419..17f3178cb 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.ws.internal.extensions; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; public class DevelopClientFragment extends AbstractClientFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java index 4a5113112..9a985c03c 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.ws.internal.extensions; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; public class DevelopServiceFragment extends AbstractServiceFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java index 4e6c13a02..fd5d209e1 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.ws.internal.extensions; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; public class InstallClientFragment extends AbstractClientFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java index 9b779f436..895af0237 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.ws.internal.extensions; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; public class InstallServiceFragment extends AbstractServiceFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java index d16ddcec3..e33e86d94 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.ws.internal.extensions; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; public class RunClientFragment extends AbstractClientFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java index 7e46223b1..9c89a3a33 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java @@ -12,8 +12,9 @@ package org.eclipse.wst.ws.internal.extensions; import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; + +import org.eclipse.wst.command.internal.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory; public class RunServiceFragment extends AbstractServiceFragment { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java index e7f4d43de..85f6c46da 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java @@ -26,7 +26,7 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.StatusException; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java index 04784f42b..3e9d6c103 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java @@ -6,7 +6,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceVisitor; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo; +import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; /** * Extends the Web Services Finder Framework. diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java index 8e7e40502..248efbe05 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java @@ -47,7 +47,7 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.common.environment.uri.URIException; import org.eclipse.wst.common.environment.uri.IURIFactory; diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebService.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebService.java index 6bfaaa7a6..298f565bf 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebService.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebService.java @@ -9,9 +9,9 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; import org.eclipse.wst.common.environment.IEnvironment; diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceClient.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceClient.java index a085ad7fd..36b6853fa 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceClient.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceClient.java @@ -9,9 +9,9 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; import org.eclipse.wst.common.environment.IEnvironment; diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceRuntime.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceRuntime.java index 9f226778c..c79033e15 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceRuntime.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/AbstractWebServiceRuntime.java @@ -9,9 +9,9 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; public abstract class AbstractWebServiceRuntime implements IWebServiceRuntime { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IContext.java index f546a8195..4e3718f55 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IContext.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IContext.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; public interface IContext { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/ISelection.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/ISelection.java index 7672f19d5..5893b5a38 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/ISelection.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/ISelection.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; public interface ISelection { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebService.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebService.java index 270c812b3..8ce772ffc 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebService.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebService.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; import org.eclipse.wst.common.environment.IEnvironment; diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceClient.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceClient.java index 453af88eb..e9ade9ec9 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceClient.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceClient.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; import org.eclipse.wst.common.environment.IEnvironment; public interface IWebServiceClient { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServicePublisher.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServicePublisher.java index 266225cf1..26dc5e836 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServicePublisher.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServicePublisher.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; import org.eclipse.wst.common.environment.IEnvironment; public interface IWebServicePublisher { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceRuntime.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceRuntime.java index fdb873ce2..8f8c2e8bb 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceRuntime.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceRuntime.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; public interface IWebServiceRuntime { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceTester.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceTester.java index 2a5dae654..04748ac9e 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceTester.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/IWebServiceTester.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; +import org.eclipse.wst.command.internal.env.core.ICommandFactory; public interface IWebServiceTester { public ICommandFactory generate(TestInfo testInfo); diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java index fe0626bb1..15df4f899 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java @@ -1,7 +1,5 @@ package org.eclipse.wst.ws.internal.wsrt; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; public class SimpleContext implements IContext { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/TestInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/TestInfo.java index 2f24307da..061ed3529 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/TestInfo.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/TestInfo.java @@ -1,7 +1,8 @@ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; import java.util.List; -import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; + +import org.eclipse.wst.command.internal.env.core.selection.BooleanSelection; import org.eclipse.wst.server.core.IServer; /** * This holds info that comes from user input or some calculations that diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceClientInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceClientInfo.java index 29b779feb..26eb358f1 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceClientInfo.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceClientInfo.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; public class WebServiceClientInfo { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceInfo.java index 2657c2cca..f9852fec1 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceInfo.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceInfo.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; public class WebServiceInfo { diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceScenario.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceScenario.java index f935d5947..489564c7e 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceScenario.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceScenario.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; import java.util.Arrays; import java.util.Collections; diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceState.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceState.java index c3b8891ad..cf20c0d69 100644 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceState.java +++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/WebServiceState.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; +package org.eclipse.wst.ws.internal.wsrt; import java.util.Arrays; import java.util.Collections; diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java index fceebff17..029a0a1cc 100644 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java +++ b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.ws.tests.util.AccumulateStatusHandler; import org.eclipse.jst.ws.tests.util.DynamicPopupJUnitWizard; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; public class PerformanceJUnitUtils { diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java index a637ebbd2..06b4540a7 100644 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java +++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java @@ -13,7 +13,7 @@ package org.eclipse.jst.ws.tests.util; import java.util.Vector; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.StatusException; import org.eclipse.wst.common.environment.IStatusHandler; diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java index dfe3552d6..cf74b38cc 100644 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java +++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java @@ -38,9 +38,9 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand; import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext; +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.preferences.ActionDialogPreferenceType; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IRuntime; diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java index a9ba904b4..86f9c5cab 100644 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java +++ b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java @@ -3,7 +3,8 @@ package org.eclipse.wst.ws.tests.unittest; import java.util.Iterator; import org.eclipse.wst.ws.internal.wsfinder.WebServiceFinder; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo; +import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java index bf27c8efc..8f524fb4b 100644 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java +++ b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java @@ -13,7 +13,7 @@ package org.eclipse.wst.ws.tests.util; import java.util.Vector; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; +import org.eclipse.wst.command.internal.env.core.common.StatusUtils; import org.eclipse.wst.common.environment.Choice; import org.eclipse.wst.common.environment.StatusException; import org.eclipse.wst.common.environment.IStatusHandler; diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java index 6d3bcc4da..e5dbe7b03 100644 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java +++ b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.wst.command.internal.env.common.FileResourceUtils; import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand; -import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext; +import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext; import org.eclipse.wst.common.environment.IEnvironment; import org.eclipse.wst.ws.tests.plugin.TestsPlugin; |